From cd09d01797b14b7c2cfa67e81d58f573cac42794 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 10 Jul 2025 09:00:02 +0800
Subject: [PATCH] =?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