From 5b1874af134bd0637a8e8b3d55f16060b6805dad Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 7 Mar 2023 14:19:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/st/inbill/service/impl/InchargeServiceImpl.java | 5 +++++ .../nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index 03d933949..c1f9baf7e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -231,6 +231,9 @@ public class InchargeServiceImpl implements InchargeService { jsonOutMst.put("dis_optid", currentUserId); jsonOutMst.put("dis_optname", nickName); jsonOutMst.put("dis_time", DateUtil.now()); + jsonOutMst.put("confirm_optid", ""); + jsonOutMst.put("confirm_optname", ""); + jsonOutMst.put("confirm_time", ""); jsonOutMst.put("sysdeptid", deptId); jsonOutMst.put("syscompanyid", deptId); mstTab.insert(jsonOutMst); @@ -277,6 +280,8 @@ public class InchargeServiceImpl implements InchargeService { jsonOutDis.put("material_id", json2.getLongValue("material_id")); jsonOutDis.put("pcsn", json2.getString("pcsn")); jsonOutDis.put("box_no", json2.getString("box_no")); + jsonOutDis.put("point_id", ""); + jsonOutDis.put("task_id", ""); jsonOutDis.put("quality_scode", "01"); // 如果是虚拟库区则将执行状态改为生成：01 JSONObject jsonSect = wo_sect.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java index 8721409b9..a41b4ebe5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java @@ -122,8 +122,8 @@ public class OutChargeServiceImpl implements OutChargeService { whereJson.put("dis_optname", nickName); whereJson.put("dis_time", now); whereJson.put("confirm_optid", ""); - whereJson.put("confirm_optid", ""); - whereJson.put("confirm_optid", ""); + whereJson.put("confirm_optname", ""); + whereJson.put("confirm_time", ""); whereJson.put("is_upload", ""); whereJson.put("upload_optid", ""); whereJson.put("upload_time", ""); @@ -166,6 +166,8 @@ public class OutChargeServiceImpl implements OutChargeService { dis_row.put("struct_name", ""); dis_row.put("work_status", "00"); dis_row.put("real_qty", "0"); + dis_row.put("point_id", ""); + dis_row.put("task_id", ""); //插入分配表 dis_wql.insert(dis_row);