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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-03-07 18:17:32 +08:00
parent 10f723ac15 5b1874af13
commit 81d092320a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java
View File

@@ -231,6 +231,9 @@ public class InchargeServiceImpl implements InchargeService {
jsonOutMst.put("dis_optid", currentUserId); jsonOutMst.put("dis_optid", currentUserId);
jsonOutMst.put("dis_optname", nickName); jsonOutMst.put("dis_optname", nickName);
jsonOutMst.put("dis_time", DateUtil.now()); jsonOutMst.put("dis_time", DateUtil.now());
jsonOutMst.put("confirm_optid", "");
jsonOutMst.put("confirm_optname", "");
jsonOutMst.put("confirm_time", "");
jsonOutMst.put("sysdeptid", deptId); jsonOutMst.put("sysdeptid", deptId);
jsonOutMst.put("syscompanyid", deptId); jsonOutMst.put("syscompanyid", deptId);
mstTab.insert(jsonOutMst); mstTab.insert(jsonOutMst);
@@ -277,6 +280,8 @@ public class InchargeServiceImpl implements InchargeService {
jsonOutDis.put("material_id", json2.getLongValue("material_id")); jsonOutDis.put("material_id", json2.getLongValue("material_id"));
jsonOutDis.put("pcsn", json2.getString("pcsn")); jsonOutDis.put("pcsn", json2.getString("pcsn"));
jsonOutDis.put("box_no", json2.getString("box_no")); jsonOutDis.put("box_no", json2.getString("box_no"));
jsonOutDis.put("point_id", "");
jsonOutDis.put("task_id", "");
jsonOutDis.put("quality_scode", "01"); jsonOutDis.put("quality_scode", "01");
// 如果是虚拟库区则将执行状态改为生成：01 // 如果是虚拟库区则将执行状态改为生成：01
JSONObject jsonSect = wo_sect.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); JSONObject jsonSect = wo_sect.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
View File

@@ -122,8 +122,8 @@ public class OutChargeServiceImpl implements OutChargeService {
whereJson.put("dis_optname", nickName); whereJson.put("dis_optname", nickName);
whereJson.put("dis_time", now); whereJson.put("dis_time", now);
whereJson.put("confirm_optid", ""); whereJson.put("confirm_optid", "");
whereJson.put("confirm_optid", ""); whereJson.put("confirm_optname", "");
whereJson.put("confirm_optid", ""); whereJson.put("confirm_time", "");
whereJson.put("is_upload", ""); whereJson.put("is_upload", "");
whereJson.put("upload_optid", ""); whereJson.put("upload_optid", "");
whereJson.put("upload_time", ""); whereJson.put("upload_time", "");
@@ -166,6 +166,8 @@ public class OutChargeServiceImpl implements OutChargeService {
dis_row.put("struct_name", ""); dis_row.put("struct_name", "");
dis_row.put("work_status", "00"); dis_row.put("work_status", "00");
dis_row.put("real_qty", "0"); dis_row.put("real_qty", "0");
dis_row.put("point_id", "");
dis_row.put("task_id", "");
//插入分配表 //插入分配表
dis_wql.insert(dis_row); dis_wql.insert(dis_row);