From 5f1de12ae66129aaf1905396d34c482a1e36fcb6 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 17 Apr 2025 09:27:55 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=BA=93=E5=AD=98=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E7=AE=A1=E6=8E=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basedata/st/service/impl/StructivtServiceImpl.java | 3 +++ .../java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index 158230d57..69a8d96c3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -227,6 +227,7 @@ public class StructivtServiceImpl implements StructivtService { String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); String sub_type = MapUtil.getStr(whereJson, "sub_type"); String quality_scode = MapUtil.getStr(whereJson, "quality_scode"); + String control = MapUtil.getStr(whereJson, "control"); JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("stor_id", stor_id); @@ -235,6 +236,7 @@ public class StructivtServiceImpl implements StructivtService { map.put("is_virtual", is_virtual); map.put("sub_type", sub_type); map.put("quality_scode", quality_scode); + map.put("control", control); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); } @@ -334,6 +336,7 @@ public class StructivtServiceImpl implements StructivtService { } else { mp.put("超期原因", ""); } + mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否"); mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); mp.put("客户要求规格幅宽", json.getString("width_standard")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index ed3abca8d..0a6a7a765 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -277,6 +277,7 @@ attr.sect_code, attr.sect_name, attr.stor_name, + attr.lock_type, attr.storagevehicle_code, mater.material_code, mater.material_name, @@ -330,6 +331,12 @@ OPTION 输入.ivt_status = "frozen_qty" StructIvt.frozen_qty > 0 ENDOPTION + OPTION 输入.control = "0" + attr.lock_type <> '88' + ENDOPTION + OPTION 输入.control = "1" + attr.lock_type = '88' + ENDOPTION ) ivt LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND ivt.storagevehicle_code = sub.package_box_sn LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name