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-18 15:24:04 +08:00
parent ae2ed0f2b2
commit 1a9dd2bcb1
2 changed files with 7 additions and 12 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/service/impl/DailyplanServiceImpl.java
View File

@@ -405,8 +405,8 @@ public class DailyplanServiceImpl implements DailyplanService {
new_jo.put("workorder_qty",jo.getString("standard_weight")); new_jo.put("workorder_qty",jo.getString("standard_weight"));
new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00"); new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00");
new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59"); new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59");
new_jo.put("status",jsonMst.getString("remark")); new_jo.put("remark",jsonMst.getString("remark"));
new_jo.put("remark","10"); new_jo.put("status","10");
new_jo.put("create_mode","03"); new_jo.put("create_mode","03");
new_jo.put("source_bill_id",jo.getString("dailyplan_id")); new_jo.put("source_bill_id",jo.getString("dailyplan_id"));
new_jo.put("source_bill_type",jo.getString("workorder_type")); new_jo.put("source_bill_type",jo.getString("workorder_type"));

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

@@ -201,17 +201,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
continue; continue;
} }
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("workorder_id", String.valueOf(workorder_id)); String workorder_id2 = String.valueOf(workorder_id);
param.put("is_delete", "1"); PDM_BI_WorkOrder.delete("workorder_id='"+workorder_id2+"'");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
PDM_BI_WorkOrder.update(param);
String source_bill_id = jo.getString("source_bill_id"); String source_bill_id = jo.getString("source_bill_id");
if (StrUtil.isNotEmpty(source_bill_id)) {
JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0); JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0);
if(ja.size() == 0){ if(ja.size() == 0){
if (StrUtil.isNotEmpty(source_bill_id)) {
JSONObject param2 = new JSONObject(); JSONObject param2 = new JSONObject();
param2.put("status", "01"); param2.put("status", "01");
MPS_BD_ProductDailyPlan.update(param2,"dailyplan_id='"+source_bill_id+"'"); MPS_BD_ProductDailyPlan.update(param2,"dailyplan_id='"+source_bill_id+"'");