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

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

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java

@@ -53,8 +53,8 @@ public class MesToLmsController {
     @PostMapping("/cutPlanTransfer")
     @Log("分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流")
     @SaIgnore
-    public ResponseEntity<Object> cutPlanTransfer(@RequestBody JSONObject jo) {
-        return new ResponseEntity<>(mesToLmsService.cutPlanTransfer(jo), HttpStatus.OK);
+    public ResponseEntity<Object> cutPlanTransfer(@RequestBody JSONArray ja) {
+        return new ResponseEntity<>(mesToLmsService.cutPlanTransfer(ja), HttpStatus.OK);
     }
 
     @PostMapping("/callNextAssAndMomRoll")

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java

@@ -27,7 +27,7 @@ public interface MesToLmsService {
     /**
      * 分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流
      */
-    JSONObject cutPlanTransfer(JSONObject param);
+    JSONObject cutPlanTransfer(JSONArray ja);
 
     /**
      * 分切即将完成，呼叫配送下一个母卷/改制子卷，MES传智能物流

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -533,205 +534,208 @@ public class MesToLmsServiceImpl implements MesToLmsService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public JSONObject cutPlanTransfer(JSONObject param) {
-        log.info("cutPlanTransfer接口输入参数为：-------------------" + param.toString());
-
-        String orderType = param.getString("OrderType"); // 分切订单类型
-        String ContainerName = param.getString("ContainerName"); // 子卷号
-        String ProductName = param.getString("ProductName"); // 产品编码
-        String Description = param.getString("Description"); // 产品名称
-        String Warehouse = param.getString("Warehouse"); // 来源卷位置
-        String ResourceName = param.getString("ResourceName"); // 分切机台编码
-        String SplitGroup = param.getString("SplitGroup"); // 分切组
-        String ManufactureSort = param.getString("ManufactureSort"); // 生产顺序
-        String MfgOrderName = param.getString("MfgOrderName"); // 生产订单
-        String ManufactureDate = param.getString("ManufactureDate"); // 生产日期
-        String PaperTubeOrFRP = param.getString("PaperTubeOrFRP"); // 管件类型
-        String SplitBreadth = param.getString("SplitBreadth"); // 子卷幅宽
-        String SplitHeight = param.getString("SplitHeight"); // 子卷理论长度
-        String SplitWeight = param.getString("SplitWeight"); // 子卷理论重量
-        String Attribute2 = param.getString("Attribute2"); // 销售订单及行号
-        String Attribute3 = param.getString("Attribute3"); // 上下轴
-        String Attribute4 = param.getString("Attribute4"); // 位置左右
-        String Attribute5 = param.getString("Attribute5"); // 是否套轴
-        String Attribute6 = param.getString("Attribute6"); // 是否套轴
+    public JSONObject cutPlanTransfer(JSONArray ja) {
+        log.info("cutPlanTransfer接口输入参数为：-------------------" + ja.toString());
 
         WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan");
-
         JSONObject result = new JSONObject();
+
         try {
-            // 基础校验
-            if (ObjectUtil.isEmpty(orderType)) {
-                throw new BadRequestException("分切订单类型不能为空");
-            }
-            if (ObjectUtil.isEmpty(ContainerName)) {
-                throw new BadRequestException("子卷号不能为空");
-            }
-            if (ObjectUtil.isEmpty(ProductName)) {
-                throw new BadRequestException("产品编码不能为空");
-            }
-            if (ObjectUtil.isEmpty(Description)) {
-                throw new BadRequestException("产品名称不能为空");
-            }
-            if (ObjectUtil.isEmpty(Warehouse)) {
-                throw new BadRequestException("来源卷位置不能为空");
-            }
-            if (ObjectUtil.isEmpty(ResourceName)) {
-                throw new BadRequestException("分切机台编码不能为空");
-            }
-            if (ObjectUtil.isEmpty(SplitGroup)) {
-                throw new BadRequestException("分切组不能为空");
-            }
-            if (ObjectUtil.isEmpty(ManufactureSort)) {
-                throw new BadRequestException("生产顺序不能为空");
-            }
-            if (ObjectUtil.isEmpty(MfgOrderName)) {
-                throw new BadRequestException("生产订单不能为空");
-            }
-            if (ObjectUtil.isEmpty(ManufactureDate)) {
-                throw new BadRequestException("生产日期不能为空");
-            }
-            if (ObjectUtil.isEmpty(PaperTubeOrFRP)) {
-                throw new BadRequestException("管件类型不能为空");
-            }
-            if (ObjectUtil.isEmpty(SplitBreadth)) {
-                throw new BadRequestException("子卷幅宽不能为空");
-            }
-            if (ObjectUtil.isEmpty(SplitHeight)) {
-                throw new BadRequestException("子卷理论长度不能为空");
-            }
-            if (ObjectUtil.isEmpty(SplitWeight)) {
-                throw new BadRequestException("子卷理论重量不能为空");
-            }
+            for (int i = 0; i < ja.size(); i++) {
+                JSONObject param = ja.getJSONObject(i);
+                String orderType = param.getString("OrderType"); // 分切订单类型
+                String ContainerName = param.getString("ContainerName"); // 子卷号
+                String ProductName = param.getString("ProductName"); // 产品编码
+                String Description = param.getString("Description"); // 产品名称
+                String Warehouse = param.getString("Warehouse"); // 来源卷位置
+                String ResourceName = param.getString("ResourceName"); // 分切机台编码
+                String SplitGroup = param.getString("SplitGroup"); // 分切组
+                String ManufactureSort = param.getString("ManufactureSort"); // 生产顺序
+                String MfgOrderName = param.getString("MfgOrderName"); // 生产订单
+                String ManufactureDate = param.getString("ManufactureDate"); // 生产日期
+                String PaperTubeOrFRP = param.getString("PaperTubeOrFRP"); // 管件类型
+                String SplitBreadth = param.getString("SplitBreadth"); // 子卷幅宽
+                String SplitHeight = param.getString("SplitHeight"); // 子卷理论长度
+                String SplitWeight = param.getString("SplitWeight"); // 子卷理论重量
+                String Attribute2 = param.getString("Attribute2"); // 销售订单及行号
+                String Attribute3 = param.getString("Attribute3"); // 上下轴
+                String Attribute4 = param.getString("Attribute4"); // 位置左右
+                String Attribute5 = param.getString("Attribute5"); // 是否套轴
+                String Attribute6 = param.getString("Attribute6"); // 物料类型
 
-            /*  orderType
-             *  1.当订单类型为1（常规）时 ParentContainerName 来源母卷号不能为空
-             *  2.当订单类型为2（改制）时 RestructContainerName 改制来源子卷号、PackageBoxSN 子卷立库木箱号 不能为空
-             */
-            if (StrUtil.equals(orderType, "1")) {
-                if (ObjectUtil.isEmpty(param.getString("ParentContainerName"))) {
-                    throw new BadRequestException("来源母卷号不能为空");
+                // 基础校验
+                if (ObjectUtil.isEmpty(orderType)) {
+                    throw new BadRequestException("分切订单类型不能为空");
                 }
-            } else {
-                if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) {
-                    throw new BadRequestException("改制来源子卷号不能为空");
+                if (ObjectUtil.isEmpty(ContainerName)) {
+                    throw new BadRequestException("子卷号不能为空");
                 }
-            }
-            /*  PaperTubeOrFRP
-             *  1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空
-             *  2.当管件类型为2（FRP管）时 FRPMaterial FRP管物料编码、FRPDescription FRP管物料描述、FRPModel FRP管规格 不能为空
-             */
-            String qzz_generation = "0";
-            String qzz_size = "0";
-            if (StrUtil.equals(PaperTubeOrFRP, "1")) {
-                if (ObjectUtil.isEmpty(param.getString("PaperTubeMaterial"))) {
-                    throw new BadRequestException("纸筒物料编码不能为空");
+                if (ObjectUtil.isEmpty(ProductName)) {
+                    throw new BadRequestException("产品编码不能为空");
                 }
-                if (ObjectUtil.isEmpty(param.getString("PaperTubeDescription"))) {
-                    throw new BadRequestException("纸筒物料描述不能为空");
+                if (ObjectUtil.isEmpty(Description)) {
+                    throw new BadRequestException("产品名称不能为空");
                 }
-                if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) {
-                    throw new BadRequestException("纸筒规格不能为空");
+                if (ObjectUtil.isEmpty(Warehouse)) {
+                    throw new BadRequestException("来源卷位置不能为空");
                 }
-                if (param.getString("PaperTubeDescription").contains("3.12")) {
-                    qzz_generation = "4";
-                } else if (param.getString("PaperTubeDescription").contains("3.15")) {
-                    qzz_generation = "5";
+                if (ObjectUtil.isEmpty(ResourceName)) {
+                    throw new BadRequestException("分切机台编码不能为空");
+                }
+                if (ObjectUtil.isEmpty(SplitGroup)) {
+                    throw new BadRequestException("分切组不能为空");
+                }
+                if (ObjectUtil.isEmpty(ManufactureSort)) {
+                    throw new BadRequestException("生产顺序不能为空");
+                }
+                if (ObjectUtil.isEmpty(MfgOrderName)) {
+                    throw new BadRequestException("生产订单不能为空");
+                }
+                if (ObjectUtil.isEmpty(ManufactureDate)) {
+                    throw new BadRequestException("生产日期不能为空");
+                }
+                if (ObjectUtil.isEmpty(PaperTubeOrFRP)) {
+                    throw new BadRequestException("管件类型不能为空");
+                }
+                if (ObjectUtil.isEmpty(SplitBreadth)) {
+                    throw new BadRequestException("子卷幅宽不能为空");
+                }
+                if (ObjectUtil.isEmpty(SplitHeight)) {
+                    throw new BadRequestException("子卷理论长度不能为空");
+                }
+                if (ObjectUtil.isEmpty(SplitWeight)) {
+                    throw new BadRequestException("子卷理论重量不能为空");
+                }
+
+                /*  orderType
+                 *  1.当订单类型为1（常规）时 ParentContainerName 来源母卷号不能为空
+                 *  2.当订单类型为2（改制）时 RestructContainerName 改制来源子卷号、PackageBoxSN 子卷立库木箱号 不能为空
+                 */
+                if (StrUtil.equals(orderType, "1")) {
+                    if (ObjectUtil.isEmpty(param.getString("ParentContainerName"))) {
+                        throw new BadRequestException("来源母卷号不能为空");
+                    }
                 } else {
-                    qzz_generation = "4";
+                    if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) {
+                        throw new BadRequestException("改制来源子卷号不能为空");
+                    }
                 }
+                /*  PaperTubeOrFRP
+                 *  1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空
+                 *  2.当管件类型为2（FRP管）时 FRPMaterial FRP管物料编码、FRPDescription FRP管物料描述、FRPModel FRP管规格 不能为空
+                 */
+                String qzz_generation = "0";
+                String qzz_size = "0";
+                if (StrUtil.equals(PaperTubeOrFRP, "1")) {
+                    if (ObjectUtil.isEmpty(param.getString("PaperTubeMaterial"))) {
+                        throw new BadRequestException("纸筒物料编码不能为空");
+                    }
+                    if (ObjectUtil.isEmpty(param.getString("PaperTubeDescription"))) {
+                        throw new BadRequestException("纸筒物料描述不能为空");
+                    }
+                    if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) {
+                        throw new BadRequestException("纸筒规格不能为空");
+                    }
+                    if (param.getString("PaperTubeDescription").contains("3.12")) {
+                        qzz_generation = "4";
+                    } else if (param.getString("PaperTubeDescription").contains("3.15")) {
+                        qzz_generation = "5";
+                    } else {
+                        qzz_generation = "4";
+                    }
 
-                // 解析描述数组
-                String[] tubeArray = param.getString("PaperTubeDescription").split("\\|");
-                // 定义尺寸与长度
-                qzz_size = Character.toString(tubeArray[2].charAt(0));
-            } else {
-                if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) {
-                    throw new BadRequestException("FRP管物料编码不能为空");
-                }
-                if (ObjectUtil.isEmpty(param.getString("FRPDescription"))) {
-                    throw new BadRequestException("FRP管物料描述不能为空");
-                }
-                if (ObjectUtil.isEmpty(param.getString("FRPModel"))) {
-                    throw new BadRequestException("FRP管规格不能为空");
-                }
-                if (param.getString("FRPDescription").contains("3.12")) {
-                    qzz_generation = "4";
-                } else if (param.getString("FRPDescription").contains("3.15")) {
-                    qzz_generation = "5";
+                    // 解析描述数组
+                    String[] tubeArray = param.getString("PaperTubeDescription").split("\\|");
+                    // 定义尺寸与长度
+                    qzz_size = Character.toString(tubeArray[2].charAt(0));
                 } else {
-                    qzz_generation = "4";
+                    if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) {
+                        throw new BadRequestException("FRP管物料编码不能为空");
+                    }
+                    if (ObjectUtil.isEmpty(param.getString("FRPDescription"))) {
+                        throw new BadRequestException("FRP管物料描述不能为空");
+                    }
+                    if (ObjectUtil.isEmpty(param.getString("FRPModel"))) {
+                        throw new BadRequestException("FRP管规格不能为空");
+                    }
+                    if (param.getString("FRPDescription").contains("3.12")) {
+                        qzz_generation = "4";
+                    } else if (param.getString("FRPDescription").contains("3.15")) {
+                        qzz_generation = "5";
+                    } else {
+                        qzz_generation = "4";
+                    }
+
+                    // 解析描述数组
+                    String[] tubeArray = param.getString("FRPDescription").split("\\|");
+                    // 定义尺寸与长度
+                    qzz_size = Character.toString(tubeArray[2].charAt(0));
                 }
 
-                // 解析描述数组
-                String[] tubeArray = param.getString("FRPDescription").split("\\|");
-                // 定义尺寸与长度
-                qzz_size = Character.toString(tubeArray[2].charAt(0));
+                JSONObject json = new JSONObject();
+                json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
+                json.put("order_type", orderType);
+                json.put("container_name", ContainerName);
+                json.put("product_name", ProductName);
+                json.put("description", Description);
+                json.put("parent_container_name", param.getString("ParentContainerName"));
+                json.put("restruct_container_name", param.getString("RestructContainerName"));
+                json.put("package_box_sn", param.getString("PackageBoxSN"));
+                json.put("ware_house", Warehouse);
+                json.put("resource_name", ResourceName);
+                json.put("split_group", SplitGroup);
+                json.put("manufacture_sort", ManufactureSort);
+                json.put("mfg_order_name", MfgOrderName);
+                json.put("manufacture_date", ManufactureDate);
+                json.put("paper_tube_or_FRP", PaperTubeOrFRP);
+                json.put("paper_tube_material", param.getString("PaperTubeMaterial"));
+                json.put("paper_tube_description", param.getString("PaperTubeDescription"));
+                json.put("paper_tube_model", param.getString("PaperTubeModel"));
+                json.put("FRP_material", param.getString("FRPMaterial"));
+                json.put("FRP_description", param.getString("FRPDescription"));
+                json.put("FRP_model", param.getString("FRPModel"));
+                json.put("split_breadth", SplitBreadth);
+                json.put("split_height", SplitHeight);
+                json.put("split_weight", SplitWeight);
+                if (Attribute3.equals("U")) {
+                    json.put("up_or_down", "1");
+                } else {
+                    json.put("up_or_down", "2");
+                }
+                if (Attribute4.equals("L")) {
+                    json.put("left_or_right", "1");
+                } else {
+                    json.put("left_or_right", "2");
+                }
+                json.put("qzz_size", qzz_size);
+                if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) {
+                    json.put("is_paper_ok", "1");
+                }
+                if (Attribute5.equals("0")) {
+                    json.put("is_paper_ok", "2");
+                }
+                json.put("sale_order_name", Attribute2);
+                json.put("material_type", Attribute6);
+                json.put("start_time", DateUtil.now());
+                json.put("status", "01");
+                json.put("qzz_generation", qzz_generation);
+                json.put("is_parent_ok", "0");
+                json.put("is_child_tz_ok", "0");
+                json.put("is_child_ps_ok", "0");
+                json.put("is_delete", "0");
+                tab.insert(json);
             }
-
-            JSONObject json = new JSONObject();
-            json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
-            json.put("order_type", orderType);
-            json.put("container_name", ContainerName);
-            json.put("product_name", ProductName);
-            json.put("description", Description);
-            json.put("parent_container_name", param.getString("ParentContainerName"));
-            json.put("restruct_container_name", param.getString("RestructContainerName"));
-            json.put("package_box_sn", param.getString("PackageBoxSN"));
-            json.put("ware_house", Warehouse);
-            json.put("resource_name", ResourceName);
-            json.put("split_group", SplitGroup);
-            json.put("manufacture_sort", ManufactureSort);
-            json.put("mfg_order_name", MfgOrderName);
-            json.put("manufacture_date", ManufactureDate);
-            json.put("paper_tube_or_FRP", PaperTubeOrFRP);
-            json.put("paper_tube_material", param.getString("PaperTubeMaterial"));
-            json.put("paper_tube_description", param.getString("PaperTubeDescription"));
-            json.put("paper_tube_model", param.getString("PaperTubeModel"));
-            json.put("FRP_material", param.getString("FRPMaterial"));
-            json.put("FRP_description", param.getString("FRPDescription"));
-            json.put("FRP_model", param.getString("FRPModel"));
-            json.put("split_breadth", SplitBreadth);
-            json.put("split_height", SplitHeight);
-            json.put("split_weight", SplitWeight);
-            if (Attribute3.equals("U")) {
-                json.put("up_or_down", "1");
-            } else {
-                json.put("up_or_down", "2");
-            }
-            if (Attribute4.equals("L")) {
-                json.put("left_or_right", "1");
-            } else {
-                json.put("left_or_right", "2");
-            }
-            json.put("qzz_size", qzz_size);
-            if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) {
-                json.put("is_paper_ok", "1");
-            }
-            if (Attribute5.equals("0")) {
-                json.put("is_paper_ok", "2");
-            }
-            json.put("sale_order_name", Attribute2);
-            json.put("material_type", Attribute6);
-            json.put("start_time", DateUtil.now());
-            json.put("status", "01");
-            json.put("qzz_generation", qzz_generation);
-            json.put("is_parent_ok", "0");
-            json.put("is_child_tz_ok", "0");
-            json.put("is_child_ps_ok", "0");
-            json.put("is_delete", "0");
-            tab.insert(json);
-
-            result.put("RTYPE", "S");
-            result.put("RTMSG", "操作成功!");
-            result.put("RTOAL", 1);
-            result.put("RTDAT", null);
         } catch (Exception e) {
             result.put("RTYPE", "E");
             result.put("RTMSG", "操作失败!" + e.getMessage());
             result.put("RTOAL", 0);
             result.put("RTDAT", null);
         }
+        result.put("RTYPE", "S");
+        result.put("RTMSG", "操作成功!");
+        result.put("RTOAL", 1);
+        result.put("RTDAT", null);
+
         log.info("cutPlanTransfer接口输出参数为：-------------------" + result.toString());
         return result;
     }

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/st/outbill/DivDialog.vue

@@ -596,6 +596,7 @@ export default {
       this.loadingAlldiv = true
       this.mstrow.cancel_type = '1'
       checkoutbill.allCancel(this.mstrow).then(res => {
+        this.crud.notify('全部取消成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.queryTableDtl()
         this.updataIsOverdue()
         this.loadingAlldiv = false

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,'子卷号')" />