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-11-29 10:38:16 +08:00
parent c0b5d25642
commit e23f0b0b1d
3 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java
View File

@@ -65,6 +65,7 @@ public class WastecchangeServiceImpl implements WastecchangeService {
for(int i=0;i<array.size();i++){
JSONObject jo = array.getJSONObject(i);
jo.put("tech_type",tech_type);
jo.put("edit","0");
array2.add(jo);
}
allmaterialIds.put("content",array2);

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java
View File

@@ -79,7 +79,7 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
}
map.put("inspection_type", MapUtil.getStr(whereJson, "inspection_type"));
map.put("bill_status", MapUtil.getStr(whereJson, "bill_status"));
JSONObject json = WQL.getWO("QL_TEST_INSPECTIONSHEET001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code,mater.material_name");
JSONObject json = WQL.getWO("QL_TEST_INSPECTIONSHEET001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.bill_status,mst.confirm_time desc,mst.inspection_code");
return json;
}