From b7cd1b54b3eda4d3d9524e36e2b6c6bfd46687ce Mon Sep 17 00:00:00 2001
From: yangyufu <yangyufu@hailiang.com>
Date: Wed, 10 Sep 2025 09:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0-=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E6=B7=BB=E5=8A=A0=E7=AE=B1=E5=86=85?=
 =?UTF-8?q?=E5=AD=90=E5=8D=B7=E4=B8=AA=E6=95=B0=E5=AD=97=E6=AE=B5?=
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   | 2 ++
 lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue       | 1 +
 2 files changed, 3 insertions(+)

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 d87548c5e..835fb1c76 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
@@ -274,6 +274,7 @@
                 c.pcsn,
                 sub.sap_pcsn,
                 sub.net_weight,
+                sub.boxin_num,
                 sub.customer_name,
                 sub.customer_description,
                 sub.sale_order_name,
@@ -334,6 +335,7 @@
                         max(record.customer_name) as customer_name,
                         max(record.customer_description) as customer_description,
                         max(record.width) as width,
+                        max(record.quanlity_in_box) boxin_num,
                         max(record.thickness) as thickness,
                         max(record.mass_per_unit_area) as mass_per_unit_area,
                         max(record.net_weight) as net_weight,
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 492549c3a..05be94c4f 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,7 @@
         <el-table-column show-overflow-tooltip prop="cust_name" label="物流公司" :min-width="flexWidth('cust_name',crud.data,'物流公司')" />
         <el-table-column show-overflow-tooltip prop="estimatedd_freight" label="运费" :formatter="crud.formatNum2" :min-width="flexWidth('estimated_freight',crud.data,'运费')" />
         <el-table-column show-overflow-tooltip prop="box_no" label="木箱号" :min-width="flexWidth('box_no',crud.data,'木箱号')" />
+        <el-table-column show-overflow-tooltip prop="boxin_num" label="箱内子卷个数" :min-width="flexWidth('boxin_num',crud.data,'箱内子卷个数')" />
         <el-table-column show-overflow-tooltip prop="box_material_code" label="木箱编码" :min-width="flexWidth('box_material_code',crud.data,'木箱编码')" />
         <el-table-column show-overflow-tooltip prop="box_material_name" label="木箱描述" :min-width="flexWidth('box_material_name',crud.data,'木箱描述')" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />