From f5285e2148dfe5fdd28e7ab071e97b7a8e8c4761 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 15 Apr 2025 15:49:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?rev:1.=E6=8E=A8=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8D=E6=9F=A5=E8=AF=A2=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=AD=982.=E6=88=90=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B63.=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=85=81=E8=AE=B8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=AE=A1=E6=8E=A7=E5=87=BA=E5=BA=93=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E5=87=BA=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/StructivtServiceImpl.java | 2 ++ .../wms/basedata/st/wql/QST_STRUCTIVT001.wql | 8 ++++++++ .../main/java/org/nl/wms/sch/wql/AUTO01.wql | 5 +++++ .../main/java/org/nl/wms/sch/wql/TEST0002.wql | 1 + .../src/views/wms/basedata/st/ivt/index.vue | 20 +++++++++++++++++++ .../src/views/wms/st/outbill/AddDialog.vue | 1 + 6 files changed, 37 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 66f5196fd..97d5afd36 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 @@ -59,6 +59,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", "1"); map.put("stor_id", stor_id); @@ -66,6 +67,7 @@ public class StructivtServiceImpl implements StructivtService { map.put("ivt_status", ivt_status); map.put("is_virtual", is_virtual); map.put("sub_type", sub_type); + map.put("control", control); map.put("quality_scode", quality_scode); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); 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 f2c536998..b088b13ca 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 @@ -29,6 +29,7 @@ 输入.in_stor_id TYPEAS f_string 输入.sub_type TYPEAS s_string 输入.quality_scode TYPEAS s_string + 输入.control TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -148,6 +149,13 @@ 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 (SELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql index 3c740af3a..0fe2cd41c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql @@ -52,6 +52,7 @@ INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name WHERE ivt.canuse_qty > '0' + AND attr.lock_type <> '88' AND cust.cust_name in 输入.cust_name_in AND DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) < "15" @@ -73,6 +74,7 @@ INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name WHERE ivt.canuse_qty > '0' + AND attr.lock_type <> '88' AND cust.cust_name in 输入.cust_name_in AND ( DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) >= "15" @@ -96,6 +98,7 @@ INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name WHERE ivt.canuse_qty > '0' + AND attr.lock_type <> '88' AND cust.cust_name in 输入.cust_name_in AND ( DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) >= "31" @@ -120,6 +123,7 @@ INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name WHERE ivt.canuse_qty > '0' + AND attr.lock_type <> '88' AND cust.cust_name in 输入.cust_name_in AND ( DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) >= "61" @@ -144,6 +148,7 @@ INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name WHERE ivt.canuse_qty > '0' + AND attr.lock_type <> '88' AND cust.cust_name in 输入.cust_name_in AND DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) > "90" diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql index d316aab64..5f4aa1e13 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql @@ -69,6 +69,7 @@ INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name WHERE ivt.canuse_qty > '0' + AND attr.lock_type <> '88' AND cust.cust_code in 输入.cust_code_in GROUP BY cust.cust_code diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index 1c23b4249..b3ed8ec6f 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -193,6 +193,25 @@ /> + + + + + + @@ -379,6 +398,7 @@ export default { this.sects = res.content }) this.crud.query.ivt_status = 'canuse_qty' + this.crud.query.control = '0' this.crud.toQuery() }, methods: { diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue index 7f2c98f93..31f0c1958 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue @@ -57,6 +57,7 @@ > Date: Thu, 17 Apr 2025 09:17:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?rev=EF=BC=9A1.=E6=96=B0=E5=A2=9E=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA2.=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 +++++++ .../src/views/wms/control/ivtcontrol/AddDialog.vue | 6 ++++++ 3 files changed, 16 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 97d5afd36..a6d979f90 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 @@ -301,6 +301,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); @@ -309,6 +310,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 + "%"); } @@ -408,6 +410,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 b088b13ca..5e92b94fc 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 @@ -437,6 +437,7 @@ attr.sect_code, attr.sect_name, attr.stor_name, + attr.lock_type, attr.storagevehicle_code, mater.material_code, mater.material_name, @@ -490,6 +491,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 diff --git a/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue b/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue index e5e6c1519..c3d23a2ce 100644 --- a/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue @@ -293,6 +293,12 @@ export default { return } this.form.open_type = this.openType + if (this.openType === '0' || this.openType === '1') { + if (this.form.remark === '') { + this.crud.notify('备注不能为空！', CRUD.NOTIFICATION_TYPE.INFO) + return + } + } crudControl.addSubmit(this.form).then(res => { this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery()