root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-10-16 14:01:48 +08:00
parent 938a3c62d6
commit 4946b89034
5 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java
View File

@@ -35,9 +35,9 @@ public class DailyplanController {
@GetMapping
@Log("查询月生产计划")
@ApiOperation("查询月生产计划")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
public ResponseEntity<Object> query(@RequestParam Map whereJson){
return new ResponseEntity<>(dailyplanService.
queryAll(whereJson,page),HttpStatus.OK);
queryAll2(whereJson),HttpStatus.OK);
}
@GetMapping("/queryday")

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DailyplanService.java
View File

@@ -24,7 +24,7 @@ public interface DailyplanService {
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryAll(Map whereJson, Pageable page);
Map<String,Object> queryAll2(Map whereJson);
/**
* 查询数据分页
* @param whereJson 条件

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
View File

@@ -54,7 +54,7 @@ public class DailyplanServiceImpl implements DailyplanService {
private final WorkOrdereService workOrdereService;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
public Map<String, Object> queryAll2(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson);
String material_code = map.get("material_code");
@@ -62,8 +62,7 @@ public class DailyplanServiceImpl implements DailyplanService {
map.put("material_code", "%" + material_code + "%");
}
map.put("flag", "1");
JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date,pp.plan_code");
JSONArray json = jret.getJSONArray("content");
JSONArray json = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).process().getResultJSONArray(0);
JSONArray ja = new JSONArray();
for(int i=0;i<json.size();i++){
JSONObject jo = json.getJSONObject(i);
@@ -82,6 +81,7 @@ public class DailyplanServiceImpl implements DailyplanService {
}
ja.add(jo);
}
Map<String, Object> jret = new HashMap<String, Object>();
jret.put("content",ja);
return jret;
}
@@ -210,15 +210,7 @@ public class DailyplanServiceImpl implements DailyplanService {
map.put("material_code", "%" + material_code + "%");
}
map.put("flag", "2");
JSONArray jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN")
.addParamMap(map).process().getResultJSONArray(0);
if(jret.size()>0){
JSONObject form = new JSONObject();
form.put("rows",jret);
form.put("query",whereJson);
this.submit2(form);
}
jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN")
JSONArray jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN")
.addParamMap(map).process().getResultJSONArray(0);
JSONArray ja = new JSONArray();

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
View File

@@ -51,7 +51,7 @@
##########################################
IF 输入.flag = "1"
PAGEQUERY
QUERY
SELECT
pp.*,
ext.old_mark,
@@ -94,8 +94,9 @@
OPTION 输入.device_id <> ""
pp.device_id = 输入.device_id
ENDOPTION
order by pp.planstart_date,pp.plan_code
ENDSELECT
ENDPAGEQUERY
ENDQUERY
ENDIF
IF 输入.flag = "2"