From be2459d5b5ed3ea0f4f066c8a6233fd477ffc0a8 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 10 Jul 2025 09:00:02 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E8=A2=AB=E5=8D=A0=E7=94=A8=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/st/outbill/service/impl/CheckOutBillServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index fa8c75a38..ccf83b09c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -3146,7 +3146,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
+ "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(structArr)) {
- throw new BadRequestException("有其他任务正在执行中，请稍后在试!");
+ JSONObject jsonObject = structArr.getJSONObject(0);
+ throw new BadRequestException("当前排存在单据号为【"+jsonObject.getString("inv_code")+"】的仓位【"+jsonObject.getString("struct_code")+"】正在执行任务，请稍后在试!");
}
}
From 1b49ffcb2eaff9f5ed0f190cf0d0c54277c4047b Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 10 Jul 2025 09:00:02 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat(wms):=20=E5=87=BA=E5=BA=93=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=96=B0=E5=A2=9E=E6=9C=A8=E7=AE=B1=E7=BC=96=E7=A0=81?=
=?UTF-8?q?=E5=92=8C=E6=9C=A8=E7=AE=B1=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在出库查询界面添加木箱编码和木箱描述两个新字段
- 更新后端服务和数据库查询以支持新增字段
---
.../nl/wms/stat/service/impl/OutBillQueryServiceImpl.java | 2 ++
.../main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
index b7b79ab40..98856c850 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
@@ -407,6 +407,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
mp.put("物流公司", json.getString("cust_name"));
mp.put("运费", json.getString("estimated_freight"));
mp.put("木箱号", json.getString("box_no"));
+ mp.put("木箱编码", json.getString("box_material_code"));
+ mp.put("木箱描述", json.getString("box_material_name"));
mp.put("物料编码", json.getString("material_code"));
mp.put("物料名称", json.getString("material_name"));
mp.put("子卷号", json.getString("pcsn"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
index 4c0bacbcd..05a64a90d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
@@ -266,6 +266,8 @@
base.cust_name,
dis.sect_name,
dis.box_no,
+ bib.material_code box_material_code,
+ bib.material_name box_material_name,
dis.qty_unit_name,
mater.material_code,
mater.material_name,
@@ -317,6 +319,7 @@
a.pcsn
) AS c
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
+ inner JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
@@ -385,6 +388,8 @@
base.cust_name,
dis.sect_name,
dis.box_no,
+ bib.material_code box_material_code,
+ bib.material_name box_material_name,
dis.qty_unit_name,
mater.material_code,
mater.material_name,
@@ -436,6 +441,7 @@
a.pcsn
) AS c
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
+ inner JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
From d43f56f741373bcbdba9a3c66904e0b2edb124fe Mon Sep 17 00:00:00 2001
From: yangyufu <1617486762@qq.com>
Date: Thu, 10 Jul 2025 09:05:05 +0800
Subject: [PATCH 3/9] =?UTF-8?q?feat(wms):=20=E5=87=BA=E5=BA=93=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=9C=A8=E7=AE=B1?=
=?UTF-8?q?=E7=BC=96=E7=A0=81=E5=92=8C=E6=9C=A8=E7=AE=B1=E6=8F=8F=E8=BF=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在出库查询列表中新增木箱编码和木箱描述两个字段
---
lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
index 2768fa8af..66d071ee8 100644
--- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
@@ -118,6 +118,8 @@
+
+
@@ -149,9 +151,7 @@
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker/index'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import crudOutbillquery from '@/views/wms/stat/outbillquery/outbillquery'
import { download } from '@/api/data'
@@ -159,7 +159,7 @@ import { downloadFile } from '@/utils'
export default {
name: 'OutQuery2',
- components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+ components: { crudOperation, rrOperation, pagination },
cruds() {
return CRUD({
title: '',
From d36b4811d9bceac85d412fb8ddc11d7fa84cb780 Mon Sep 17 00:00:00 2001
From: yangyufu <1617486762@qq.com>
Date: Thu, 10 Jul 2025 09:22:41 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat(wms):=20=E9=80=80=E8=B4=A7=E5=87=BA?=
=?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD-=20=E5=BC=95=E5=85=A5=20DateRangePicker=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E7=94=A8=E4=BA=8E=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F?=
=?UTF-8?q?=E8=8C=83=E5=9B=B4=20-=20=E6=B7=BB=E5=8A=A0=20udOperation=20?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
index 66d071ee8..492549c3a 100644
--- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
@@ -151,7 +151,9 @@
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import crudOutbillquery from '@/views/wms/stat/outbillquery/outbillquery'
import { download } from '@/api/data'
@@ -159,7 +161,7 @@ import { downloadFile } from '@/utils'
export default {
name: 'OutQuery2',
- components: { crudOperation, rrOperation, pagination },
+ components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '',
From 13ea603036b93566b1e8662b941f99efc4c7d009 Mon Sep 17 00:00:00 2001
From: yangyufu <1617486762@qq.com>
Date: Thu, 10 Jul 2025 09:39:35 +0800
Subject: [PATCH 5/9] =?UTF-8?q?perf(query):=20=E4=BC=98=E5=8C=96=E5=87=BA?=
=?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=20SQL=20=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改内联查询为左查询，确保出库记录不会丢失
---
.../src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
index 05a64a90d..19a03e98b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
@@ -319,7 +319,7 @@
a.pcsn
) AS c
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
- inner JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
+ LEFT JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
@@ -441,7 +441,7 @@
a.pcsn
) AS c
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
- inner JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
+ LEFT JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
From b3833d52ce2b464e20d276c8adb3b5c66b551d88 Mon Sep 17 00:00:00 2001
From: yangyufu <1617486762@qq.com>
Date: Thu, 10 Jul 2025 13:57:31 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=87=BA?=
=?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=AE=B1=E5=AD=90=E6=9D=90?=
=?UTF-8?q?=E8=B4=A8=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=20-=20=E5=9C=A8?=
=?UTF-8?q?=E5=AD=90=E6=9F=A5=E8=AF=A2=E4=B8=AD=E6=B7=BB=E5=8A=A0=20box=5F?=
=?UTF-8?q?type=20=E5=AD=97=E6=AE=B5=20-=20=E6=96=B0=E5=A2=9E=E4=B8=8E=20m?=
=?UTF-8?q?d=5Fme=5Fmaterialbase=20=E8=A1=A8=E7=9A=84=E5=B7=A6=E8=BF=9E?=
=?UTF-8?q?=E6=8E=A5=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=9D=90=E8=B4=A8=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=20-=20=E7=A7=BB=E9=99=A4=20bst=5Fivt=5Fboxinfo=20?=
=?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=B7=A6=E8=BF=9E=E6=8E=A5=EF=BC=8C=E4=B8=8D?=
=?UTF-8?q?=E5=86=8D=E4=BD=BF=E7=94=A8=E7=AE=B1=E5=9E=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
index 19a03e98b..eac6cfdb5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
@@ -266,8 +266,8 @@
base.cust_name,
dis.sect_name,
dis.box_no,
- bib.material_code box_material_code,
- bib.material_name box_material_name,
+ sub.box_type box_material_code,
+ mmm.material_name box_material_name,
dis.qty_unit_name,
mater.material_code,
mater.material_name,
@@ -330,6 +330,7 @@
record.bill_code,
record.container_name,
record.package_box_sn,
+ record.box_type,
record.sap_pcsn,
max(record.customer_name) as customer_name,
max(record.customer_description) as customer_description,
@@ -353,7 +354,9 @@
record.bill_code,
record.container_name,
record.sap_pcsn,
- record.package_box_sn) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id)
+ record.package_box_sn,
+ record.box_type) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id)
+ LEFT JOIN md_me_materialbase mmm ON sub.box_type = mmm.material_code
LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
LEFT JOIN (SELECT
container_name,
@@ -388,8 +391,8 @@
base.cust_name,
dis.sect_name,
dis.box_no,
- bib.material_code box_material_code,
- bib.material_name box_material_name,
+ sub.box_type box_material_code,
+ mmm.material_name box_material_name,
dis.qty_unit_name,
mater.material_code,
mater.material_name,
@@ -441,7 +444,6 @@
a.pcsn
) AS c
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
- LEFT JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
@@ -452,6 +454,7 @@
record.bill_code,
record.container_name,
record.package_box_sn,
+ record.box_type,
record.sap_pcsn,
max(record.customer_name) as customer_name,
max(record.customer_description) as customer_description,
@@ -475,7 +478,9 @@
record.bill_code,
record.container_name,
record.sap_pcsn,
- record.package_box_sn) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id)
+ record.package_box_sn,
+ record.box_type) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id)
+ LEFT JOIN md_me_materialbase mmm ON sub.box_type = mmm.material_code
LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
LEFT JOIN (SELECT
container_name,
From e849b87eb2a9e572f59d699b2f38a29279c9755c Mon Sep 17 00:00:00 2001
From: yangyufu <1617486762@qq.com>
Date: Thu, 10 Jul 2025 13:58:53 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
=?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 1 -
1 file changed, 1 deletion(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
index eac6cfdb5..d87548c5e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
@@ -319,7 +319,6 @@
a.pcsn
) AS c
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
- LEFT JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no
inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
From c7492a6cd750d38907bc0b6dadb83c995a8dcbad Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 21 Jul 2025 08:52:14 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=E5=BC=82=E5=B8=B8=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/ProductInstorServiceImpl.java | 63 ++++++++++---------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
index 2476e55b0..9733355b1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
@@ -162,7 +162,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
//判断明细数组中箱号与扫码的箱子是否一致，不一致让客户重新扫码
if (ObjectUtil.isNotEmpty(package_box_sn)) {
if (!box_no.equals(package_box_sn)) {
- throw new BadRequestException("扫码箱号:"+box_no+"与明细数据中箱号:"+package_box_sn+"不一致，请重新扫码操作!");
+ throw new BadRequestException("扫码箱号:" + box_no + "与明细数据中箱号:" + package_box_sn + "不一致，请重新扫码操作!");
}
}
for (int i = 0; i < box_rows.size(); i++) {
@@ -216,36 +216,39 @@ public class ProductInstorServiceImpl implements ProductInstorService {
double box_weight = sub_jo.getDoubleValue("box_weight");
// 木箱实称重重量
double real_weight = sub_jo.getDoubleValue("real_weight");
-
- if (ObjectUtil.isEmpty(sub_jo.getString("real_weight"))) {
- throw new BadRequestException("请先进行木箱称重校验!");
+ //一楼是否异常
+ String one_exc_param = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("one_exc_param").getValue();
+ if (!"1".equals(one_exc_param)) {
+ if (ObjectUtil.isEmpty(sub_jo.getString("real_weight"))) {
+ throw new BadRequestException("请先进行木箱称重校验!");
+ }
}
-
// 判断木箱毛重是否超标
if (NumberUtil.sub(box_weight, weight_sys) <= real_weight && NumberUtil.add(box_weight, weight_sys) >= real_weight) {
} else {
- //调用ACS让对应蜂鸣器报警
- JSONObject param = new JSONObject();
- param.put("code", "to_command");
- param.put("product_area", "LK");
- param.put("value", "99");
- param.put("device_code", point_code);
- JSONArray rows = new JSONArray();
- rows.add(param);
- WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
- wmsToAcsService.action(rows);
+ if (!"1".equals(one_exc_param)) {
+ //调用ACS让对应蜂鸣器报警
+ JSONObject param = new JSONObject();
+ param.put("code", "to_command");
+ param.put("product_area", "LK");
+ param.put("value", "99");
+ param.put("device_code", point_code);
+ JSONArray rows = new JSONArray();
+ rows.add(param);
+ WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
+ wmsToAcsService.action(rows);
- //判断is_pass是否为空，如果为空则通知飞书，不为空判断：为0则不允许通过，为1则允许
- if (ObjectUtil.isEmpty(sub_jo.getString("is_pass")) || sub_jo.getString("is_pass").equals(IOSEnum.IS_NOTANDYES.code("否")) ) {
- // 通知飞书
- notifyMes(sub_jo);
- throw new BadRequestException("重量不合格!系统重量浮动超过" + weight_sys + "KG,当前木箱称重重量:" + real_weight + ",已通知飞书处理！");
- } else {
- if (sub_jo.getString("is_pass").equals(IOSEnum.IS_NOTANDYES.code("否"))) {
- throw new BadRequestException("请等待放行!");
+ //判断is_pass是否为空，如果为空则通知飞书，不为空判断：为0则不允许通过，为1则允许
+ if (ObjectUtil.isEmpty(sub_jo.getString("is_pass")) || sub_jo.getString("is_pass").equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+ // 通知飞书
+ notifyMes(sub_jo);
+ throw new BadRequestException("重量不合格!系统重量浮动超过" + weight_sys + "KG,当前木箱称重重量:" + real_weight + ",已通知飞书处理！");
+ } else {
+ if (sub_jo.getString("is_pass").equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+ throw new BadRequestException("请等待放行!");
+ }
}
}
-
}
//判断是该包装计划是否存在长宽高
@@ -371,7 +374,9 @@ public class ProductInstorServiceImpl implements ProductInstorService {
form.put("vehicle_code", box_no);
form.put("task_type", "010507");
- cutConveyorTask.createTask(form);
+ if (!"1".equals(one_exc_param)) {
+ cutConveyorTask.createTask(form);
+ }
} else {
/*
* 如果有实际重量则需要判断重量是否超标
@@ -413,13 +418,13 @@ public class ProductInstorServiceImpl implements ProductInstorService {
.uniqueResult(0);
if ("XN01".equals(jsonObject.getString("sect_code"))) {
- whereJson.put("sect_id","1712667908095741952");
+ whereJson.put("sect_id", "1712667908095741952");
}
if ("XN02".equals(jsonObject.getString("sect_code"))) {
- whereJson.put("sect_id","1760184056861036544");
+ whereJson.put("sect_id", "1760184056861036544");
}
if ("TH01".equals(jsonObject.getString("sect_code"))) {
- whereJson.put("sect_id","1760183817781514240");
+ whereJson.put("sect_id", "1760183817781514240");
}
}
@@ -686,7 +691,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
JSONObject data = jsonObject.getJSONArray("data").getJSONObject(0);
double weight_now = NumberUtil.div(data.getDoubleValue("weight"), 10);
if (data.getDoubleValue("weight") <= 0) {
- throw new BadRequestException("当前称重重量有误，请检查！当前称重重量为【"+weight_now+"】");
+ throw new BadRequestException("当前称重重量有误，请检查！当前称重重量为【" + weight_now + "】");
}
// 获取系统参数1
From aed0bdc2d70b7d958a9138ea39c6f0bfa454c4ce Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 24 Jul 2025 13:39:34 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=8F=98=E6=9B=B4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 203 +++++++++++-------
.../src/views/wms/st/outbill/DivDialog.vue | 4 +-
2 files changed, 124 insertions(+), 83 deletions(-)
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index 1062ac2fa..7aa5ca215 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -160,7 +160,7 @@
@change="crud.toQuery"
/>
-
+
@@ -189,144 +189,167 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -371,33 +394,38 @@
-
+
-
+
-
+
-
+
-
+
@@ -417,7 +445,7 @@
size="mini"
@selection-change="crud.selectionChangeHandler"
>
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+