From d373a18753cc4b1e6986a4ff9ac3a2efc00029d5 Mon Sep 17 00:00:00 2001 From: yangyufu Date: Tue, 21 Apr 2026 16:29:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=89=A9=E5=B1=95=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在入库界面增加0013和0014单据类型的启用选项 - 在出库界面增加1013、1014和1015单据类型的启用选项 - 更新登录页面默认用户名为空字符串 - 修改出库服务实现中支持多种单据类型的包装关系更新逻辑 - 调整QST_IVT_INCHARGE查询文件支持多入库单据类型过滤 - 更新QST_IVT_RAWASSISTISTOR查询文件支持多出库单据类型过滤 - 扩展SAP集成服务支持ZLR1和ZLR2类型的处理逻辑 --- .../nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java | 2 +- .../nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java | 2 +- .../main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql | 4 ++-- .../org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql | 2 +- lms/nladmin-ui/src/views/login.vue | 2 +- lms/nladmin-ui/src/views/wms/st/incharge/index.vue | 2 +- lms/nladmin-ui/src/views/wms/st/outcharge/index.vue | 6 +++++- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index cc84d6164..d6d71af4b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -417,7 +417,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { jsonDtl.put("width", json.getString("HL02")); // 幅宽 tableData.add(jsonDtl); } - if (StrUtil.equals(lfart, "ZLR")) { + if (StrUtil.equals(lfart, "ZLR") || StrUtil.equals(lfart, "ZLR1") || StrUtil.equals(lfart, "ZLR2")) { /*jsonMst.put("remark",json.getString("LGORT"));//库位*/ HashMap map = new HashMap(); //更新包装关系 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 a2c41d654..169258532 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 @@ -211,7 +211,7 @@ public class OutChargeServiceImpl implements OutChargeService { //将包装关系中对应的记录状态改为包装 HashMap map = new HashMap<>(); map.put("status", "1"); - if (StrUtil.equals(mst_jo.getString("bill_type"), "1001")) { + if (StrUtil.equals(mst_jo.getString("bill_type"), "1001") || StrUtil.equals(mst_jo.getString("bill_type"), "1013") || StrUtil.equals(mst_jo.getString("bill_type"), "1014") || StrUtil.equals(mst_jo.getString("bill_type"), "1015")) { WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "' AND status = '3'"); } else { WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "'"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql index e7224a4cb..967a329a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql @@ -71,7 +71,7 @@ AND ios.io_type = '0' AND ios.bill_status = '99' AND ios.is_writeoff = '0' - AND ios.bill_type = '0002' + AND ios.bill_type in ('0002','0013','0014') and ios.stor_id in 输入.in_stor_id OPTION 输入.bill_code <> "" ios.bill_code like 输入.bill_code @@ -125,7 +125,7 @@ AND ios.io_type = '0' AND ios.bill_status = '99' AND ios.is_writeoff = '0' - AND ios.bill_type = '0002' + AND ios.bill_type in ('0002','0013','0014') and ios.stor_id in 输入.in_stor_id OPTION 输入.bill_code <> "" ios.bill_code like 输入.bill_code diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index 30df8d0a7..4c764b4cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -977,7 +977,7 @@ AND ios.bill_status = '99' AND - ios.bill_type in ('1001','1009') + ios.bill_type in ('1001','1009','1013','1014','1015') AND ios.stor_id in 输入.in_stor_id OPTION 输入.bill_code <> "" diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue index 7b3de2254..41ec64c61 100644 --- a/lms/nladmin-ui/src/views/login.vue +++ b/lms/nladmin-ui/src/views/login.vue @@ -58,7 +58,7 @@ export default { codeUrl: '', cookiePass: '', loginForm: { - username: 'admin', + username: '', password: '', rememberMe: false, code: '', diff --git a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue index e1e969a55..fc8b26996 100644 --- a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue @@ -80,7 +80,7 @@ diff --git a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue index 3e4470938..141b13415 100644 --- a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue @@ -79,7 +79,11 @@