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-06-28 09:40:30 +08:00
parent 5e8af632cb
commit c7c3ad55de
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,14 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isNotEmpty(material_id)) { if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%"); map.put("material_id", "%" + material_id + "%");
} }
String begin_time = map.get("begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
String end_time = map.get("end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.workorder_code"); JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.workorder_code");
return json; return json;
} }
@@ -92,6 +100,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
} }
// 插入主表 // 插入主表
json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("workordercard_id",json.getString("workorder_id"));
String workorder_code = CodeUtil.getNewCode("GL_CODE"); String workorder_code = CodeUtil.getNewCode("GL_CODE");
json.put("workorder_code", workorder_code); json.put("workorder_code", workorder_code);
json.put("is_delete", "0"); json.put("is_delete", "0");
@@ -269,9 +278,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if ("GX001".equals(workprocedure_code)) { if ("GX001".equals(workprocedure_code)) {
jsonMst.put("workorder_qty", jsonMst.getDouble("billpure_qty")+""); jsonMst.put("workorder_qty", jsonMst.getDouble("billpure_qty")+"");
}else{ }else{
if(StrUtil.isNotEmpty(jsonMst.getString("bill_qty"))){ if(StrUtil.isNotEmpty(jsonMst.getString("bill_qty"))){
jsonMst.put("workorder_qty", jsonMst.getDouble("bill_qty")+""); jsonMst.put("workorder_qty", jsonMst.getDouble("bill_qty")+"");
} }
} }
JSONArray devices = new JSONArray(); JSONArray devices = new JSONArray();
jsonMst.put("device_id", ""); jsonMst.put("device_id", "");