From 1e8570c954f5219df6f8dd82234c3f9abf71dc18 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sat, 3 Dec 2022 14:35:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/st/instor/service/impl/ChangeServiceImpl.java | 2 +- .../st/instor/service/impl/HandMoveStorServiceImpl.java | 6 ++++++ .../org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java index b7aac29c4..960d2348a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java @@ -124,7 +124,7 @@ public class ChangeServiceImpl implements ChangeService { mst_jo.put("stor_code", stor.getString("stor_code")); mst_jo.put("stor_name", stor.getString("stor_name")); mst_jo.put("bill_status", "10"); - mst_jo.put("create_mode", "03"); + mst_jo.put("create_mode", "01"); mst_jo.put("input_optid", currentUserId + ""); mst_jo.put("input_optname", nickName); mst_jo.put("input_time", now); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 350efd464..a6695261d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -637,6 +637,12 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { if (StrUtil.isNotEmpty(map.get("pcsn"))) { map.put("pcsn", "%" + map.get("pcsn") + "%"); } + if (StrUtil.isNotEmpty(map.get("sap_pscn"))) { + map.put("sap_pscn", "%" + map.get("sap_pscn") + "%"); + } + if (StrUtil.isNotEmpty(map.get("package_box_sn"))) { + map.put("package_box_sn", "%" + map.get("package_box_sn") + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql index ea5c17f2a..c7ee2a356 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql @@ -28,6 +28,8 @@ 输入.material_id TYPEAS s_string 输入.quality_scode TYPEAS s_string 输入.pcsn TYPEAS s_string + 输入.sap_pcsn TYPEAS s_string + 输入.package_box_sn TYPEAS s_string 输入.ivt_level TYPEAS s_string 输入.is_active TYPEAS s_string 输入.sect_id TYPEAS s_string @@ -196,10 +198,15 @@ OPTION 输入.sect_id <> "" struct.sect_id = 输入.sect_id ENDOPTION - OPTION 输入.pcsn <> "" ivt2.pcsn like 输入.pcsn ENDOPTION + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn + ENDOPTION + OPTION 输入.package_box_sn <> "" + sub.package_box_sn like 输入.package_box_sn + ENDOPTION ENDSELECT ENDPAGEQUERY