新-成品出库查询 报表导出 添加箱内子卷个数字段

- 在子查询中添加 box_type 字段
- 新增与 md_me_materialbase 表的左连接，获取材质名称
- 移除 bst_ivt_boxinfo 表的左连接，不再使用箱型信息

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java

@@ -407,6 +407,9 @@ 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("boxin_num"));
+                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"));

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql

@@ -266,12 +266,15 @@
                 base.cust_name,
                 dis.sect_name,
                 dis.box_no,
+                sub.box_type  box_material_code,
+                mmm.material_name  box_material_name,
                 dis.qty_unit_name,
                 mater.material_code,
                 mater.material_name,
                 c.pcsn,
                 sub.sap_pcsn,
                 sub.net_weight,
+                sub.boxin_num,
                 sub.customer_name,
                 sub.customer_description,
                 sub.sale_order_name,
@@ -327,10 +330,12 @@
                         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,
                         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,
@@ -350,7 +355,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,
@@ -385,12 +392,15 @@
                     base.cust_name,
                     dis.sect_name,
                     dis.box_no,
+                    sub.box_type  box_material_code,
+                    mmm.material_name  box_material_name,
                     dis.qty_unit_name,
                     mater.material_code,
                     mater.material_name,
                     c.pcsn,
                     sub.sap_pcsn,
                     sub.net_weight,
+                    sub.boxin_num,
                     sub.customer_name,
                     sub.customer_description,
                     sub.sale_order_name,
@@ -446,10 +456,12 @@
                             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,
                             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,
@@ -469,7 +481,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,

lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue

@@ -118,6 +118,9 @@
         <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,'物料编码')" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />