diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/PrintTableTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/PrintTableTwoServiceImpl.java
index 3caf629..a42a7b0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/PrintTableTwoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/PrintTableTwoServiceImpl.java
@@ -144,52 +144,63 @@ public class PrintTableTwoServiceImpl implements PrintTableTwoService {
         }
         String LabelType = jsonDict.getString("para1");
 
-        /*
-         *  生成txt文件
-         */
-        // 远程路径
-        String filePath = jsonPrint.getString("print_route") + pcsn + "内标.txt";
-        FileWriter fw = null;
-
+        //查询这个客户的子卷内标打印份数
+        Integer num = 1;
         try {
-            File file = new File(filePath);
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-            fw = new FileWriter(filePath);
-            OutputStreamWriter write = new OutputStreamWriter(new FileOutputStream(file), "utf-8");
-            BufferedWriter bw = new BufferedWriter(write);
-
-            // 抬头
-            bw.write(BTW + "\n");
-            bw.write("%END%\n");
-            // 须打印的key字段
-            bw.write("LabelType,ContainerName,SerialNumber2,ProductName,Thickness,ArealWeight,Qty,Length,InspectUser,MfgDate,ProductFamilyName,JointNumbers\n");
-            // 须打印的value值
-            bw.write(
-                    LabelType + ","
-                            + subDao.getContainer_name() + ","
-                            + subDao.getSap_pcsn() + ","
-                            + jsonPlan.getString("description") + ","
-                            + subDao.getThickness_request() + "x" + subDao.getWidth_standard() + ","
-                            + NumberUtil.round(subDao.getMass_per_unit_area(), 2).toString() + ","
-                            + NumberUtil.round(subDao.getNet_weight(), 2).toString() + ","
-                            + NumberUtil.round(subDao.getLength(), 2).toString() + ","
-                            + "GSHL-JY100" + ","
-                            + subDao.getDate_of_production() + ","
-                            + jsonPlan.getString("material_type") + ","
-                            + jsonPlan.getString("joint_type")
-            );
-            // 关闭流
-            bw.close();
-            result.put("message", "打印成功！");
+            num = jsonCust.getInteger("container_print_num");
         } catch (Exception e) {
-            result.put("message", "打印失败！" + e.getMessage());
-        } finally {
+            num = 1;
+        }
+
+        for (int i = 0; i < num; i++) {
+
+            /*
+             *  生成txt文件
+             */
+            // 远程路径
+            String filePath = jsonPrint.getString("print_route") + pcsn + "内标.txt";
+            FileWriter fw = null;
+
             try {
-                fw.close();
+                File file = new File(filePath);
+                if (!file.exists()) {
+                    file.createNewFile();
+                }
+                fw = new FileWriter(filePath);
+                OutputStreamWriter write = new OutputStreamWriter(new FileOutputStream(file), "utf-8");
+                BufferedWriter bw = new BufferedWriter(write);
+
+                // 抬头
+                bw.write(BTW + "\n");
+                bw.write("%END%\n");
+                // 须打印的key字段
+                bw.write("LabelType,ContainerName,SerialNumber2,ProductName,Thickness,ArealWeight,Qty,Length,InspectUser,MfgDate,ProductFamilyName,JointNumbers\n");
+                // 须打印的value值
+                bw.write(
+                        LabelType + ","
+                                + subDao.getContainer_name() + ","
+                                + subDao.getSap_pcsn() + ","
+                                + jsonPlan.getString("description") + ","
+                                + subDao.getThickness_request() + "x" + subDao.getWidth_standard() + ","
+                                + NumberUtil.round(subDao.getMass_per_unit_area(), 2).toString() + ","
+                                + NumberUtil.round(subDao.getNet_weight(), 2).toString() + ","
+                                + NumberUtil.round(subDao.getLength(), 2).toString() + ","
+                                + "GSHL-JY100" + ","
+                                + subDao.getDate_of_production() + ","
+                                + jsonPlan.getString("material_type") + ","
+                                + jsonPlan.getString("joint_type")
+                );
+                // 关闭流
+                bw.close();
+                result.put("message", "打印成功！");
             } catch (Exception e) {
                 result.put("message", "打印失败！" + e.getMessage());
+            } finally {
+                try {
+                    fw.close();
+                } catch (Exception e) {
+                    result.put("message", "打印失败！" + e.getMessage());
+                }
             }
         }
         return result;
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
index 6714176..99265c4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
@@ -209,7 +209,7 @@ public class PdmBiSubpackagerelationController {
 
 
     @PostMapping("/transferBoxPackageToMes")
-    @Log("传输子卷包装关系至LMS")
+    @Log("传输子卷包装关系至MES")
     //@SaCheckPermission("@el.check(updateEntityList)")
     public ResponseEntity<Object> transferBoxPackageToMes(@RequestBody JSONObject whereJson) {
         pdmBiSubpackagerelationService.transferBoxPackageToMes(true, whereJson, null, null, null);
@@ -232,7 +232,7 @@ public class PdmBiSubpackagerelationController {
     }
 
     @PostMapping("/createSubTest")
-    @Log("传输子卷包装关系至LMS")
+    @Log("创建包装关系测试")
     @SaIgnore
     public ResponseEntity<Object> createSubTest(@RequestBody JSONObject whereJson) {
         pdmBiSubpackagerelationService.createSubTest(whereJson);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
index d6317c6..5937cfb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
@@ -144,10 +144,10 @@
     </select>
     <select id="selectList" resultType="org.nl.b_lms.sch.point.dao.SchBasePoint"
             parameterType="com.alibaba.fastjson.JSONObject">
-        SELECT *
+        SELECT po.*
         FROM sch_base_point po
         WHERE po.is_used = '1'
-        AND IFNULL(po.material_code, '') = ''
+        AND (po.material_code IS NULL OR po.material_code = '')
 
         <if test="param.reging_id != null and param.reging_id != ''">
             AND po.region_id = #{param.reging_id}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/MdmDescriptionParseUtils.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/MdmDescriptionParseUtils.java
new file mode 100644
index 0000000..de6d73c
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/MdmDescriptionParseUtils.java
@@ -0,0 +1,320 @@
+package org.nl.b_lms.sch.tasks.slitter.util;
+
+
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/19
+ * @description MDM 新物料描述解析公共工具类
+ */
+@Slf4j
+public class MdmDescriptionParseUtils {
+
+//    public static void main(String[] args) {
+//        //frp
+//        String s1 = "FRP管\\玻璃纤维+环氧树脂\\Φ152.4mm*1700mm*15mm\\";
+//        //paper
+//        String s2=  "平包树脂管\\6''\\850mm*15mm\\";
+//
+//        System.out.println("FRP 的尺寸" + extractCommonTubeSize(s1));
+//        System.out.println("纸管 的尺寸" + extractCommonTubeSize(s2));
+//    }
+
+    // ==================================================
+    //====通用公共方法 用来解析纸管或者frp管尺寸 ==============
+    //===================================================
+    /**
+     * 智能提取管件尺寸（自动识别纸管或FRP管）
+     * @param tubeModel 管件型号描述
+     *                  - 纸管示例: 平包树脂管\3''\500mm*15mm\
+     *                  - FRP管示例: FRP管\玻璃纤维+环氧树脂\Φ152.4mm*1100mm*15/20mm\
+     * @return 尺寸字符串（英寸）
+     *         - 纸管返回: "3.0"
+     *         - FRP管返回: "6.0" (152.4mm / 25.4)
+     */
+    public static String extractCommonTubeSize(String tubeModel) {
+        if (ObjectUtil.isEmpty(tubeModel)) {
+            return "0";
+        }
+
+        try {
+            // 判断是纸管还是FRP管
+            if (tubeModel.contains("FRP")) {
+                // FRP管：转换为英寸
+                return extractFRPTubeSizeTrans(tubeModel);
+            } else {
+                // 纸管：直接提取英寸值
+                return extractPaperTubeSize(tubeModel);
+            }
+        } catch (Exception e) {
+            log.warn("智能提取管件尺寸失败: {}", tubeModel, e);
+            return "0";
+        }
+    }
+
+    // ==================================================
+    //==================== FRP管解析方法 ===================
+    //===================================================
+
+    /**
+     * 解析尺寸字符串，提取外径、长度、壁厚
+     * @param sizeInfo 尺寸信息，如 Φ152.4mm*1100mm*15/20mm
+     * @return String数组 [外径, 长度, 壁厚]，如 ["152.4", "1100", "15/20"]
+     */
+    public static String[] parseFRPSizeInfo(String sizeInfo) {
+        String[] result = new String[]{"0", "0", "0"};
+
+        if (ObjectUtil.isEmpty(sizeInfo)) {
+            return result;
+        }
+
+        try {
+            // 按 * 号分割
+            String[] parts = sizeInfo.split("\\*");
+
+            if (parts.length >= 3) {
+                // 清理特殊字符：移除 Φ 和 mm
+                result[0] = cleanSizeValue(parts[0]);  // Φ152.4mm → 152.4
+                result[1] = cleanSizeValue(parts[1]);  // 1100mm → 1100
+                result[2] = cleanSizeValue(parts[2]);  // 15/20mm → 15/20
+            }
+
+        } catch (Exception e) {
+            log.warn("解析尺寸信息失败: {}", sizeInfo, e);
+        }
+        return result;
+    }
+
+    /**
+     * 清理尺寸值中的特殊字符
+     * @param value 原始值，如 Φ152.4mm、1100mm、15/20mm
+     * @return 清理后的纯数值，如 152.4、1100、15/20
+     */
+    public static String cleanSizeValue(String value) {
+        if (ObjectUtil.isEmpty(value)) {
+            return "0";
+        }
+
+        // 移除 Φ、mm 等特殊字符，保留数字、小数点、斜杠
+        return value.trim()
+                .replace("Φ", "")
+                .replace("mm", "")
+                .replace("MM", "")
+                .replace("''", "")
+                .trim();
+    }
+    /**
+     * 从 FRP 管型号中提取长度（mm）
+     * @param frpModel FRP管型号描述，如 FRP管\玻璃纤维+环氧树脂\Φ152.4mm*1100mm*15/20mm\
+     * @return 长度字符串，如 "1100"
+     */
+    public static String extractFRPLength(String frpModel) {
+        if (ObjectUtil.isEmpty(frpModel)) {
+            return "0";
+        }
+
+        try {
+            String[] sizeParams = parseFRPSizeInfo(frpModel);
+            return sizeParams[1];  // 返回长度
+        } catch (Exception e) {
+            log.warn("提取FRP管长度失败: {}", frpModel, e);
+            return "0";
+        }
+    }
+
+    /**
+     * 从 FRP 管型号中提取壁厚
+     * @param frpModel FRP管型号描述，如 FRP管\玻璃纤维+环氧树脂\Φ152.4mm*1100mm*15/20mm\
+     * @return 壁厚字符串，单壁厚如 "15"，双壁厚如 "15/20"
+     */
+    public static String extractFRPWallThickness(String frpModel) {
+        if (ObjectUtil.isEmpty(frpModel)) {
+            return "0";
+        }
+
+        try {
+            String[] sizeParams = parseFRPSizeInfo(frpModel);
+            return sizeParams[2];  // 返回壁厚
+        } catch (Exception e) {
+            log.warn("提取FRP管壁厚失败: {}", frpModel, e);
+            return "0";
+        }
+    }
+
+    /**
+     * 从 FRP 管型号中提取外径（mm）
+     * @param frpModel FRP管型号描述，如 FRP管\玻璃纤维+环氧树脂\Φ152.4mm*1100mm*15/20mm\
+     * @return 外径字符串，如 "152.4"
+     */
+    public static String extractFRPTubeSizeOrag(String frpModel) {
+        if (ObjectUtil.isEmpty(frpModel)) {
+            return "0";
+        }
+
+        try {
+            String[] sizeParams = parseFRPSizeInfo(frpModel);
+            return sizeParams[0];
+        } catch (Exception e) {
+            log.warn("提取FRP管外径失败: {}", frpModel, e);
+            return "0";
+        }
+    }
+
+    /**
+     * 从 FRP 管型号中提取外径（mm）
+     * @param tubeModel FRP管型号描述，如 FRP管\玻璃纤维+环氧树脂\Φ152.4mm*1100mm*15/20mm\
+     * @return 外径字符串，如 "152.4 / 25.4  = 6"
+     */
+    public static String extractFRPTubeSizeTrans(String tubeModel) {
+        if (ObjectUtil.isEmpty(tubeModel)) {
+            return "";
+        }
+        try {
+            // 清理末尾反斜杠
+            String cleanStr = tubeModel.trim().replaceAll("\\\\+$", "");
+            String[] parts = cleanStr.split("\\\\");
+
+            if (parts.length >= 3) {
+                // 解析尺寸信息：[外径, 长度, 壁厚]
+                String sizeInfo = parts[2];
+                String[] sizeParams = parseFRPSizeInfo(sizeInfo);
+                // 外径mm，如 "152.4"
+                String externalDiameter = sizeParams[0];
+                // 将毫米转换为英寸
+                if (ObjectUtil.isNotEmpty(externalDiameter) && !"0".equals(externalDiameter)) {
+                    double diameterMm = Double.parseDouble(externalDiameter);
+                    double diameterInch = diameterMm / 25.4;
+                    // 保留整数或一位小数
+                    return String.valueOf(NumberUtil.round(diameterInch, 1).doubleValue());
+                }
+            }
+        } catch (Exception e) {
+            log.warn("提取纸管尺寸失败: {}", tubeModel, e);
+        }
+        return "";
+    }
+
+
+    // ==================================================
+    //==================== 纸管解析方法 ===================
+    //===================================================
+    /**
+     * 从纸管型号中提取尺寸（英寸）
+     * @param paperTubeModel 纸管型号描述，如 平包树脂管\3''\500mm*15mm\
+     * @return 英寸数值字符串，如 "3"
+     */
+    public static String extractPaperTubeSize(String paperTubeModel) {
+        if (ObjectUtil.isEmpty(paperTubeModel)) {
+            return "0";
+        }
+
+        try {
+            // 清理末尾反斜杠
+            String cleanStr = paperTubeModel.trim().replaceAll("\\\\+$", "");
+            String[] parts = cleanStr.split("\\\\");
+
+            if (parts.length >= 2) {
+                // 第二部分是尺寸：3''
+                String sizePart = parts[1];
+                // 移除 '' 符号
+                String cleaned =cleanSizeValue(sizePart);
+                double num = Double.parseDouble(cleaned);
+                // 四舍五入取整数
+                long rounded = Math.round(num);
+                return rounded + ".0";
+            }
+        } catch (Exception e) {
+            log.warn("提取纸管尺寸失败: {}", paperTubeModel, e);
+        }
+
+        return "0";
+    }
+
+    /**
+     * 从纸管型号中提取长度和壁厚
+     * @param paperTubeModel 纸管型号描述，如 平包树脂管\3''\500mm*15mm\
+     * @return String数组 [长度, 壁厚]，如 ["500", "15"]
+     */
+    public static String[] extractPaperTubeSpecs(String paperTubeModel) {
+        String[] result = new String[]{"0", "0"};
+
+        if (ObjectUtil.isEmpty(paperTubeModel)) {
+            return result;
+        }
+
+        try {
+            // 清理末尾反斜杠
+            String cleanStr = paperTubeModel.trim().replaceAll("\\\\+$", "");
+            String[] parts = cleanStr.split("\\\\");
+
+            if (parts.length >= 3) {
+                // 第三部分是规格：500mm*15mm
+                String specPart = parts[2];
+                String[] specs = specPart.split("\\*");
+
+                if (specs.length >= 2) {
+                    result[0] = cleanSizeValue(specs[0]);  // 长度：500
+                    result[1] = cleanSizeValue(specs[1]);  // 壁厚：15
+                } else if (specs.length == 1) {
+                    result[0] = cleanSizeValue(specs[0]);  // 只有长度
+                }
+            }
+        } catch (Exception e) {
+            log.warn("提取纸管规格失败: {}", paperTubeModel, e);
+        }
+
+        return result;
+    }
+
+    // ==================================================
+    //==================== 木箱解析方法 ===================
+    //===================================================
+    /**
+     * 从木箱型号中提取关键信息
+     * @param woodenBoxModel 木箱型号描述，如 铜箔木箱\1100/1/6\1148mm*636mm*690mm\非熏蒸\U60
+     * @return String数组 [数量/层数/其他]，如 ["1100", "1", "6"]
+     */
+    public static String[] parseMxBoxDetailInfo(String woodenBoxModel) {
+        String[] result = new String[]{"0", "0", "0"};
+
+        if (ObjectUtil.isEmpty(woodenBoxModel)) {
+            return result;
+        }
+
+        try {
+            // 清理末尾反斜杠
+            String cleanStr = woodenBoxModel.trim().replaceAll("\\\\+$", "");
+            String[] parts = cleanStr.split("\\\\");
+
+            if (parts.length >= 2) {
+                // 第二部分是关键信息：1100/1/6
+                String keyInfo = parts[1];
+                // 按 / 分割
+                String[] infoParts = keyInfo.split("/");
+
+                if (infoParts.length >= 3) {
+                    result[0] = infoParts[0].trim();  // 1100
+                    result[1] = infoParts[1].trim();  // 1
+                    result[2] = infoParts[2].trim();  // 6
+                } else if (infoParts.length == 2) {
+                    result[0] = infoParts[0].trim();
+                    result[1] = infoParts[1].trim();
+                    result[2] = "";
+                } else if (infoParts.length == 1) {
+                    result[0] = infoParts[0].trim();
+                    result[1] = "";
+                    result[2] = "";
+                }
+            }
+        } catch (Exception e) {
+            log.warn("解析木箱信息失败: {}", woodenBoxModel, e);
+        }
+        return result;
+    }
+
+
+    }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
index 444a3d0..9fc4d2b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
@@ -736,8 +736,10 @@
         ) AS c
         LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
         LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+        LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id
         INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn =
         dis.box_no
+
         WHERE
         mst.io_type = '0'
         AND mst.is_delete = '0'
@@ -748,6 +750,12 @@
                 #{code}
             </foreach>
         </if>
+        <if test="paramMap.is_virtual == 0">
+            AND sect.sect_type_attr <![CDATA[ <> ]]> '09'
+        </if>
+        <if test="paramMap.is_virtual == 1">
+            AND sect.sect_type_attr = '09'
+        </if>
         <if test="paramMap.product_area != null and !paramMap.product_area.isEmpty()">
             AND LEFT(sub.container_name,2) IN
             <foreach collection="paramMap.product_area" item="code" separator="," open="(" close=")">
@@ -761,9 +769,9 @@
         <if test="paramMap.thickness_request != null and paramMap.thickness_request != ''">
             AND sub.thickness_request = #{paramMap.thickness_request}
         </if>
-        <if test="paramMap.bill_type != null and paramMap.bill_type != '' and paramMap.bill_type == '0001'">
+  <!--      <if test="paramMap.bill_type != null and paramMap.bill_type != '' and paramMap.bill_type == '0001'">
             AND IFNULL(sub.sub_type,'') = ''
-        </if>
+        </if>-->
         <if test="paramMap.sale_order_name != null and paramMap.sale_order_name != ''">
             AND sub.sale_order_name = #{paramMap.sale_order_name}
         </if>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index fbb44c4..78cc7bb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -1501,7 +1501,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 .map(row -> row.getString("row_num"))
                 .distinct().collect(Collectors.joining("','"));
 
-        List<JSONObject> attrRowList = attrTab.query("stor_id = '" + IOSEnum.STOR_ID.code("二期") + "' AND row_num IN ('" + rowIn + "')")
+        List<JSONObject> attrRowList = attrTab.query("stor_id = '" + IOSEnum.STOR_ID.code("印尼仓库") + "' AND row_num IN ('" + rowIn + "')")
                 .getResultJSONArray(0).toJavaList(JSONObject.class);
 
         // 需移库仓位集合
@@ -1562,7 +1562,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 .map(row -> row.getString("row_num"))
                 .distinct().collect(Collectors.toList());
 
-        List<JSONObject> attrRowList = structattrService.getRowsAttributeToObject(IOSEnum.STOR_ID.code("二期"), rows);
+        List<JSONObject> attrRowList = structattrService.getRowsAttributeToObject(IOSEnum.STOR_ID.code("印尼仓库"), rows);
 
         // 需移库仓位集合
         List<JSONObject> needMoveAttrList = new ArrayList<>();
@@ -1661,7 +1661,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 if (flag) {
                     // 查询移入货位
                     JSONObject moveParam = new JSONObject();
-                    moveParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+                    moveParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
                     moveParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
                     moveParam.put("box_no", jsonLow.getString("storagevehicle_code"));
                     //根据木箱高度，判断入库仓位的高度、
@@ -1797,7 +1797,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 if (flag) {
                     // 查询移入货位
                     JSONObject moveParam = new JSONObject();
-                    moveParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+                    moveParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
                     moveParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
                     moveParam.put("box_no", jsonLow.getString("storagevehicle_code"));
                     //根据木箱高度，判断入库仓位的高度、
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 649afe7..dc67e49 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -476,7 +476,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                     JSONObject sendJson = new JSONObject();
                     sendJson.put("task_id", task_id1);
                     //测试屏蔽下发acs
-//                    this.reIssueTask(sendJson);
+                    this.reIssueTask(sendJson);
                 }
             } else {
                 throw new BadRequestException("有入库单据正在分配中，请稍后在试");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index e5b309c..3bfa702 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -166,7 +166,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
             height = "3";
         }
         JSONObject jsonParam = new JSONObject();
-        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("box_length", boxDao.getBox_length());
         jsonParam.put("box_width", boxDao.getBox_width());
@@ -566,7 +566,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         );
 
         JSONObject jsonParam = new JSONObject();
-        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("box_length", boxDao.getBox_length());
         jsonParam.put("box_width", boxDao.getBox_width());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
index d231130..4d8da96 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
@@ -407,7 +407,7 @@ public class InBussManageServiceImpl implements InBussManageService {
         jsonDiv.put("checked", true);
         jsonDiv.put("is_send", IOSEnum.IS_SEND.code("否"));
         jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区"));
-        jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         jsonDiv.put("move_block_num", jsonAttr.getString("block_num"));
         jsonDiv.put("in_buss", IOSEnum.IS_NOTANDYES.code("是"));
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java
index 9f11a66..39ba124 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java
@@ -78,7 +78,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
         // 找一个托盘区的空仓位
         JSONObject jsonParam = new JSONObject();
-        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("vehicle_type", whereJson.getString("vehicle_type"));
 
@@ -141,7 +141,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
         // 重新分配货位
         JSONObject jsonParam = new JSONObject();
-        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("vehicle_type", jsonAttr.getStoragevehicle_type());
         jsonParam.put("move_block_num", jsonAttr.getBlock_num());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
index 647e85d..2b7e560 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
@@ -97,7 +97,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         // 载具扩展属性表
         WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
 
-        whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        whereJson.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         whereJson.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
 
        /* // 判断起点点位是否存在
@@ -154,7 +154,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
         // 载具扩展属性表
         WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
-        whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        whereJson.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         whereJson.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         /*
          * 判断是否有相同规格的木箱
@@ -234,7 +234,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
             );
 
             JSONObject jsonParam = new JSONObject();
-            jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+            jsonParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
             jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
             jsonParam.put("material_code", boxDao.getMaterial_code());
             jsonParam.put("move_block_num", jsonAttr.getBlock_num());
@@ -728,7 +728,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
 
         // 找一个空的仓位
         JSONObject paramIn = new JSONObject();
-        paramIn.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        paramIn.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         paramIn.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         paramIn.put("vehicle_type", jsonObject.getString("storagevehicle_type"));
         paramIn.put("height", jsonObject.getString("height"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
index 2d00046..e499bd6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
@@ -47,11 +47,13 @@ import org.nl.wms.st.instor.task.HandMoveStorAcsTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -185,8 +187,10 @@ public class OutBussManageServiceImpl implements OutBussManageService {
             // 有订单号: 找相同物料、订单号的库存,并根据仓位分组、即木箱分组
             // mark: likeMaterOrderMap -> 同物料、同订单号的库存信息（key(仓位编码) ： value(库存实体)）,也就是一个仓位对应所有的子卷
             Map<String, List<JSONObject>> likeMaterOrderMap = ivtList.stream()
-                    .filter(row -> row.getString("material_id").equals(dtlDao.getMaterial_id()) &&
-                            row.getString("sale_order_name").equals(dtlDao.getSource_bill_code()))
+                    .filter(row -> !StringUtils.isEmpty(dtlDao.getMaterial_id())
+                            && !StringUtils.isEmpty(dtlDao.getSource_bill_code())
+                            && dtlDao.getMaterial_id().equals(row.getString("material_id"))
+                            && dtlDao.getSource_bill_code().equals(row.getString("sale_order_name")))
                     .collect(Collectors.groupingBy(row -> row.getString("struct_code")));
 
             if (ObjectUtil.isEmpty(likeMaterOrderMap)) {
@@ -762,7 +766,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
         // 2.重新分配货位
         // 组织查询移入仓位数据
         JSONObject moveParam = new JSONObject();
-        moveParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        moveParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         moveParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         moveParam.put("box_no", taskDao.getVehicle_code());
         moveParam.put("material_id", jsonMater.getString("material_id"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
index 465c57d..6c8862a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
@@ -75,7 +75,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
 
         // 仓位表
 
-        whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        whereJson.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         whereJson.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         whereJson.put("storagevehicle_type", whereJson.getString("vehicle_type"));
 
@@ -157,7 +157,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
 
         // 重新分配货位
         JSONObject jsonParam = new JSONObject();
-        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonParam.put("stor_id", IOSEnum.STOR_ID.code("印尼仓库"));
         jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("move_block_num", jsonAttr.getBlock_num());
         jsonParam.put("storagevehicle_type", taskDao.getVehicle_type());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java
index cae138e..e995de4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java
@@ -217,4 +217,14 @@ public class MdCsCustomerBase implements Serializable {
      * 是否单卷单箱
      */
     private String is_single_roll_single_box;
+
+    /**
+     * 外包装标签打印份数
+     */
+    private Integer outer_packaging_print_num;
+
+    /**
+     * 子卷内标打印份数
+     */
+    private Integer container_print_num;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/thread/ApiLogExecutorConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/thread/ApiLogExecutorConfig.java
new file mode 100644
index 0000000..80927a4
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/config/thread/ApiLogExecutorConfig.java
@@ -0,0 +1,35 @@
+package org.nl.config.thread;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description 外部系统接口执行异步线程池配置
+ */
+
+@Configuration
+@Slf4j
+public class ApiLogExecutorConfig {
+
+    @Bean("apiLogExecutor")
+    public Executor apiLogExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(200);
+        executor.setKeepAliveSeconds(60);
+        executor.setThreadNamePrefix("sys-api-log-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.setWaitForTasksToCompleteOnShutdown(true);
+        executor.setAwaitTerminationSeconds(60);
+        executor.initialize();
+        return executor;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/annotation/ApiLog.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/annotation/ApiLog.java
new file mode 100644
index 0000000..5e0545e
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/annotation/ApiLog.java
@@ -0,0 +1,22 @@
+package org.nl.modules.logging.annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description 注解
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ApiLog {
+
+    String bizCode() default "";
+
+    String bizDesc() default "";
+
+    String systemFlag() default "";
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java
new file mode 100644
index 0000000..a9d3bf7
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java
@@ -0,0 +1,141 @@
+package org.nl.modules.logging.aspect;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.logging.annotation.ApiLog;
+import org.nl.system.service.sysapi.entity.SysApiLog;
+import org.nl.system.service.sysapi.service.ISysApiLogService;
+import org.slf4j.MDC;
+import com.alibaba.fastjson2.JSONObject;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description aop
+ */
+
+
+@Aspect
+@Component
+@Slf4j
+public class ApiLogAspect {
+
+    private final ISysApiLogService apiLogService;
+
+    public ApiLogAspect(ISysApiLogService apiLogService) {
+        this.apiLogService = apiLogService;
+    }
+
+    @Around("@annotation(apiLog)")
+    public Object around(ProceedingJoinPoint joinPoint, ApiLog apiLog) throws Throwable {
+        long startTime = System.currentTimeMillis();
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+
+        SysApiLog logEntity = new SysApiLog();
+        logEntity.setLogId(IdUtil.getStringId());
+        logEntity.setDirection(1);
+        logEntity.setSystemFlag(apiLog.systemFlag());
+        logEntity.setBizCode(apiLog.bizCode());
+        logEntity.setBizDesc(apiLog.bizDesc());
+        logEntity.setTraceId(MDC.get("traceId"));
+        logEntity.setCreateTime(DateUtil.now());
+
+        try {
+            if (attributes != null) {
+                HttpServletRequest request = attributes.getRequest();
+                logEntity.setApiUrl(request.getRequestURI());
+                logEntity.setRequestMethod(request.getMethod());
+                logEntity.setRequestIp(getIpAddress(request));
+                logEntity.setRequestHeaders(JSONUtil.toJsonStr(getRequestHeaders(request)));
+            }
+
+            MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+            Method method = signature.getMethod();
+            Object[] args = joinPoint.getArgs();
+            logEntity.setRequestParams(buildRequestParams(method, args));
+
+            Object result = joinPoint.proceed();
+
+            JSONObject jsonObject = JSONObject.parseObject(JSONUtil.toJsonStr(result));
+            JSONObject jsonObject1 = jsonObject.getJSONObject("body");
+            if(null == jsonObject1){
+                logEntity.setResponseStatus(400);
+                logEntity.setStatus("FAIL");
+                logEntity.setErrorMsg("返回信息为空，请确认！");
+                logEntity.setResponseBody("返回信息为空，请确认！");
+            }else{
+                String rtype = jsonObject1.getString("RTYPE");
+                if(rtype.equalsIgnoreCase("E")){
+                    logEntity.setResponseStatus(400);
+                    logEntity.setStatus("FAIL");
+                    logEntity.setErrorMsg(JSONUtil.toJsonStr(result));
+                    logEntity.setResponseBody(JSONUtil.toJsonStr(result));
+                }else{
+                    logEntity.setResponseStatus(200);
+                    logEntity.setStatus("SUCCESS");
+                    logEntity.setResponseBody(JSONUtil.toJsonStr(result));
+                }
+            }
+
+            long costTime = System.currentTimeMillis() - startTime;
+            logEntity.setCostTime(costTime);
+
+            return result;
+
+        } catch (Throwable throwable) {
+            long costTime = System.currentTimeMillis() - startTime;
+            logEntity.setCostTime(costTime);
+            logEntity.setStatus("FAIL");
+            logEntity.setErrorMsg(throwable.getMessage());
+
+            throw throwable;
+
+        } finally {
+            apiLogService.saveAsync(logEntity);
+        }
+    }
+
+    private String getIpAddress(HttpServletRequest request) {
+        String ip = request.getHeader("X-Forwarded-For");
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("X-Real-IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip;
+    }
+
+    private Map<String, String> getRequestHeaders(HttpServletRequest request) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", request.getContentType());
+        headers.put("User-Agent", request.getHeader("User-Agent"));
+        return headers;
+    }
+
+    private String buildRequestParams(Method method, Object[] args) {
+        try {
+            if (args == null || args.length == 0) {
+                return "{}";
+            }
+            return JSONUtil.toJsonStr(args);
+        } catch (Exception e) {
+            return "参数序列化失败";
+        }
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java
new file mode 100644
index 0000000..6219a00
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java
@@ -0,0 +1,149 @@
+package org.nl.system.controller.sysapi;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.system.service.sysapi.entity.SysApiLog;
+import org.nl.system.service.sysapi.entity.dto.ApiLogQuery;
+import org.nl.system.service.sysapi.service.ISysApiLogHistoryService;
+import org.nl.system.service.sysapi.service.ISysApiLogService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description 外部系统接口日志控制器
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/sysApiLog")
+@Slf4j
+public class SysApiLogController {
+
+    private final ISysApiLogService apiLogService;
+
+    private  final ISysApiLogHistoryService apiLogHistoryService;
+
+    /**
+     * 分页查询接口日志列表
+     */
+    @GetMapping
+    @Log("查询接口日志列表")
+    public ResponseEntity<Map<String, Object>> query(ApiLogQuery query) {
+        LambdaQueryWrapper<SysApiLog> wrapper = new LambdaQueryWrapper<>();
+
+        if (query.getDirection() != null) {
+            wrapper.eq(SysApiLog::getDirection, query.getDirection());
+        }
+
+        if (query.getSystemFlag() != null && !query.getSystemFlag().isEmpty()) {
+            wrapper.eq(SysApiLog::getSystemFlag, query.getSystemFlag());
+        }
+
+        if (query.getBizCode() != null && !query.getBizCode().isEmpty()) {
+            wrapper.eq(SysApiLog::getBizCode, query.getBizCode());
+        }
+
+        if (query.getTraceId() != null && !query.getTraceId().isEmpty()) {
+            wrapper.eq(SysApiLog::getTraceId, query.getTraceId());
+        }
+
+        if (query.getApiUrl() != null && !query.getApiUrl().isEmpty()) {
+            wrapper.like(SysApiLog::getApiUrl, query.getApiUrl());
+        }
+
+        if (query.getStatus() != null && !query.getStatus().isEmpty()) {
+            wrapper.eq(SysApiLog::getStatus, query.getStatus());
+        }
+
+        if (query.getBegin_time() != null && !query.getBegin_time().isEmpty()) {
+            String beginTime = query.getBegin_time() + " 00:00:00";
+            wrapper.ge(SysApiLog::getCreateTime, beginTime);
+        }
+
+        if (query.getEnd_time() != null && !query.getEnd_time().isEmpty()) {
+            String endTime = query.getEnd_time() + " 23:59:59";
+            wrapper.le(SysApiLog::getCreateTime, endTime);
+        }
+
+        if (query.getKeyword() != null && !query.getKeyword().isEmpty()) {
+            wrapper.and(w -> w.like(SysApiLog::getBizDesc, query.getKeyword())
+                    .or().like(SysApiLog::getApiDesc, query.getKeyword())
+                    .or().like(SysApiLog::getRequestParams, query.getKeyword())
+                    .or().like(SysApiLog::getResponseBody, query.getKeyword()));
+        }
+
+        wrapper.orderByDesc(SysApiLog::getCreateTime);
+
+        Page<SysApiLog> page = new Page<>(query.getPage()+1, query.getSize());
+        IPage<SysApiLog> result = apiLogService.page(page, wrapper);
+
+        Map<String, Object> response = new HashMap<>();
+        response.put("content", result.getRecords());
+        response.put("totalElements", result.getTotal());
+        response.put("totalPages", result.getPages());
+        response.put("size", result.getSize());
+        response.put("number", result.getCurrent());
+
+        return new ResponseEntity<>(response, HttpStatus.OK);
+    }
+
+    /**
+     * 根据ID查询日志详情
+     */
+    @GetMapping("/{id}")
+    @Log("查询接口日志详情")
+    public ResponseEntity<SysApiLog> findById(@PathVariable String id) {
+        SysApiLog apiLog = apiLogService.getById(id);
+        return new ResponseEntity<>(apiLog, HttpStatus.OK);
+    }
+
+    /**
+     * 获取业务类型列表（根据系统标识）
+     */
+    @GetMapping("/bizCodeList")
+    @Log("获取业务类型列表")
+    public ResponseEntity<List<Map<String, String>>> getBizCodeList(@RequestParam String systemFlag, @RequestParam String direction) {
+        LambdaQueryWrapper<SysApiLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysApiLog::getSystemFlag, systemFlag)
+                .eq(SysApiLog::getDirection, direction)
+                .select(SysApiLog::getBizCode, SysApiLog::getBizDesc)
+                .groupBy(SysApiLog::getBizCode, SysApiLog::getBizDesc)
+                .orderByAsc(SysApiLog::getBizCode);
+
+        List<SysApiLog> list = apiLogService.list(wrapper);
+
+        List<Map<String, String>> result = list.stream()
+                .map(log -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("bizCode", log.getBizCode());
+                    map.put("bizDesc", log.getBizCode() + " - " +log.getBizDesc());
+                    return map;
+                })
+                .collect(Collectors.toList());
+
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    /**
+     * 日志归档
+     */
+    @PostMapping("/archive")
+    @Log("接口日志归档")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity archiveLogs() {
+        return apiLogService.archiveLogs();
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/SysApiLog.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/SysApiLog.java
new file mode 100644
index 0000000..c6f91ca
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/SysApiLog.java
@@ -0,0 +1,83 @@
+package org.nl.system.service.sysapi.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description TODO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@TableName("sys_api_log")
+@Accessors(chain = true)
+public class SysApiLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("log_id")
+    private String logId;
+
+    @TableField("direction")
+    private Integer direction;
+
+    @TableField("system_flag")
+    private String systemFlag;
+
+    @TableField("biz_code")
+    private String bizCode;
+
+    @TableField("biz_desc")
+    private String bizDesc;
+
+    @TableField("api_url")
+    private String apiUrl;
+
+    @TableField("api_desc")
+    private String apiDesc;
+
+    @TableField("trace_id")
+    private String traceId;
+
+    @TableField("request_method")
+    private String requestMethod;
+
+    @TableField("request_ip")
+    private String requestIp;
+
+    @TableField("request_headers")
+    private String requestHeaders;
+
+    @TableField("request_params")
+    private String requestParams;
+
+    @TableField("response_body")
+    private String responseBody;
+
+    @TableField("response_status")
+    private Integer responseStatus;
+
+    @TableField("cost_time")
+    private Long costTime;
+
+    @TableField("status")
+    private String status;
+
+    @TableField("error_msg")
+    private String errorMsg;
+
+    @TableField("operator")
+    private String operator;
+
+    @TableField("create_time")
+    private String createTime;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/SysApiLogHistory.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/SysApiLogHistory.java
new file mode 100644
index 0000000..c704f25
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/SysApiLogHistory.java
@@ -0,0 +1,93 @@
+package org.nl.system.service.sysapi.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
+
+import java.io.Serializable;
+
+/**
+ * 接口日志对象 sys_api_log_history
+ *
+ * @author ruoyi
+ * @date 2026-05-26
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_api_log_history")
+public class SysApiLogHistory implements Serializable
+{
+        private static final long serialVersionUID = 1L;
+
+        @TableId("log_id")
+        private String logId;
+
+        @TableField("direction")
+        private Integer direction;
+
+        @TableField("system_flag")
+        private String systemFlag;
+
+        @TableField("biz_code")
+        private String bizCode;
+
+        @TableField("biz_desc")
+        private String bizDesc;
+
+        @TableField("api_url")
+        private String apiUrl;
+
+        @TableField("api_desc")
+        private String apiDesc;
+
+        @TableField("trace_id")
+        private String traceId;
+
+        @TableField("request_method")
+        private String requestMethod;
+
+        @TableField("request_ip")
+        private String requestIp;
+
+        @TableField("request_headers")
+        private String requestHeaders;
+
+        @TableField("request_params")
+        private String requestParams;
+
+        @TableField("response_body")
+        private String responseBody;
+
+        @TableField("response_status")
+        private Integer responseStatus;
+
+        @TableField("cost_time")
+        private Long costTime;
+
+        @TableField("status")
+        private String status;
+
+        @TableField("error_msg")
+        private String errorMsg;
+
+        @TableField("operator")
+        private String operator;
+
+        @TableField("create_time")
+        private String createTime;
+
+        //copy method
+        public static SysApiLogHistory adapter(SysApiLog sysApiLog){
+                SysApiLogHistory sysApiLogHistory = new SysApiLogHistory();
+                BeanUtils.copyProperties(sysApiLog,sysApiLogHistory);
+                return sysApiLogHistory;
+        }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java
new file mode 100644
index 0000000..228b767
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java
@@ -0,0 +1,34 @@
+package org.nl.system.service.sysapi.entity.dto;
+import lombok.Data;
+import org.nl.common.domain.query.PageQuery;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description 外部系统接口查询实体Vo类
+ */
+
+@Data
+public class ApiLogQuery extends PageQuery {
+
+    private Integer direction;
+
+    private String systemFlag;
+
+    private String bizCode;
+
+    private String traceId;
+
+    private String apiUrl;
+
+    private String status;
+
+    private String begin_time;
+
+    private String end_time;
+
+    private String keyword;
+
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/mapper/SysApiLogHistoryMapper.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/mapper/SysApiLogHistoryMapper.java
new file mode 100644
index 0000000..8cc567b
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/mapper/SysApiLogHistoryMapper.java
@@ -0,0 +1,62 @@
+package org.nl.system.service.sysapi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.system.service.sysapi.entity.SysApiLogHistory;
+
+import java.util.List;
+
+/**
+ * 接口日志Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-05-26
+ */
+public interface SysApiLogHistoryMapper extends BaseMapper<SysApiLogHistory> {
+    /**
+     * 查询接口日志
+     *
+     * @param logId 接口日志主键
+     * @return 接口日志
+     */
+    public SysApiLogHistory selectSysApiLogHistoryByLogId(String logId);
+
+    /**
+     * 查询接口日志列表
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 接口日志集合
+     */
+    public List<SysApiLogHistory> selectSysApiLogHistoryList(SysApiLogHistory sysApiLogHistory);
+
+    /**
+     * 新增接口日志
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 结果
+     */
+    public int insertSysApiLogHistory(SysApiLogHistory sysApiLogHistory);
+
+    /**
+     * 修改接口日志
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 结果
+     */
+    public int updateSysApiLogHistory(SysApiLogHistory sysApiLogHistory);
+
+    /**
+     * 删除接口日志
+     *
+     * @param logId 接口日志主键
+     * @return 结果
+     */
+    public int deleteSysApiLogHistoryByLogId(String logId);
+
+    /**
+     * 批量删除接口日志
+     *
+     * @param logIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysApiLogHistoryByLogIds(String[] logIds);
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/mapper/SysApiLogMapper.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/mapper/SysApiLogMapper.java
new file mode 100644
index 0000000..55519d5
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/mapper/SysApiLogMapper.java
@@ -0,0 +1,16 @@
+package org.nl.system.service.sysapi.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.nl.system.service.sysapi.entity.SysApiLog;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description TODO
+ */
+
+
+@Mapper
+public interface SysApiLogMapper extends BaseMapper<SysApiLog> {
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/ISysApiLogHistoryService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/ISysApiLogHistoryService.java
new file mode 100644
index 0000000..011060c
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/ISysApiLogHistoryService.java
@@ -0,0 +1,62 @@
+package org.nl.system.service.sysapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.system.service.sysapi.entity.SysApiLogHistory;
+
+import java.util.List;
+
+/**
+ * 接口日志Service接口
+ *
+ * @author ruoyi
+ * @date 2026-05-26
+ */
+public interface ISysApiLogHistoryService extends IService<SysApiLogHistory> {
+    /**
+     * 查询接口日志
+     *
+     * @param logId 接口日志主键
+     * @return 接口日志
+     */
+    public SysApiLogHistory selectSysApiLogHistoryByLogId(String logId);
+
+    /**
+     * 查询接口日志列表
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 接口日志集合
+     */
+    public List<SysApiLogHistory> selectSysApiLogHistoryList(SysApiLogHistory sysApiLogHistory);
+
+    /**
+     * 新增接口日志
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 结果
+     */
+    public int insertSysApiLogHistory(SysApiLogHistory sysApiLogHistory);
+
+    /**
+     * 修改接口日志
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 结果
+     */
+    public int updateSysApiLogHistory(SysApiLogHistory sysApiLogHistory);
+
+    /**
+     * 批量删除接口日志
+     *
+     * @param logIds 需要删除的接口日志主键集合
+     * @return 结果
+     */
+    public int deleteSysApiLogHistoryByLogIds(String[] logIds);
+
+    /**
+     * 删除接口日志信息
+     *
+     * @param logId 接口日志主键
+     * @return 结果
+     */
+    public int deleteSysApiLogHistoryByLogId(String logId);
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/ISysApiLogService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/ISysApiLogService.java
new file mode 100644
index 0000000..c8dbc5a
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/ISysApiLogService.java
@@ -0,0 +1,21 @@
+package org.nl.system.service.sysapi.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.poi.ss.formula.functions.T;
+import org.nl.system.service.sysapi.entity.SysApiLog;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description TODO
+ */
+
+public interface ISysApiLogService extends IService<SysApiLog> {
+
+    @Async("apiLogExecutor")
+    void saveAsync(SysApiLog apiLog);
+
+    ResponseEntity<T>  archiveLogs();
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/OutboundApiLogger.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/OutboundApiLogger.java
new file mode 100644
index 0000000..3c82eca
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/OutboundApiLogger.java
@@ -0,0 +1,70 @@
+package org.nl.system.service.sysapi.service;
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.IdUtil;
+import org.nl.system.service.sysapi.entity.SysApiLog;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description 外部系统外出接口出口日志记录Logger
+ */
+
+
+@Component
+@Slf4j
+public class OutboundApiLogger {
+
+    private static ISysApiLogService apiLogService;
+
+    @Autowired
+    public void setApiLogService(ISysApiLogService service) {
+        OutboundApiLogger.apiLogService = service;
+    }
+
+    public static void log(String systemFlag, String bizCode, String bizDesc,
+                           String apiUrl, String requestMethod, String requestParams,
+                           String responseBody, Integer responseStatus, Long costTime,
+                           String status, String errorMsg) {
+        try {
+            SysApiLog logEntity = new SysApiLog();
+            logEntity.setLogId(IdUtil.getStringId());
+            logEntity.setDirection(0);
+            logEntity.setSystemFlag(systemFlag);
+            logEntity.setBizCode(bizCode);
+            logEntity.setBizDesc(bizDesc);
+            logEntity.setTraceId(MDC.get("traceId"));
+            logEntity.setApiUrl(apiUrl);
+            logEntity.setRequestMethod(requestMethod);
+            logEntity.setRequestParams(requestParams);
+            logEntity.setResponseBody(responseBody);
+            logEntity.setResponseStatus(responseStatus);
+            logEntity.setCostTime(costTime);
+            logEntity.setStatus(status);
+            logEntity.setErrorMsg(errorMsg);
+            logEntity.setCreateTime(DateUtil.now());
+
+            apiLogService.saveAsync(logEntity);
+        } catch (Exception e) {
+            log.error("记录出站接口日志失败", e);
+        }
+    }
+
+    public static void logSuccess(String systemFlag, String bizType, String bizDesc,
+                                  String apiUrl, String requestMethod, String requestParams,
+                                  String responseBody, Integer responseStatus, Long costTime) {
+        log(systemFlag, bizType, bizDesc, apiUrl, requestMethod, requestParams,
+                responseBody, responseStatus, costTime, "SUCCESS", null);
+    }
+
+    public static void logFail(String systemFlag, String bizType, String bizDesc,
+                               String apiUrl, String requestMethod, String requestParams,
+                               String errorMsg, Long costTime) {
+        log(systemFlag, bizType, bizDesc, apiUrl, requestMethod, requestParams,
+                null, null, costTime, "FAIL", errorMsg);
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/SysApiLogHistoryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/SysApiLogHistoryServiceImpl.java
new file mode 100644
index 0000000..ac3e447
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/SysApiLogHistoryServiceImpl.java
@@ -0,0 +1,87 @@
+package org.nl.system.service.sysapi.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.system.service.sysapi.entity.SysApiLogHistory;
+import org.nl.system.service.sysapi.mapper.SysApiLogHistoryMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 接口日志Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-05-26
+ */
+@Service
+public class SysApiLogHistoryServiceImpl extends ServiceImpl<SysApiLogHistoryMapper, SysApiLogHistory> implements ISysApiLogHistoryService {
+    @Autowired
+    private SysApiLogHistoryMapper sysApiLogHistoryMapper;
+
+    /**
+     * 查询接口日志
+     *
+     * @param logId 接口日志主键
+     * @return 接口日志
+     */
+    @Override
+    public SysApiLogHistory selectSysApiLogHistoryByLogId(String logId) {
+        return sysApiLogHistoryMapper.selectSysApiLogHistoryByLogId(logId);
+    }
+
+    /**
+     * 查询接口日志列表
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 接口日志
+     */
+    @Override
+    public List<SysApiLogHistory> selectSysApiLogHistoryList(SysApiLogHistory sysApiLogHistory) {
+        return sysApiLogHistoryMapper.selectSysApiLogHistoryList(sysApiLogHistory);
+    }
+
+    /**
+     * 新增接口日志
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 结果
+     */
+    @Override
+    public int insertSysApiLogHistory(SysApiLogHistory sysApiLogHistory) {
+            return sysApiLogHistoryMapper.insertSysApiLogHistory(sysApiLogHistory);
+    }
+
+    /**
+     * 修改接口日志
+     *
+     * @param sysApiLogHistory 接口日志
+     * @return 结果
+     */
+    @Override
+    public int updateSysApiLogHistory(SysApiLogHistory sysApiLogHistory) {
+        return sysApiLogHistoryMapper.updateSysApiLogHistory(sysApiLogHistory);
+    }
+
+    /**
+     * 批量删除接口日志
+     *
+     * @param logIds 需要删除的接口日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysApiLogHistoryByLogIds(String[] logIds) {
+        return sysApiLogHistoryMapper.deleteSysApiLogHistoryByLogIds(logIds);
+    }
+
+    /**
+     * 删除接口日志信息
+     *
+     * @param logId 接口日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysApiLogHistoryByLogId(String logId) {
+        return sysApiLogHistoryMapper.deleteSysApiLogHistoryByLogId(logId);
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/SysApiLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/SysApiLogServiceImpl.java
new file mode 100644
index 0000000..fbe1c74
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/service/SysApiLogServiceImpl.java
@@ -0,0 +1,93 @@
+package org.nl.system.service.sysapi.service;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.system.service.param.impl.SysParamServiceImpl;
+import org.nl.system.service.sysapi.entity.SysApiLog;
+import org.nl.system.service.sysapi.entity.SysApiLogHistory;
+import org.nl.system.service.sysapi.mapper.SysApiLogMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author ManMan.Yang
+ * @version V1.1
+ * @date 2026/5/14
+ * @description TODO
+ */
+
+
+@Service
+@Slf4j
+public class SysApiLogServiceImpl extends ServiceImpl<SysApiLogMapper, SysApiLog> implements ISysApiLogService {
+
+    @Autowired
+    private ISysApiLogHistoryService sysApiLogHistoryService;
+
+    @Override
+    @Async("apiLogExecutor")
+    public void saveAsync(SysApiLog apiLog) {
+        try {
+            if (apiLog.getLogId() == null) {
+                apiLog.setLogId(IdUtil.getStringId());
+            }
+            if (apiLog.getCreateTime() == null) {
+                apiLog.setCreateTime(DateUtil.now());
+            }
+            this.save(apiLog);
+        } catch (Exception e) {
+            log.error("保存接口日志失败, logId: {}", apiLog.getLogId(), e);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity<T> archiveLogs() {
+        try {
+            // 获取系统配置的日志保留天数
+            String days = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("sys_api_keep_days").getValue();
+            if(StrUtil.isEmpty( days)){
+                days = "60";
+            }
+            int keepDays = Integer.parseInt(days);
+            LambdaQueryWrapper<SysApiLog> wrapper = new LambdaQueryWrapper<>();
+            wrapper.lt(SysApiLog::getCreateTime,
+                    java.time.LocalDateTime.now().minusDays(keepDays).toString().replace('T', ' '));
+            List<SysApiLog> oldLogs = this.list(wrapper);
+            if (!oldLogs.isEmpty()) {
+                log.info("开始归档接口日志，共 {} 条数据", oldLogs.size());
+                /*
+                 * 88549333 接口日志归档，防止数据量过大对插入和查询造成性能损耗
+                 * 1. 批量保存到历史表 sys_api_log_history
+                 * 2. 删除旧数据
+                 */
+                // 1. 备份到历史表 sys_api_log_history
+                List<SysApiLogHistory> historyList = oldLogs.stream().map(SysApiLogHistory::adapter).collect(Collectors.toList());
+                boolean saveSuccess = sysApiLogHistoryService.saveBatch(historyList);
+                if (saveSuccess) {
+                    this.remove(wrapper);
+                    log.info("接口日志归档完成，已迁移并删除 {} 条旧数据", oldLogs.size());
+                } else {
+                    log.error("接口日志归档失败，保存历史数据失败");
+                    throw new RuntimeException("保存历史数据失败");
+                }
+            }
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            log.error("接口日志归档失败", e);
+            throw new RuntimeException("日志归档失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java
index 34066c7..51c9319 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java
@@ -1,15 +1,15 @@
 package org.nl.system.service.tools.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.config.FileProperties;
 import org.nl.modules.common.exception.BadRequestException;
-import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.utils.FileUtil;
 import org.nl.system.service.tools.IToolLocalStorageService;
 import org.nl.system.service.tools.dao.ToolLocalStorage;
@@ -60,7 +60,7 @@ public class ToolLocalStorageServiceImpl extends ServiceImpl<ToolLocalStorageMap
             String now = DateUtil.now();
             name = StrUtil.isEmpty(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name;
             ToolLocalStorage localStorage = new ToolLocalStorage();
-            localStorage.setStorage_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+            localStorage.setStorage_id(IdUtil.getStringId());
             localStorage.setReal_name(file.getName());
             localStorage.setName(name);
             localStorage.setSuffix(suffix);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java
index 7fc3438..ef618b7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java
@@ -214,4 +214,15 @@ public class CustomerbaseDto implements Serializable {
      * 是否单卷单箱
      */
     private String is_single_roll_single_box;
+
+
+    /**
+     * 外包装标签打印份数
+     */
+    private String outer_packaging_print_num;
+
+    /**
+     * 子卷内标打印份数
+     */
+    private String container_print_num;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls
index 6620397..d9c3bc6 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
index cb51c1b..7dbe05c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
@@ -87,7 +87,7 @@ public class StructattrServiceImpl implements StructattrService {
 
       /*  // 如果是二期仓库则将层数删除
         if (ObjectUtil.isNotEmpty(whereJson.get("stor_id"))) {
-            if ( whereJson.get("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
+            if ( whereJson.get("stor_id").equals(IOSEnum.STOR_ID.code("印尼仓库"))) {
                 map.put("layer_num", "");
             }
         }*/
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index ee258dc..a907f35 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -38,6 +38,7 @@ import org.nl.b_lms.sch.tasks.boxstack.BoxSSXTask;
 import org.nl.b_lms.sch.tasks.boxstack.MxInTask;
 import org.nl.b_lms.sch.tasks.boxstack.MxMoveTask;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
+import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
 import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
@@ -636,13 +637,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + resq_jo.getString("container_name1") + "'").uniqueResult(0);
                     String paper_tube_or_FRP = plan_jo.getString("paper_tube_or_frp");
                     String paper_name;
+                    String need_size;
+                    // todo 88549333 因为新物料描述 纸管和 frp管的尺寸位置不一致，所以之前的取数组第三位的写法就存在问题，现修改为根据不同的类型分别获取。 2026年05月19日 18:55
                     if ("1".equals(paper_tube_or_FRP)) {
                         paper_name = plan_jo.getString("paper_tube_description");
+                        need_size = MdmDescriptionParseUtils.extractPaperTubeSize(paper_name);
                     } else {
                         paper_name = plan_jo.getString("frp_description");
+                        need_size = MdmDescriptionParseUtils.extractFRPTubeSizeTrans(paper_name);
                     }
                     // mark: 分切计划规格拆分数据
-                    String need_size = String.valueOf(paper_name.split("\\|")[2].charAt(0));
                     JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + plan_jo.getString("resource_name") + "'").uniqueResult(0);
                     //获取分切机维护的气涨轴代数
                     String need_generation = cut_jo.getString("qzz_generation");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java
index c8d0177..eb47f7b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.logging.annotation.Log;
+import org.nl.modules.logging.annotation.ApiLog;
 import org.nl.wms.ext.crm.service.CrmToLmsService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -22,16 +22,24 @@ public class CrmToLmsController {
     private final CrmToLmsService crmToLmsService;
 
     @PostMapping("/getCustomerInfo")
-    @Log("CRM给LMS推送客户信息")
-
+//    @Log("CRM给LMS推送客户信息")
+    @ApiLog(
+            bizCode = "/crm/getCustomerInfo",
+            bizDesc = "CRM给LMS推送客户信息",
+            systemFlag = "crm"
+    )
     @SaIgnore
     public ResponseEntity<Object> momRollFoilWeighing(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(crmToLmsService.getCustomerInfo(jo), HttpStatus.OK);
     }
 
     @PostMapping("/getCPIvtInfo")
-    @Log("CRM获取LMS成品库存信息")
-
+//    @Log("CRM获取LMS成品库存信息")
+    @ApiLog(
+            bizCode = "/crm/getCPIvtInfo",
+            bizDesc = "CRM获取LMS成品库存信息",
+            systemFlag = "crm"
+    )
     @SaIgnore
     public ResponseEntity<Object> getCPIvtInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(crmToLmsService.getCPIvtInfo(jo), HttpStatus.OK);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
index 3ffda61..399b3d4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
@@ -1,13 +1,13 @@
 package org.nl.wms.ext.crm.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -38,7 +38,7 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
         String sales_owner = row.getString("SalesOwner");
 
         JSONObject jo = new JSONObject();
-        jo.put("id", IdUtil.getSnowflake(1, 1).nextId());
+        jo.put("id", IdUtil.getLongId());
         jo.put("customer_name", customer_name);
         jo.put("description", description);
         jo.put("company", company);
@@ -63,7 +63,7 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
         JSONObject customer_jo = WQLObject.getWQLObject("md_cs_customerbase").query("cust_code = '" + customer_name + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(customer_jo)) {
             customer_jo = new JSONObject();
-            customer_jo.put("cust_id", IdUtil.getSnowflake(1, 1).nextId());
+            customer_jo.put("cust_id", IdUtil.getLongId());
             customer_jo.put("cust_code", customer_name);
             customer_jo.put("cust_name", description);
             customer_jo.put("cust_simple_name", company);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/CommonResponseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/CommonResponseDto.java
new file mode 100644
index 0000000..5ab7119
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/CommonResponseDto.java
@@ -0,0 +1,34 @@
+package org.nl.wms.ext.mdm.entity;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author Eric.Yang
+ * @Version V1.1
+ * @Date 2025/5/29
+ * @Description 处理状态统一返回消息类
+ */
+@Data
+public class CommonResponseDto {
+    //状态
+    private String status;
+    //描述
+    private String message;
+    //处理结果集合
+    private List<ResponseItemsData> responseData;
+
+    /**
+     统一返回消息类 构造
+     */
+    public static CommonResponseDto adapter(String status,String message,List<ResponseItemsData> responseData) {
+        CommonResponseDto commonResponseDto = new CommonResponseDto();
+        commonResponseDto.setStatus(status);
+        commonResponseDto.setMessage(message);
+        commonResponseDto.setResponseData(responseData);
+        return commonResponseDto;
+    }
+}
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/ResponseItemsData.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/ResponseItemsData.java
new file mode 100644
index 0000000..c09d6b0
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/ResponseItemsData.java
@@ -0,0 +1,31 @@
+package org.nl.wms.ext.mdm.entity;
+
+
+import lombok.Data;
+
+@Data
+public class ResponseItemsData {
+    //主数据唯一主键
+    private Long mdId;
+    //主数据编码
+    private String mdCode;
+    //主数据描述
+    private String mdDescription;
+    //处理状态
+    private String status;
+    //处理状态描述
+    private String message;
+
+    /**
+     统一构造方法
+     */
+    public static ResponseItemsData adapter(Long mdId,String mdCode,String mdDescription,String status,String message){
+        ResponseItemsData responseItemsData = new ResponseItemsData();
+        responseItemsData.setMdId(mdId);
+        responseItemsData.setMdCode(mdCode);
+        responseItemsData.setMdDescription(mdDescription);
+        responseItemsData.setStatus(status);
+        responseItemsData.setMessage(message);
+        return responseItemsData;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/StatusEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/StatusEnum.java
new file mode 100644
index 0000000..c378c05
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/entity/StatusEnum.java
@@ -0,0 +1,26 @@
+package org.nl.wms.ext.mdm.entity;
+
+
+/**
+ * @Author Eric.Yang
+ * @Version V1.1
+ * @Date 2025/6/10
+ * @Description 接口状态统一码
+ */
+public enum StatusEnum {
+    ACCEPT_SUCCESS("S", "分发成功"),
+    ACCEPT_FAIL("E", "分发失败");
+
+    private String code;
+    private String message;
+    StatusEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+    public String getCode() {
+        return code;
+    }
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/rest/MdmToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/rest/MdmToLmsController.java
new file mode 100644
index 0000000..84e6b7b
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/rest/MdmToLmsController.java
@@ -0,0 +1,76 @@
+package org.nl.wms.ext.mdm.rest;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
+import org.nl.modules.logging.annotation.ApiLog;
+import org.nl.wms.ext.mdm.entity.CommonResponseDto;
+import org.nl.wms.ext.mdm.service.MdmToLmsService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Eric.Yang
+ * @version V1.1
+ * @Date 2025/5/29
+ * @Description MDM主数据平台与LMS接口
+ */
+
+@RestController
+@RequestMapping("/api/mdm")
+@Slf4j
+@SaIgnore
+public class MdmToLmsController {
+
+    @Resource
+    private MdmToLmsService mdmToLmsService;
+
+    @PostMapping("/transCustomerInfo")
+    @ApiLog(
+            bizCode = "/mdm/transCustomerInfo",
+            bizDesc = "MDM给LMS推送客户信息",
+            systemFlag = "mdm"
+    )
+    @SaIgnore
+    public CommonResponseDto transCustomerInfo(@RequestBody JSONObject jsonData){
+        return  mdmToLmsService.transCustomerInfo(jsonData);
+    }
+
+
+    @PostMapping("/transSupplierInfo")
+    @ApiLog(
+            bizCode = "/mdm/transSupplierInfo",
+            bizDesc = "MDM给LMS推送供应商信息",
+            systemFlag = "mdm"
+    )
+    @SaIgnore
+    public CommonResponseDto transSupplierInfo(@RequestBody JSONObject jsonData){
+        return  mdmToLmsService.transSupplierInfo(jsonData);
+    }
+
+    @PostMapping("/transMaterialInfo")
+    @ApiLog(
+            bizCode = "/mdm/transMaterialInfo",
+            bizDesc = "MDM给LMS推送物料主数据信息",
+            systemFlag = "mdm"
+    )
+    @SaIgnore
+    public CommonResponseDto transMaterialInfo(@RequestBody JSONObject jsonData){
+        return  mdmToLmsService.transMaterialInfo(jsonData);
+    }
+
+    @PostMapping("/transMaterialTest")
+    @SaIgnore
+    public void transMaterialTest(@RequestBody JSONObject jsonData){
+        String materialName = jsonData.get("material_name") + "";
+        String composePaperTubeInformation = SlitterTaskUtil.getComposePaperTubeInformation(materialName);
+        log.info("composePaperTubeInformation:{}",composePaperTubeInformation);
+    }
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java
new file mode 100644
index 0000000..5f16fb1
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java
@@ -0,0 +1,21 @@
+package org.nl.wms.ext.mdm.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.wms.ext.mdm.entity.CommonResponseDto;
+
+public interface MdmToLmsService {
+
+    /**
+     * MDM客户接口
+     */
+    CommonResponseDto transCustomerInfo(JSONObject jsonData);
+    /**
+     * MDM供应商接口
+     */
+    CommonResponseDto transSupplierInfo(JSONObject jsonData);
+    /**
+     * MDM物料主数据接口
+     */
+    CommonResponseDto transMaterialInfo(JSONObject jsonData);
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java
new file mode 100644
index 0000000..578abac
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java
@@ -0,0 +1,298 @@
+package org.nl.wms.ext.mdm.service.impl;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.ext.mdm.entity.CommonResponseDto;
+import org.nl.wms.ext.mdm.entity.ResponseItemsData;
+import org.nl.wms.ext.mdm.entity.StatusEnum;
+import org.nl.wms.ext.mdm.service.MdmToLmsService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author Eric.Yang
+ * @Version V1.1
+ * @Date 2025/5/29
+ * @Description MDM数据对接接口业务实现类
+ */
+@Service
+@Slf4j
+public class MdmToLmsServiceImpl implements MdmToLmsService {
+
+    /**
+     * @Description: MDM客户主数据接口
+     * @Author Eric.Yang
+     * @Date: 2025/6/3 9:12
+     **/
+    @Override
+    public CommonResponseDto transCustomerInfo(JSONObject jsonData) {
+        log.info("MDM客户主数据业务请求参数为：{}", jsonData);
+        CommonResponseDto  commonResponseDto = new CommonResponseDto();
+        if(CollectionUtil.isEmpty(jsonData)){
+            commonResponseDto.setStatus("E");
+            commonResponseDto.setMessage("MDM传输数据为空！");
+            return commonResponseDto;
+        }
+        List<ResponseItemsData> responseItemsData = Lists.newArrayList();
+        JSONArray customers = jsonData.getJSONArray("customer");
+        if(CollectionUtil.isNotEmpty(customers)){
+            for (int i = 0; i < customers.size(); i++) {
+                JSONObject json = customers.getJSONObject(i);
+                //主编码主键
+                long mdId = IdUtil.getLongId();
+                //客户编号
+                String mdCode = json.getString("mdCode");
+                //主数据描述
+                String mdDescription = json.getString("mdDescription");
+                try {
+                    //客户名称
+                    String customerName = json.getString("customerName");
+                    //核心字段判断
+                    if (StrUtil.isEmpty(mdCode) || StrUtil.isEmpty(customerName)) {
+                        throw new BadRequestException("MDM->客户编码或名称不能为空！");
+                    }
+                    //客户简称
+                    String abbreviation = json.getString("abbreviation");
+                    //客户状态 01合格 02冻结 03禁用 04黑名单
+                    String customerStatus = json.getString("customerStatus");
+                    JSONArray salesOrgs = json.getJSONArray("salesOrg");
+                    if (CollectionUtil.isEmpty(salesOrgs)) {
+                        throw new BadRequestException("MDM->客户数据核心字段数据为空,缺失字段：[salesOrgs]！");
+                    }
+                    JSONObject salesOrg = salesOrgs.getJSONObject(0);
+                    JSONArray salesList = salesOrg.getJSONArray("sales");
+                    if (CollectionUtil.isEmpty(salesList)) {
+                        throw new BadRequestException("MDM->客户数据核心字段数据为空,缺失字段：[sales]！");
+                    }
+                    JSONObject sales = salesList.getJSONObject(0);
+                    JSONArray parList = sales.getJSONArray("par");
+                    if (CollectionUtil.isEmpty(parList)) {
+                        throw new BadRequestException("MDM->客户数据核心字段数据为空,缺失字段：[par]！");
+                    }
+                    JSONObject par = parList.getJSONObject(0);
+                    //业务员工号
+                    String empSupplier = par.getString("empSupplier");
+                    //业务员名称
+                    String empSupplierDesc = par.getString("empSupplierDesc");
+                    String sales_owner = StrUtil.join("|",empSupplier,empSupplierDesc);
+                    //插入客户表
+                    String currentUserId = SecurityUtils.getCurrentUserId();
+                    String now = DateUtil.now();
+                    JSONObject customer_jo = WQLObject.getWQLObject("md_cs_customerbase").query("cust_code = '" + mdCode + "'").uniqueResult(0);
+                    if (ObjectUtil.isEmpty(customer_jo)) {
+                        customer_jo = new JSONObject();
+                        customer_jo.put("cust_id", mdId);
+                        customer_jo.put("cust_code", mdCode);
+                        customer_jo.put("cust_name", customerName);
+                        customer_jo.put("cust_simple_name", abbreviation);
+                        customer_jo.put("mdm_status", customerStatus);
+                        customer_jo.put("sales_owner", sales_owner);
+                        customer_jo.put("create_id", currentUserId);
+                        customer_jo.put("create_name", "mdm_user");
+                        customer_jo.put("create_time", now);
+                        WQLObject.getWQLObject("md_cs_customerbase").insert(customer_jo);
+                        ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage());
+                        responseItemsData.add(itemsData);
+                    } else {
+                        customer_jo.put("cust_name", customerName);
+                        customer_jo.put("cust_simple_name", abbreviation);
+                        customer_jo.put("sales_owner", sales_owner);
+                        customer_jo.put("update_optid", currentUserId);
+                        customer_jo.put("update_optname", "mdm_user");
+                        customer_jo.put("mdm_status", customerStatus);
+                        customer_jo.put("update_time", now);
+                        WQLObject.getWQLObject("md_cs_customerbase").update(customer_jo);
+                        ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage());
+                        responseItemsData.add(itemsData);
+                    }
+                }catch (Exception e) {
+                    String message = e.getMessage();
+                    ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_FAIL.getCode(),message.contains("MDM")?message:StatusEnum.ACCEPT_FAIL.getMessage());
+                    responseItemsData.add(itemsData);
+                    log.error("MDM客户数据接口业务实现类处理数据异常", e);
+               }
+            }
+        }
+        commonResponseDto.setStatus(StatusEnum.ACCEPT_SUCCESS.getCode());
+        commonResponseDto.setMessage(StatusEnum.ACCEPT_SUCCESS.getMessage());
+        commonResponseDto.setResponseData(responseItemsData);
+        return commonResponseDto;
+    }
+
+
+    /**
+     * @Description: MDM供应商主数据接口
+     * @Author Eric.Yang
+     * @Date: 2025/6/5 9:12
+     **/
+    @Override
+    public CommonResponseDto transSupplierInfo(JSONObject jsonData) {
+        log.info("MDM供应商主数据请求参数为：{}", jsonData);
+        CommonResponseDto  commonResponseDto = new CommonResponseDto();
+        if(CollectionUtil.isEmpty(jsonData)){
+            commonResponseDto.setStatus("E");
+            commonResponseDto.setMessage("MDM传输数据为空！");
+            return commonResponseDto;
+        }
+        List<ResponseItemsData> responseItemsData = Lists.newArrayList();
+        JSONArray supplier = jsonData.getJSONArray("supplier");
+        if(CollectionUtil.isNotEmpty(supplier)){
+            for (int i = 0; i < supplier.size(); i++) {
+                JSONObject json = supplier.getJSONObject(i);
+                //主编码主键
+                long mdId = IdUtil.getLongId();
+                //客户编号
+                String mdCode = json.getString("mdCode");
+                //主数据描述
+                String mdDescription = json.getString("mdDescription");
+                try {
+                    //供应商名称
+                    String supplierName = json.getString("supplierName");
+                    //供应商简称
+                    String abbreviation = json.getString("abbreviation");
+                    //股份供应商状态 01合格 02潜在 03不合作 04黑名单
+                    String gfSupplierStatus = json.getString("gfSupplierStatus");
+                    //插入客户表
+                    String currentUserId = SecurityUtils.getCurrentUserId();
+                    String now = DateUtil.now();
+                    //核心字段判断
+                    if (StrUtil.isEmpty(mdCode) || StrUtil.isEmpty(supplierName)) {
+                        throw new BadRequestException("MDM->供应商编码或名称不能为空！");
+                    }
+                    JSONObject supplier_jo = WQLObject.getWQLObject("md_cs_transportationbase").query("cust_code = '" + mdCode + "'").uniqueResult(0);
+                    if (ObjectUtil.isEmpty(supplier_jo)) {
+                        supplier_jo = new JSONObject();
+                        supplier_jo.put("cust_id", mdId);
+                        supplier_jo.put("cust_code", mdCode);
+                        supplier_jo.put("cust_name", supplierName);
+                        supplier_jo.put("cust_simple_name", abbreviation);
+                        supplier_jo.put("mdm_status", gfSupplierStatus);
+                        supplier_jo.put("create_id", currentUserId);
+                        supplier_jo.put("create_name", "mdm_user");
+                        supplier_jo.put("create_time", now);
+                        WQLObject.getWQLObject("md_cs_transportationbase").insert(supplier_jo);
+                        ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage());
+                        responseItemsData.add(itemsData);
+                    } else {
+                        supplier_jo.put("cust_name", supplierName);
+                        supplier_jo.put("cust_simple_name", abbreviation);
+                        supplier_jo.put("update_optid", currentUserId);
+                        supplier_jo.put("update_optname", "mdm_user");
+                        supplier_jo.put("mdm_status", gfSupplierStatus);
+                        supplier_jo.put("update_time", now);
+                        WQLObject.getWQLObject("md_cs_transportationbase").update(supplier_jo);
+                        ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage());
+                        responseItemsData.add(itemsData);
+                    }
+                }catch (Exception e) {
+                    //获取抛出异常的信息
+                    String message = e.getMessage();
+                    ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_FAIL.getCode(),message.contains("MDM")?message:StatusEnum.ACCEPT_FAIL.getMessage());
+                    responseItemsData.add(itemsData);
+                    log.error("MDM供应商数据接口数据异常", e);
+                }
+            }
+        }
+        commonResponseDto.setStatus(StatusEnum.ACCEPT_SUCCESS.getCode());
+        commonResponseDto.setMessage(StatusEnum.ACCEPT_SUCCESS.getMessage());
+        commonResponseDto.setResponseData(responseItemsData);
+        return commonResponseDto;
+    }
+
+    /**
+     * @Description: MDM物料主数据接口
+     * @Author Eric.Yang
+     * @Date: 2025/6/3 9:12
+     **/
+    @Override
+    public CommonResponseDto transMaterialInfo(JSONObject jsonData) {
+        log.info("MDM物料主数据请求参数为：{}", jsonData);
+        CommonResponseDto  commonResponseDto = new CommonResponseDto();
+        if(CollectionUtil.isEmpty(jsonData)){
+            commonResponseDto.setStatus("E");
+            commonResponseDto.setMessage("MDM传输数据为空！");
+            return commonResponseDto;
+        }
+        List<ResponseItemsData> responseItemsData = Lists.newArrayList();
+        JSONArray materiels = jsonData.getJSONArray("materiels");
+        if(CollectionUtil.isNotEmpty(materiels)){
+            for (int i = 0; i < materiels.size(); i++) {
+                JSONObject json = materiels.getJSONObject(i);
+                //主编码主键
+                long mdId = IdUtil.getLongId();
+                //物料编码
+                String mdCode = json.getString("mdCode");
+                //物料名称
+                String mdDescription = json.getString("mdDescription");
+                try {
+                    //计量单位
+                    String meins = json.getString("meins");
+                    //跨工厂的物料状态 Y有效 D冻结 N无效
+                    String mstae = json.getString("mstae");
+                    //插入客户表
+                    String currentUserId = SecurityUtils.getCurrentUserId();
+                    String now = DateUtil.now();
+                    if (StrUtil.isEmpty(mdCode) || StrUtil.isEmpty(mdDescription)) {
+                        throw new BadRequestException("MDM->物料编码或名称不能为空！");
+                    }
+                    JSONObject material_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + mdCode + "'").uniqueResult(0);
+                    if (ObjectUtil.isEmpty(material_jo)) {
+                        JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + meins + "' and is_delete ='0'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(unit)) {
+                            throw new BadRequestException("MDM->未查询到相关计量单位，请进行维护！");
+                        }
+                        material_jo = new JSONObject();
+                        material_jo.put("material_id", mdId);
+                        material_jo.put("material_code", mdCode);
+                        material_jo.put("material_name", mdDescription);
+                        material_jo.put("base_unit_id", unit.getString("measure_unit_id"));
+                        material_jo.put("mdm_status", mstae);
+                        material_jo.put("is_used", "1");
+                        material_jo.put("create_id", currentUserId);
+                        material_jo.put("create_name", "mdm_user");
+                        material_jo.put("create_time", now);
+                        WQLObject.getWQLObject("md_me_materialbase").insert(material_jo);
+                        ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage());
+                        responseItemsData.add(itemsData);
+                    } else {
+                        JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + meins + "' and is_delete ='0'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(unit)) {
+                            throw new BadRequestException("MDM->未查询到相关计量单位，请进行维护！");
+                        }
+                        material_jo.put("material_name", mdDescription);
+                        material_jo.put("base_unit_id", unit.getString("measure_unit_id"));
+                        material_jo.put("mdm_status", mstae);
+                        material_jo.put("update_optid", currentUserId);
+                        material_jo.put("update_optname", "mdm_user");
+                        material_jo.put("update_time", now);
+                        WQLObject.getWQLObject("md_me_materialbase").update(material_jo);
+                        ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage());
+                        responseItemsData.add(itemsData);
+                    }
+                }catch (Exception e) {
+                    //获取抛出异常的信息
+                    String message = e.getMessage();
+                    ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_FAIL.getCode(),message.contains("MDM")?message:StatusEnum.ACCEPT_FAIL.getMessage());
+                    responseItemsData.add(itemsData);
+                    log.error("MDM物料主数据接口数据异常", e);
+                }
+            }
+        }
+        commonResponseDto.setStatus(StatusEnum.ACCEPT_SUCCESS.getCode());
+        commonResponseDto.setMessage(StatusEnum.ACCEPT_SUCCESS.getMessage());
+        commonResponseDto.setResponseData(responseItemsData);
+        return commonResponseDto;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 335c6af..d8561d0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -37,6 +37,7 @@ import org.nl.b_lms.sch.tasks.first_floor_area.DjqTask;
 import org.nl.b_lms.sch.tasks.first_floor_area.GzqTask;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
+import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils;
 import org.nl.b_lms.storage_manage.md.dao.MdMeMaterialBase;
 import org.nl.b_lms.storage_manage.md.dao.MdPbMeasureunit;
 import org.nl.b_lms.storage_manage.md.dao.mapper.MdMeMaterialBaseMapper;
@@ -673,8 +674,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
 
                 // 解析描述数组
                 String[] tubeArray = param.getString("PaperTubeDescription").split("\\|");
-                // 定义尺寸与长度
-                qzz_size = Character.toString(tubeArray[2].charAt(0));
+                //定义尺寸与长度
+                // todo 88549333 修改  采用公共处理方法获取纸管的规格 2026年05月19日 18:05
+                qzz_size = MdmDescriptionParseUtils.extractPaperTubeSize(param.getString("PaperTubeDescription"));
             } else {
                 if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) {
                     throw new BadRequestException("FRP管物料编码不能为空");
@@ -696,7 +698,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 // 解析描述数组
                 String[] tubeArray = param.getString("FRPDescription").split("\\|");
                 // 定义尺寸与长度
-                qzz_size = Character.toString(tubeArray[2].charAt(0));
+                // todo 88549333 修改  采用公共处理方法获取FRP管的规格 2026年05月19日 18:25
+                qzz_size = MdmDescriptionParseUtils.extractFRPTubeSizeTrans(param.getString("FRPDescription"));
             }
 
             JSONObject json = new JSONObject();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java
index 99be2d5..62fa4db 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java
@@ -22,7 +22,6 @@ public class LmsToSapController {
 
     @PostMapping("/returnDelivery")
     @Log("LMS回传SAP交货单")
-
     public ResponseEntity<Object> returnDelivery(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(LmsToSapService.returnDelivery(jo), HttpStatus.OK);
     }
@@ -34,11 +33,18 @@ public class LmsToSapController {
         return new ResponseEntity<>(LmsToSapService.returnMoveDtl(jo), HttpStatus.OK);
     }
 
-    @PostMapping("/returnDtl")
+    @PostMapping("/returnOutDtl")
     @Log("LMS调拨出库接口回传")
 
     public ResponseEntity<Object> returnOutDtl(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(LmsToSapService.returnOutDtl(jo), HttpStatus.OK);
     }
 
+    @PostMapping("/returnScrapDtl")
+    @Log("LMS成品报废明细回传")
+
+    public ResponseEntity<Object> returnScrapDtl(@RequestBody JSONObject jo) {
+        return new ResponseEntity<>(LmsToSapService.returnScrapDtl(jo), HttpStatus.OK);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java
index a15cc12..7dc296c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.logging.annotation.Log;
+import org.nl.modules.logging.annotation.ApiLog;
 import org.nl.wms.ext.sap.service.SapToLmsService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -23,56 +23,68 @@ public class SapToLmsController {
 
     @SaIgnore
     @PostMapping("/getMaterialInfo")
-    @Log("SAP给LMS推送物料信息")
-
+    @ApiLog(
+            bizCode = "/sap/getMaterialInfo",
+            bizDesc = "SAP给LMS推送物料信息",
+            systemFlag = "sap"
+    )
     public ResponseEntity<Object> getMaterialInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(sapToLmsService.getMaterialInfo(jo), HttpStatus.OK);
     }
 
     @SaIgnore
     @PostMapping("/getDeliveryInfo")
-    @Log("SAP给LMS推送交货单信息")
-
+    @ApiLog(
+            bizCode = "/sap/getDeliveryInfo",
+            bizDesc = "SAP给LMS推送交货单信息",
+            systemFlag = "sap"
+    )
     public ResponseEntity<Object> getDeliveryInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(sapToLmsService.getDeliveryInfo(jo), HttpStatus.OK);
     }
 
     @SaIgnore
     @PostMapping("/getReturnDeliveryInfo")
-    @Log("SAP给LMS推送退货交货单信息")
-
+    @ApiLog(
+            bizCode = "/sap/getReturnDeliveryInfo",
+            bizDesc = "SAP给LMS推送退货交货单信息",
+            systemFlag = "sap"
+    )
     public ResponseEntity<Object> getReturnDeliveryInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(sapToLmsService.getReturnDeliveryInfo(jo), HttpStatus.OK);
     }
 
     @SaIgnore
     @PostMapping("/getCannibalize")
-    @Log("SAP给LMS推送调拨出库单")
-
+    @ApiLog(
+            bizCode = "/sap/getCannibalize",
+            bizDesc = "SAP给LMS推送调拨出库单",
+            systemFlag = "sap"
+    )
     public ResponseEntity<Object> getCannibalize(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(sapToLmsService.getCannibalize(jo), HttpStatus.OK);
     }
 
     @SaIgnore
     @PostMapping("/getReCutInfo")
-    @Log("SAP给LMS推送改切出库单")
-
+    @ApiLog(
+            bizCode = "/sap/getReCutInfo",
+            bizDesc = "SAP给LMS推送改切出库单",
+            systemFlag = "sap"
+    )
     public ResponseEntity<Object> getReCutInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(sapToLmsService.getReCutInfo(jo), HttpStatus.OK);
     }
 
     @SaIgnore
     @PostMapping("/getUnPlanInfo")
-    @Log("SAP给LMS推送计划外子卷转单信息")
-
+    @ApiLog(
+            bizCode = "/sap/getUnPlanInfo",
+            bizDesc = "SAP给LMS推送计划外子卷转单信息",
+            systemFlag = "sap"
+    )
     public ResponseEntity<Object> getUnPlanInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(sapToLmsService.getUnPlanInfo(jo), HttpStatus.OK);
     }
 
-    @PostMapping("/inventoryTransferInfoSync")
-    @Log("转单指令在MES平台查看后，更新信息，发送LMS（是否拆包、更新后的入库日期、是否更换外包装箱标签）,LMS重打子卷标签、包装箱外标签")
-    @SaIgnore
-    public ResponseEntity<Object> inventoryTransferInfoSync(@RequestBody JSONObject jo) {
-        return new ResponseEntity<>(sapToLmsService.inventoryTransferInfoSync(jo), HttpStatus.OK);
-    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/LmsToSapService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/LmsToSapService.java
index f0724e0..b4abf1c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/LmsToSapService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/LmsToSapService.java
@@ -52,4 +52,21 @@ public interface LmsToSapService {
      * KALAB    重量
      */
     JSONObject returnOutDtl(JSONObject jo);
+
+  /*
+        WERKS	工厂
+        MATNR	物料编码
+        LGORT	库存地点
+        CHARG	SAP批次
+        BDMNG	数量
+        ZCJZ	返检修改差异重量
+        ZGHZL	返检修改后重量
+        VRKME	单位
+        Z1	    MES批次
+        VBELN	销售订单
+        POSNR	销售订单行
+        ZYDYY	移动原因
+        ZLYXT	来源系统
+    */
+    JSONObject returnScrapDtl(JSONObject jo);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/SapToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/SapToLmsService.java
index 7398cfa..86669aa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/SapToLmsService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/SapToLmsService.java
@@ -26,9 +26,4 @@ public interface SapToLmsService {
     JSONObject getReCutInfo(JSONObject jo);
 
     JSONObject getUnPlanInfo(JSONObject jo);
-
-    /**
-     * 转单指令在MES平台查看后，更新信息，发送LMS（是否拆包、更新后的入库日期、是否更换外包装箱标签）,LMS重打子卷标签、包装箱外标签
-     */
-    JSONObject inventoryTransferInfoSync(JSONObject param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java
index 0a93717..01c6189 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java
@@ -2,6 +2,7 @@ package org.nl.wms.ext.sap.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -9,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
+import org.nl.system.service.sysapi.service.OutboundApiLogger;
 import org.nl.wms.ext.sap.service.LmsToSapService;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -38,7 +40,7 @@ public class LmsToSapServiceImpl implements LmsToSapService {
         * */
         {
             log.info("returnDelivery接口输入参数为：-------------------" + jo.toString());
-
+            long startTime = System.currentTimeMillis();
             JSONObject result = new JSONObject();
             String isConnect = "1";
             if (StrUtil.equals("0", isConnect)) {
@@ -52,10 +54,10 @@ public class LmsToSapServiceImpl implements LmsToSapService {
             String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
             String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();
             String api = "";
-            url = url + "/sap/center/wms/004";
+            url = url + "/sap/center/lms/004";
             try {
                 String resultMsg = HttpRequest.post(url).header("TOKEN", token)
-                        .header("sap-client", sap_client)
+                        //.header("sap-client", sap_client)
                         .body(String.valueOf(jo))
                         .execute().body();
                 result = JSONObject.parseObject(resultMsg);
@@ -68,8 +70,16 @@ public class LmsToSapServiceImpl implements LmsToSapService {
                 }
 
             } catch (Exception e) {
+                // 记录失败日志
+                OutboundApiLogger.logFail("sap", "/sap/center/lms/004", "LMS回传SAP交货单",
+                        url, "POST", JSONUtil.toJsonStr(jo), e.getMessage(),
+                        System.currentTimeMillis() - startTime);
                 throw new BadRequestException("SAP提示错误：" + e.getMessage());
             }
+            // 记录成功日志
+            OutboundApiLogger.logSuccess("sap", "/sap/center/lms/004", "LMS回传SAP交货单",
+                    url, "POST", JSONUtil.toJsonStr(jo), result.toString(), 200,
+                    System.currentTimeMillis() - startTime);
             return result;
         }
     }
@@ -100,7 +110,7 @@ public class LmsToSapServiceImpl implements LmsToSapService {
         * */
         {
             log.info("returnMoveDtl接口输入参数为：-------------------" + jo.toString());
-
+            long startTime = System.currentTimeMillis();
             JSONObject result = new JSONObject();
             String isConnect = "1";
             if (StrUtil.equals("0", isConnect)) {
@@ -113,11 +123,11 @@ public class LmsToSapServiceImpl implements LmsToSapService {
             String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue();
             String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
             String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();
-            String api = "/sap/center/wms/005";
+            String api = "/sap/center/lms/005";
             url = url + api;
             try {
                 String resultMsg = HttpRequest.post(url).header("TOKEN", token)
-                        .header("sap-client", sap_client)
+                        //.header("sap-client", sap_client)
                         .body(String.valueOf(jo))
                         .execute().body();
                 result = JSONObject.parseObject(resultMsg);
@@ -129,8 +139,15 @@ public class LmsToSapServiceImpl implements LmsToSapService {
                 }
 
             } catch (Exception e) {
+                // 记录失败日志
+                OutboundApiLogger.logFail("sap", "/sap/center/lms/005", "LMS移库接口回传",
+                        url, "POST", JSONUtil.toJsonStr(jo), e.getMessage(),
+                        System.currentTimeMillis() - startTime);
                 throw new BadRequestException("SAP提示错误：" + e.getMessage());
             }
+            OutboundApiLogger.logSuccess("sap", "/sap/center/lms/005", "LMS移库接口回传",
+                    url, "POST", JSONUtil.toJsonStr(jo), result.toString(), 200,
+                    System.currentTimeMillis() - startTime);
             return result;
         }
     }
@@ -139,7 +156,7 @@ public class LmsToSapServiceImpl implements LmsToSapService {
     public JSONObject returnOutDtl(JSONObject jo) {
         {
             log.info("returnOutDtl接口输入参数为：-------------------" + jo.toString());
-
+            long startTime = System.currentTimeMillis();
             JSONObject result = new JSONObject();
             String isConnect = "1";
             if (StrUtil.equals("0", isConnect)) {
@@ -154,11 +171,11 @@ public class LmsToSapServiceImpl implements LmsToSapService {
             String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue();
             String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
             String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();
-            String api = "/sap/center/wms/007";
+            String api = "/sap/center/lms/007";
             url = url + api;
             try {
                 String resultMsg = HttpRequest.post(url).header("TOKEN", token)
-                        .header("sap-client", sap_client)
+                        //.header("sap-client", sap_client)
                         .body(String.valueOf(jo))
                         .execute().body();
                 result = JSONObject.parseObject(resultMsg);
@@ -170,8 +187,65 @@ public class LmsToSapServiceImpl implements LmsToSapService {
                 }
 
             } catch (Exception e) {
+                // 记录失败日志
+                OutboundApiLogger.logFail("sap", "/sap/center/lms/007", "LMS调拨出库接口回传",
+                        url, "POST", JSONUtil.toJsonStr(jo), e.getMessage(),
+                        System.currentTimeMillis() - startTime);
                 throw new BadRequestException("SAP提示错误：" + e.getMessage());
             }
+            // 记录成功日志
+            OutboundApiLogger.logSuccess("sap", "/sap/center/lms/007", "LMS调拨出库接口回传",
+                    url, "POST", JSONUtil.toJsonStr(jo), result.toString(), 200,
+                    System.currentTimeMillis() - startTime);
+            return result;
+        }
+    }
+
+    @Override
+    public JSONObject returnScrapDtl(JSONObject jo) {
+        {
+            log.info("returnScrapDtl接口输入参数为：-------------------" + jo.toString());
+            long startTime = System.currentTimeMillis();
+            JSONObject result = new JSONObject();
+            String isConnect = "1";
+            if (StrUtil.equals("0", isConnect)) {
+                result.put("status", HttpStatus.OK.value());
+                result.put("message", "下发成功，但未连接MES!");
+                result.put("data", new JSONObject());
+                return result;
+            }
+
+            JSONArray list = new JSONArray();
+
+            String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue();
+            String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
+            String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();
+            String api = "/sap/center/lms/001";
+            url = url + api;
+            try {
+                String resultMsg = HttpRequest.post(url).header("TOKEN", token)
+                        //.header("sap-client", sap_client)
+                        .body(String.valueOf(jo))
+                        .execute().body();
+                result = JSONObject.parseObject(resultMsg);
+                log.info("returnScrapDtl接口输出参数为：-------------------" + result.toString());
+
+                String type = result.getString("TYPE");
+                if (StrUtil.equals(type, "E")) {
+                    throw new BadRequestException(result.getString("MESSAGE"));
+                }
+
+            } catch (Exception e) {
+                // 记录失败日志
+                OutboundApiLogger.logFail("sap", "/sap/center/lms/001", "LMS成品报废明细回传",
+                        url, "POST", JSONUtil.toJsonStr(jo), e.getMessage(),
+                        System.currentTimeMillis() - startTime);
+                throw new BadRequestException("SAP提示错误：" + e.getMessage());
+            }
+            // 记录成功日志
+            OutboundApiLogger.logSuccess("sap", "/sap/center/lms/001", "LMS成品报废明细回传",
+                    url, "POST", JSONUtil.toJsonStr(jo), result.toString(), 200,
+                    System.currentTimeMillis() - startTime);
             return result;
         }
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index 4947763..42bef55 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -1,60 +1,131 @@
 package org.nl.wms.ext.sap.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
-import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
-import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
-import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
-import org.nl.b_lms.storage_manage.md.dao.MdMeMaterialBase;
-import org.nl.b_lms.storage_manage.md.dao.MdPbMeasureunit;
-import org.nl.b_lms.storage_manage.md.dao.mapper.MdMeMaterialBaseMapper;
-import org.nl.b_lms.storage_manage.md.dao.mapper.MdPbMeasureunitMapper;
-import org.nl.common.utils.CodeUtil;
-import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.IdUtil;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.ext.sap.service.SapToLmsService;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.nl.wms.st.instor.service.RecutPlanService;
 import org.nl.wms.st.outbill.service.CheckOutBillService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class SapToLmsServiceImpl implements SapToLmsService {
-    @Resource
-    private PdmBiSubpackagerelationMapper pdmBiSubpackagerelationMapper;
-
 
     private final CheckOutBillService checkOutBillService;
 
     private final RawAssistIStorService rawAssistIStorService;
 
     private final RecutPlanService recutPlanService;
-    @Resource
-    private IStIvtIostorinvOutService iStIvtIostorinvOutService;
 
-    @Autowired
-    private MdMeMaterialBaseMapper mdMeMaterialBaseMapper;
 
-    @Autowired
-    private MdPbMeasureunitMapper mdPbMeasureunitMapper;
+    public JSONObject getReCutInfo2(JSONObject json) {
+        log.info("getReCutInfo的输入参数为：------------------------" + json.toString());
+
+        JSONObject jsonMst = new JSONObject();
+
+        JSONObject result = new JSONObject();
+
+        String msg = "改切出库单据推送成功！";
+        try {
+            JSONArray dtl_ja = json.getJSONArray("ITEM");
+            String LGORT = dtl_ja.getJSONObject(0).getString("LGORT");
+            JSONObject stor_jo = WQLObject.getWQLObject("ST_IVT_BSRealStorAttr").query("ext_id = '" + LGORT + "'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(stor_jo)) {
+                result.put("RTYPE", "E");
+                result.put("RTMSG", "操作失败!" + "未查询到外部标识为：" + LGORT + "对应的仓库！");
+                result.put("RTOAL", 1);
+                result.put("RTDAT", null);
+                return result;
+            }
+
+            jsonMst.put("stor_id", stor_jo.getString("stor_id"));
+            jsonMst.put("stor_code", stor_jo.getString("stor_code"));
+            jsonMst.put("stor_name", stor_jo.getString("stor_name"));
+            jsonMst.put("detail_count", dtl_ja.size());
+            jsonMst.put("bill_status", "10");
+            jsonMst.put("create_mode", "03");
+            jsonMst.put("bill_type", "1003");
+            jsonMst.put("biz_date", DateUtil.now());
+            jsonMst.put("user", "sap");
+
+            JSONArray dtls = new JSONArray();
+            for (int i = 0; i < dtl_ja.size(); i++) {
+                JSONObject jo = dtl_ja.getJSONObject(i);
+                String sap_pcsn = jo.getString("CHARG");
+                if (StrUtil.isEmpty("sap_pcsn")) {
+                    throw new BadRequestException("请求参数SAP批次不能为空!");
+                }
+                JSONObject sub_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("sap_pcsn = '" + sap_pcsn + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(sub_jo)) {
+                    throw new BadRequestException("LMS中不存在SAP批次为【" + sap_pcsn + "】的包装关系");
+                }
+                String container_name = sub_jo.getString("container_name");
+                JSONObject struct_ivt = WQLObject.getWQLObject("st_ivt_structivt").query("pcsn = '" + container_name + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(struct_ivt)) {
+                    throw new BadRequestException("SAP批次为【" + sap_pcsn + "】的成品卷不存在或已经出库！");
+                } else {
+                    if (struct_ivt.getDoubleValue("frozen_qty") > 0) {
+                        msg = "SAP批次为【" + sap_pcsn + "】的成品卷已经被分配或出库中";
+                    } else {
+                        JSONObject dtl = new JSONObject();
+                        //查询该物料
+                        JSONObject mater_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + sub_jo.getString("product_name") + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(mater_jo)) {
+                            throw new BadRequestException("未查询到物料：" + sub_jo.getString("product_name") + "，信息！");
+                        }
+                        dtl.put("material_id", mater_jo.getString("material_id"));
+                        dtl.put("pcsn", container_name);
+                        dtl.put("box_no", sub_jo.getString("package_box_sn"));
+                        JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + mater_jo.getString("base_unit_id") + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(unit)) {
+                            throw new BadRequestException("未查询到物料计量单位：" + mater_jo.getString("base_unit_id") + "，信息！");
+                        }
+                        dtl.put("qty_unit_id", unit.getString("measure_unit_id"));
+                        dtl.put("qty_unit_name", unit.getString("unit_name"));
+                        dtl.put("plan_qty", sub_jo.getString("net_weight"));
+                        dtls.add(dtl);
+                    }
+                }
+            }
+
+            if (!dtls.isEmpty()) {
+                jsonMst.put("tableData", dtls);
+                String iostorinv_id = checkOutBillService.insertDtl(jsonMst);
+
+                //调用自动分配
+                JSONObject out_jo = new JSONObject();
+                out_jo.put("iostorinv_id", iostorinv_id);
+                checkOutBillService.allDiv(out_jo);
+            } else {
+                throw new BadRequestException("推送失败！SAP推送的子卷明细不符合出库状态！");
+            }
+        } catch (Exception exception) {
+            result.put("TYPE", "E");
+            result.put("MESSAGE", "推送失败!" + exception.getMessage());
+            log.info("getMaterialInfo的输出参数为：------------------------" + result.toString());
+            return result;
+        }
+        result.put("TYPE", "S");
+        result.put("MESSAGE", msg);
+        log.info("getMaterialInfo的输出参数为：------------------------" + result.toString());
+        return result;
+    }
 
     @Override
     public JSONObject getReCutInfo(JSONObject json) {
@@ -212,7 +283,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                 JSONObject base_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + MATNR + "'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(base_jo)) {
                     JSONObject mater_base_jo = new JSONObject();
-                    mater_base_jo.put("material_id", IdUtil.getSnowflake(1, 1).nextId());
+                    mater_base_jo.put("material_id", IdUtil.getLongId());
                     mater_base_jo.put("material_code", MATNR);
                     mater_base_jo.put("material_name", MATNR01);
                     JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + MEINS + "'").uniqueResult(0);
@@ -259,8 +330,8 @@ public class SapToLmsServiceImpl implements SapToLmsService {
     public JSONObject getDeliveryInfo(JSONObject jo) {
         log.info("getDeliveryInfo的输入参数为：------------------------" + jo.toString());
 
-//        WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表
-//        WQLObject unitTab = WQLObject.getWQLObject("md_pb_measureunit"); // 基础单位表
+        WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表
+        WQLObject unitTab = WQLObject.getWQLObject("md_pb_measureunit"); // 基础单位表
         JSONObject result = new JSONObject();
 
         try {
@@ -312,11 +383,12 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                     JSONObject json = item.getJSONObject(i);
                     lfart = json.getString("LFART");
                     JSONObject jsonDtl = new JSONObject();
-                    if (StrUtil.equals(lfart, "ZLF") || StrUtil.equals(lfart, "ZJS")) {
+                    if (StrUtil.equals(lfart, "ZLF1") || StrUtil.equals(lfart, "ZLF3") || StrUtil.equals(lfart, "ZLF9") || StrUtil.equals(lfart, "ZJS")) {
                         // 生成出库单
+                        String billType = getBillTypeByLfart(lfart);
                         jsonMst.put("io_type", "1");
-                        jsonMst.put("buss_type", "1001");
-                        jsonMst.put("bill_type", "1001");
+                        jsonMst.put("buss_type", billType);
+                        jsonMst.put("bill_type", billType);
                         jsonMst.put("source_id", json.getLongValue("VBELN"));
                         jsonMst.put("source_name", "交货单");
                         jsonMst.put("receiver", json.getString("CONSIGNEE")); // 收货人
@@ -329,22 +401,15 @@ public class SapToLmsServiceImpl implements SapToLmsService {
 
 
                         // 明细
-//                        JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0);
-
-
-                        MdMeMaterialBase mdMeMaterialBase = mdMeMaterialBaseMapper.selectOne(new QueryWrapper<MdMeMaterialBase>().eq("material_code", json.getString("MATNR")));
-
-                        if (ObjectUtil.isEmpty(mdMeMaterialBase)) {
+                        JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(jsonMater)) {
                             throw new BadRequestException("此物料不存在" + json.getString("MATNR"));
                         }
-//                        JSONObject jsonUnit = unitTab.query("measure_unit_id = '" + jsonMater.getString("base_unit_id") + "'").uniqueResult(0);
+                        JSONObject jsonUnit = unitTab.query("measure_unit_id = '" + jsonMater.getString("base_unit_id") + "'").uniqueResult(0);
 
-                        MdPbMeasureunit baseUnitId = mdPbMeasureunitMapper.selectOne(new QueryWrapper<MdPbMeasureunit>().eq("measure_unit_id", mdMeMaterialBase.getBase_unit_id()));
-
-
-                        jsonDtl.put("material_id", mdMeMaterialBase.getMaterial_id());
-                        jsonDtl.put("qty_unit_id", mdMeMaterialBase.getBase_unit_id());
-                        jsonDtl.put("qty_unit_name", baseUnitId.getUnit_name());
+                        jsonDtl.put("material_id", jsonMater.getString("material_id"));
+                        jsonDtl.put("qty_unit_id", jsonMater.getLongValue("base_unit_id"));
+                        jsonDtl.put("qty_unit_name", jsonUnit.getString("unit_name"));
                         jsonDtl.put("plan_qty", json.getDoubleValue("LFIMG"));
                         jsonDtl.put("source_bill_code", json.getString("VGBEL-VGPOS"));
                         jsonDtl.put("vbeln", json.getString("VBELN")); // 来源交货单
@@ -352,7 +417,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         jsonDtl.put("width", json.getString("HL02")); // 幅宽
                         tableData.add(jsonDtl);
                     }
-                    if (StrUtil.equals(lfart, "ZLR")) {
+                    if (StrUtil.equals(lfart, "ZLR") || StrUtil.equals(lfart, "ZLR1") || StrUtil.equals(lfart, "ZLR2"))  {
                         /*jsonMst.put("remark",json.getString("LGORT"));//库位*/
                         HashMap map = new HashMap();
                         //更新包装关系
@@ -377,8 +442,8 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                             throw new BadRequestException("子卷幅宽不能为空！");
                         }
                         // 明细
-                        MdMeMaterialBase mdMeMaterialBase = mdMeMaterialBaseMapper.selectOne(new QueryWrapper<MdMeMaterialBase>().eq("material_code", json.getString("MATNR")));
-                        if (ObjectUtil.isEmpty(mdMeMaterialBase)) {
+                        JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(jsonMater)) {
                             throw new BadRequestException("此物料不存在" + json.getString("MATNR"));
                         }
 
@@ -386,14 +451,14 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         if (ObjectUtil.isEmpty(sub_jo)) {
                             //为空新增一条
                             sub_jo = new JSONObject();
-                            sub_jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
+                            sub_jo.put("workorder_id", IdUtil.getLongId());
                             sub_jo.put("package_box_sn", package_box_sn);
                             sub_jo.put("quanlity_in_box", 1);
                             sub_jo.put("sale_order_name", sale_order_name);
                             sub_jo.put("customer_name", json.getString("KUNNR"));
                             sub_jo.put("customer_description", json.getString("NAMEM"));
                             sub_jo.put("product_name", json.getString("MATNR"));
-                            sub_jo.put("product_description", mdMeMaterialBase.getMaterial_name());
+                            sub_jo.put("product_description", jsonMater.getString("material_name"));
                             sub_jo.put("container_name", sap_pcsn);
                             sub_jo.put("width", width);
                             sub_jo.put("net_weight", json.getString("LFIMG"));
@@ -438,8 +503,13 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         box_rows.add(map);
                     }
                 }
-                // 发货出库
-                if (StrUtil.equals(lfart, "ZLF")) {
+                /*
+                发货分配逻辑
+                * ZLF9 免费发货单-有价格
+                * ZLF3 免费发货单
+                * ZLF1  标准发货单
+                * */
+                if (StrUtil.equals(lfart, "ZLF1") || StrUtil.equals(lfart, "ZLF3") || StrUtil.equals(lfart, "ZLF9")) {
                     jsonMst.put("tableData", tableData);
                     // 调用出库新增并分配
                     String iostorinv_id = checkOutBillService.insertDtl2(jsonMst);
@@ -456,11 +526,15 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("iostorinv_id", iostorinv_id);
                 }
-                // 退货入库
-                if (StrUtil.equals(lfart, "ZLR")) {
+                 /*
+                 退货入库 - 1 销售退货单
+                 退货入库 - 3 免费退货单
+                 */
+                if (StrUtil.equals(lfart, "ZLR1") || StrUtil.equals(lfart, "ZLR2")) {
                     jsonMst.put("tableData", box_rows);
                     //创建退货入库单
-                    jsonMst.put("bill_type", "0002");
+                    String billType = getBillTypeByLfart(lfart);
+                    jsonMst.put("bill_type", billType);
                     jsonMst.put("biz_date", DateUtil.now());
                     jsonMst.put("bill_status", "10");
                     rawAssistIStorService.insertDtl(jsonMst);
@@ -483,6 +557,51 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         return result;
     }
 
+    /**
+     * @description: 根据Sap LFART获取单据类型
+     * @author ManMan
+     * @date: 2026/4/9 14:08
+     * 发货(字典值：ST_INV_OUT_TYPE)
+     *      ZLF 1001 发货出库 (旧)
+     *      ZLF1 1013 标准发货 (新)
+     *      ZLF3 1014 无票发货 (新)
+     *      ZLF9 1015 有票发货 (新)
+     * 退货入库（字典值：ST_INV_IN_TYPE）
+     *      ZLR 0002 退货入库 (旧)
+     *      ZLR1 0013 标准退货 (新)
+     *      ZLR3 0014 免费退货 (新)
+     **/
+    public String getBillTypeByLfart(String code){
+        String billType = "";
+        switch (code){
+            case "ZLF1":
+                billType =  "1013";
+                break;
+            case "ZLF3":
+                billType =  "1014";
+                break;
+            case "ZLF9":
+                billType =  "1015";
+                break;
+            case "ZLR1":
+                billType =  "0013";
+                break;
+            case "ZLR2":
+                billType =  "0014";
+                break;
+            case "ZJS":
+                billType =  "1011";
+                break;
+            default:
+                if(code.contains("ZLR")){
+                    billType =  "0002";
+                }
+                if (code.contains("ZLF")){
+                    billType =  "1001";
+                }
+        }
+        return billType;
+    }
 
     @Override
     public JSONObject getReturnDeliveryInfo(JSONObject jo) {
@@ -540,6 +659,97 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         log.info("getCannibalize的输入参数为：------------------------" + jo.toString());
         JSONObject result = new JSONObject();
 
+        WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 仓库表
+        WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表
+        WQLObject unitTab = WQLObject.getWQLObject("md_pb_measureunit"); // 基础单位表
+
+        // 校验调入仓库和调出仓库是否存在
+        String lgort_out = jo.getString("LGORT1"); // 调出仓库
+        String lgort_in = jo.getString("LGORT2"); // 调入仓库
+
+        if (ObjectUtil.isEmpty(jo.getString("ZDBSQD"))) {
+            throw new BadRequestException("交货单不能为空!");
+        }
+
+        JSONObject jsonStorOut = storTab.query("stor_code = '" + lgort_out + "' and is_used = '1' and is_delete = '0'").uniqueResult(0);
+        JSONObject jsonStorIn = storTab.query("stor_code = '" + lgort_in + "' and is_used = '1' and is_delete = '0'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonStorOut) || ObjectUtil.isEmpty(jsonStorIn)) {
+            result.put("RTYPE", "E");
+            result.put("RTMSG", "操作失败!,调入仓库或调出仓库有误，请检查！");
+            result.put("RTOAL", 1);
+            result.put("RTDAT", null);
+            return result;
+        }
+
+        try {
+            // 创建调拨出库单
+            // 主表
+            JSONObject jsonMst = new JSONObject();
+            jsonMst.put("io_type", "1");
+            jsonMst.put("buss_type", "1004");
+            jsonMst.put("bill_type", "1004");
+            jsonMst.put("source_id", jo.getLongValue("ZDBSQD"));
+            jsonMst.put("source_name", "调拨单");
+            jsonMst.put("stor_id", jsonStorOut.getString("stor_id"));
+            jsonMst.put("stor_code", jsonStorOut.getString("stor_code"));
+            jsonMst.put("stor_name", jsonStorOut.getString("stor_name"));
+            jsonMst.put("out_stor_id", jsonStorIn.getString("stor_id"));
+            jsonMst.put("detail_count", 1);
+            jsonMst.put("bill_status", "10");
+            jsonMst.put("create_mode", "03");
+            jsonMst.put("biz_date", DateUtil.now());
+            jsonMst.put("user", "sap");
+
+            // 明细
+            JSONArray item = jo.getJSONArray("ITEM");
+
+            JSONArray tableData = new JSONArray();
+            for (int i = 0; i < item.size(); i++) {
+                JSONObject jsonObject = item.getJSONObject(i);
+                JSONObject jsonDtl = new JSONObject();
+
+                JSONObject jsonMater = materTab.query("material_code = '" + jsonObject.getString("MATNR") + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(jsonMater)) {
+                    throw new BadRequestException("此物料不存在" + jsonObject.getString("MATNR"));
+                }
+                JSONObject jsonUnit = unitTab.query("measure_unit_id = '" + jsonMater.getString("base_unit_id") + "'").uniqueResult(0);
+
+                if(ObjectUtil.isEmpty(jsonUnit)){
+                    throw new BadRequestException("此物料的物料类型不存在" + jsonObject.getString("MATNR"));
+                }
+
+                if (ObjectUtil.isEmpty(jsonObject.getString("KALAB"))) {
+                    throw new BadRequestException("调拨数量不能为空!");
+                }
+                if (ObjectUtil.isEmpty(jsonObject.getString("ZVBELN"))) {
+                    throw new BadRequestException("订单不能为空!");
+                }
+
+                jsonDtl.put("material_id", jsonMater.getString("material_id"));
+                jsonDtl.put("qty_unit_id", jsonMater.getLongValue("base_unit_id"));
+                jsonDtl.put("qty_unit_name", jsonUnit.getString("unit_name"));
+                jsonDtl.put("plan_qty", jsonObject.getDoubleValue("KALAB"));
+                jsonDtl.put("source_bill_code", jsonObject.getString("ZVBELN"));
+                jsonDtl.put("vbeln", jo.getString("ZDBSQD")); // 来源交货单
+                jsonDtl.put("width", jsonObject.getString("ZHL02")); // 幅宽
+                tableData.add(jsonDtl);
+            }
+            jsonMst.put("tableData", tableData);
+
+            // 调用出库新增
+            checkOutBillService.insertDtl2(jsonMst);
+        } catch (Exception e) {
+            result.put("RTYPE", "E");
+            result.put("RTMSG", "操作失败!" + e.getMessage());
+            result.put("RTOAL", 1);
+            result.put("RTDAT", null);
+            log.info("getDeliveryInfo的输出参数为：------------------------" + result.toString());
+            StackTraceElement[] ste = e.getStackTrace();
+            for (int i = 0; i < ste.length; i++) {
+                log.error(ste[i].toString());
+            }
+            return result;
+        }
         result.put("RTYPE", "S");
         result.put("RTMSG", "操作成功!");
         result.put("RTOAL", 1);
@@ -548,190 +758,4 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         return result;
     }
 
-    /**
-     * 转单指令在MES平台查看后，更新信息，发送LMS（是否拆包、更新后的入库日期、是否更换外包装箱标签）,LMS重打子卷标签、包装箱外标签
-     *
-     * @param param
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public JSONObject inventoryTransferInfoSync(JSONObject param) {
-        /**
-         * {
-         *     "SaleOrderItem": "销售订单号-行号",
-         *     "CustomerName": "客户编码",
-         *     "DemandDate": "销售订单行交货日期",
-         *     "item": [
-         *         {
-         *             "SaleOrderItem": "销售订单号-行号",
-         *             "PackageBoxSN": "包装箱号",
-         *             "isRePrintPackageBoxLabel": "是否需要重打外包装标签",
-         *             "isUnPackBox": "是否需要拆包重打子卷标签",
-         *             "UpdatedDateOfProduction": "更改后的制造完成日期"
-         *         },
-         *         {
-         *             "SaleOrderItem": "销售订单号-行号",
-         *             "PackageBoxSN": "包装箱号",
-         *             "isRePrintPackageBoxLabel": "是否需要重打外包装标签",
-         *             "isUnPackBox": "是否需要拆包重打子卷标签",`
-         *             "UpdatedDateOfProduction": "更改后的制造完成日期"
-         *         }
-         *     ]
-         * }`
-         */
-        log.info("inventoryTransferInfoSync接口输入参数为：-------------------" + param.toString());
-        JSONObject result = new JSONObject();
-        WQLObject st_ivt_structattr = WQLObject.getWQLObject("st_ivt_structattr");
-        WQLObject st_ivt_bsrealstorattr = WQLObject.getWQLObject("st_ivt_bsrealstorattr");
-        WQLObject st_ivt_structivt = WQLObject.getWQLObject("st_ivt_structivt");
-        WQLObject md_cs_customerbase = WQLObject.getWQLObject("md_cs_customerbase");
-        try {
-            JSONArray rows = param.getJSONArray("item");
-            //新销售订单号-行号
-            String SaleOrderItem = param.getString("SaleOrderItem");
-            //新客户编码
-            String CustomerName = param.getString("CustomerName");
-            //新销售订单行交货日期
-            String DemandDate = param.getString("DemandDate");
-
-            if (ObjectUtil.isEmpty(rows) || rows.size() == 0) {
-                throw new BadRequestException("item长度不能为0！");
-            }
-
-            // 定义set集合储存仓库
-            HashSet<String> storSet = new HashSet<>();
-
-            for (int i = 0; i < rows.size(); i++) {
-                JSONObject json = rows.getJSONObject(i);
-                String PackageBoxSN = json.getString("PackageBoxSN");
-
-                // 查询此木箱在哪个仓库
-                JSONObject jsonBox = st_ivt_structattr
-                        .query("storagevehicle_code = '" + PackageBoxSN + "' and is_delete = '0' and is_used = '1' and lock_type = '1'").uniqueResult(0);
-
-                if (ObjectUtil.isEmpty(jsonBox)) {
-                    throw new BadRequestException("此木箱不在库内：" + PackageBoxSN);
-                }
-                storSet.add(jsonBox.getString("stor_code"));
-            }
-
-            // 根据仓库生成多个库存变更单据
-            for (String stor_code : storSet) {
-                double total_qty = 0;
-                double detail_count = 0;
-
-                JSONObject jsonStor = st_ivt_bsrealstorattr.query("stor_code = '" + stor_code + "'").uniqueResult(0);
-                if (ObjectUtil.isEmpty(jsonStor)) {
-                    throw new BadRequestException("仓库不存在:" + stor_code);
-                }
-
-                JSONArray rowsDtl = new JSONArray();
-
-                for (int i = 0; i < rows.size(); i++) {
-                    JSONObject row = rows.getJSONObject(i);
-                    String PackageBoxSN = row.getString("PackageBoxSN");
-
-                    JSONObject jsonBox = st_ivt_structattr
-                            .query("storagevehicle_code = '" + PackageBoxSN + "' and is_delete = '0' and is_used = '1' and lock_type = '1'").uniqueResult(0);
-
-                    if (StrUtil.equals(jsonBox.getString("stor_code"), stor_code)) {
-                        rowsDtl.add(row);
-                    }
-                }
-                JSONArray tableData = new JSONArray();
-                // 插入主表明细表
-                for (int i = 0; i < rowsDtl.size(); i++) {
-                    JSONObject row = rowsDtl.getJSONObject(i);
-                    String PackageBoxSN = row.getString("PackageBoxSN");
-                    String isRePrintPackageBoxLabel = row.getString("isRePrintPackageBoxLabel");
-                    String isUnPackBox = row.getString("isUnPackBox");
-                    String UpdatedDateOfProduction = row.getString("UpdatedDateOfProduction");
-                    //查询该木箱内子卷数量
-                    List<PdmBiSubpackagerelation> container_rows = pdmBiSubpackagerelationMapper
-                            .selectList(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, PackageBoxSN));
-                    for (int j = 0; j < container_rows.size(); j++) {
-                        PdmBiSubpackagerelation container_row = container_rows.get(j);
-                        JSONObject change_jo = new JSONObject();
-                        change_jo.put("seq_no", detail_count + 1);
-                        JSONObject structivt = st_ivt_structivt.query("pcsn = '" + container_row.getContainer_name() + "'").uniqueResult(0);
-                        if (ObjectUtil.isEmpty(structivt)) {
-                            throw new BadRequestException("子卷库存不存在：" + container_row.getContainer_name());
-                        }
-                        change_jo.put("pcsn", structivt.getString("pcsn"));
-                        change_jo.put("quality_scode",  structivt.getString("quality_scode"));
-                        change_jo.put("material_id", structivt.getString("material_id"));
-                        change_jo.put("qty_unit_id", structivt.getString("qty_unit_id"));
-                        change_jo.put("plan_qty", structivt.getString("ivt_qty"));
-                        change_jo.put("source_bill_code", SaleOrderItem);
-                        change_jo.put("box_no", container_row.getPackage_box_sn());
-                        change_jo.put("width", container_row.getWidth());
-
-                        JSONObject param_jo = new JSONObject();
-                        param_jo.put("isRePrintPackageBoxLabel", isRePrintPackageBoxLabel);
-                        param_jo.put("isUnPackBox", isUnPackBox);
-                        param_jo.put("UpdatedDateOfProduction", UpdatedDateOfProduction);
-                        param_jo.put("DemandDate", DemandDate);
-                        param_jo.put("bill_type", IOSEnum.OUT_TYPE.code("转单出库"));
-                        change_jo.put("remark",param_jo);
-                        //更新包装关系
-                        container_row.setSale_order_name(SaleOrderItem);
-                        container_row.setCustomer_name(CustomerName);
-                        container_row.setIsRePrintPackageBoxLabel(isRePrintPackageBoxLabel);
-                        container_row.setIsUnPackBox(isUnPackBox);
-                        container_row.setDate_of_production(UpdatedDateOfProduction);
-                        JSONObject cust = md_cs_customerbase.query("cust_code = '" + CustomerName + "' and is_delete='0'").uniqueResult(0);
-                        container_row.setCustomer_description(cust.getString("cust_name"));
-                        pdmBiSubpackagerelationMapper.updateById(container_row);
-
-                        tableData.add(change_jo);
-                        total_qty += structivt.getDoubleValue("ivt_qty");
-                        detail_count += 1;
-                    }
-                }
-                String currentUserId = SecurityUtils.getCurrentUserId();
-                String nickName = SecurityUtils.getCurrentNickName();
-                String now = DateUtil.now();
-
-                JSONObject mst_jo = new JSONObject();
-                mst_jo.put("buss_type", IOSEnum.OUT_TYPE.code("转单出库"));
-                mst_jo.put("bill_type", IOSEnum.OUT_TYPE.code("转单出库"));
-                mst_jo.put("biz_date", DateUtil.today());
-                mst_jo.put("stor_id", jsonStor.getString("stor_id"));
-                mst_jo.put("stor_code", jsonStor.getString("stor_code"));
-                mst_jo.put("stor_name", jsonStor.getString("stor_name"));
-                mst_jo.put("total_qty", total_qty);
-                mst_jo.put("detail_count", detail_count);
-                mst_jo.put("bill_status", "10");
-                mst_jo.put("create_mode", "03");
-                mst_jo.put("input_optid", currentUserId + "");
-                mst_jo.put("input_optname", nickName);
-                mst_jo.put("input_time", now);
-                mst_jo.put("update_optid", currentUserId + "");
-                mst_jo.put("update_optname", nickName);
-                mst_jo.put("update_time", now);
-                mst_jo.put("user","sap");
-                mst_jo.put("tableData",tableData);
-                //新增
-                String id = iStIvtIostorinvOutService.insertMst(mst_jo);
-                JSONObject div_jo = new JSONObject();
-                div_jo.put("iostorinv_id",id);
-                div_jo.put("div_type","1");
-                //全部分配
-                iStIvtIostorinvOutService.allDiv(div_jo);
-            }
-            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);
-        }
-        log.info("inventoryTransferInfoSync接口输出参数为：-------------------" + result.toString());
-        return result;
-    }
-
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
index 8c42ea5..da776ba 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
@@ -128,64 +128,79 @@ public class PrintServiceImpl implements PrintService {
             throw new BadRequestException("请选择打印机!");
         }
 
-        //10.1.3.21/LMSPrinter/
-        String filePath = jsonPrint.getString("print_route") + "外包标签.txt";
-        FileWriter fw = null;
+        //查询这个客户的外包装标签打印份数
+        Integer num = 1;
         try {
-            File file = new File(filePath);
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-            fw = new FileWriter(filePath);
-            OutputStreamWriter write = new OutputStreamWriter(new FileOutputStream(file), "utf-8");
-            BufferedWriter bw = new BufferedWriter(write);
-            bw.write("bz_print_no,package_box_sn1,package_box_sn2,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,container_name,weight,customer_name,customer_description,thickness,mass_per_unit_area,length,box_type,sap_pcsn,box_length,box_width,box_high,material_type,joint_type\n");
-
-            bw.write(bz_print_no + ","
-                    + package_box_sn1 + ","
-                    + package_box_sn2 + ","
-                    + sale_order_name + ","
-                    + product_description + ","
-                    + product_name + ","
-                    + width + ","
-                    + pcsn + ","
-                    + date_of_FG_inbound + ","
-                    + box_weight + "KG,"
-                    + date_of_production + ","
-                    + quanlity_in_box + ","
-                    + quality_guaran_period + ","
-                    + nspector + ","
-                    + storage_conditions + ","
-                    + container_name + ","
-                    + NumberUtil.round(weight, 2).toString() + "KG,"
-                    + box_jo.getString("customer_name") + ","
-                    + box_jo.getString("customer_description") + ","
-                    + box_jo.getString("thickness") + ","
-                    + box_jo.getString("mass_per_unit_area") + ","
-                    + NumberUtil.round(box_jo.getString("length"), 2) + ","
-                    + box_jo.getString("box_type") + ","
-                    + box_jo.getString("sap_pcsn") + ","
-                    + box_jo.getString("box_length") + ","
-                    + box_jo.getString("box_width") + ","
-                    + box_jo.getString("box_high") + ","
-                    + box_jo.getString("material_type") + ","
-                    + NumberUtil.round(box_jo.getString("joint_type"),2) + "\n"
-            );
-
-            bw.close();
-            jo.put("message", "打印成功！");
-        } catch (SecurityException e) {
-            jo.put("message", "打印失败！无文件夹写入权限：" + e.getMessage());
-        } catch (FileNotFoundException e) {
-            jo.put("message", "打印失败！路径不存在：" + e.getMessage());
-        } catch (IOException e) {
-            jo.put("message", "打印失败！IO异常：" + e.getMessage());
+            num = jsonCust.getInteger("outer_packaging_print_num");
         } catch (Exception e) {
-            jo.put("message", "打印失败！" + e.getMessage());
-        }finally {
+            num = 1;
+        }
+
+        for (int i = 0; i < num; i++) {
+            //10.1.3.21/LMSPrinter/
+            String filePath = jsonPrint.getString("print_route") + "外包标签.txt";
+            FileWriter fw = null;
             try {
-                fw.close();
+                File file = new File(filePath);
+                if (!file.exists()) {
+                    file.createNewFile();
+                }
+                fw = new FileWriter(filePath);
+                OutputStreamWriter write = new OutputStreamWriter(new FileOutputStream(file), "utf-8");
+                BufferedWriter bw = new BufferedWriter(write);
+
+                if ("1".equals(is_single_roll_single_box)) {
+                    bw.write("bz_print_no,package_box_sn1,package_box_sn2,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,container_name,weight,customer_name,customer_description,thickness,mass_per_unit_area,length,box_type,sap_pcsn,box_length,box_width,box_high,material_type,joint_type\n");
+                } else {
+                    bw.write("bz_print_no,package_box_sn1,package_box_sn2,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,weight,customer_name,customer_description,thickness,mass_per_unit_area,length,box_type,sap_pcsn,box_length,box_width,box_high,material_type,joint_type\n");
+                }
+
+                bw.write(bz_print_no + ","
+                        + package_box_sn1 + ","
+                        + package_box_sn2 + ","
+                        + sale_order_name + ","
+                        + product_description + ","
+                        + product_name + ","
+                        + width + ","
+                        + pcsn + ","
+                        + date_of_FG_inbound + ","
+                        + box_weight + "KG,"
+                        + date_of_production + ","
+                        + quanlity_in_box + ","
+                        + quality_guaran_period + ","
+                        + nspector + ","
+                        + storage_conditions + ","
+                        + ("1".equals(is_single_roll_single_box) ? container_name + "," : "")
+                        + NumberUtil.round(weight, 2).toString() + "KG,"
+                        + box_jo.getString("customer_name") + ","
+                        + box_jo.getString("customer_description") + ","
+                        + box_jo.getString("thickness") + ","
+                        + box_jo.getString("mass_per_unit_area") + ","
+                        + NumberUtil.round(box_jo.getString("length"), 2) + ","
+                        + box_jo.getString("box_type") + ","
+                        + box_jo.getString("sap_pcsn") + ","
+                        + box_jo.getString("box_length") + ","
+                        + box_jo.getString("box_width") + ","
+                        + box_jo.getString("box_high") + ","
+                        + box_jo.getString("material_type") + ","
+                        + NumberUtil.round(box_jo.getString("joint_type"), 2) + "\n"
+                );
+
+                bw.close();
+                jo.put("message", "打印成功！");
+            } catch (SecurityException e) {
+                jo.put("message", "打印失败！无文件夹写入权限：" + e.getMessage());
+            } catch (FileNotFoundException e) {
+                jo.put("message", "打印失败！路径不存在：" + e.getMessage());
+            } catch (IOException e) {
+                jo.put("message", "打印失败！IO异常：" + e.getMessage());
             } catch (Exception e) {
+                jo.put("message", "打印失败！" + e.getMessage());
+            } finally {
+                try {
+                    fw.close();
+                } catch (Exception e) {
+                }
             }
         }
         return jo;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
index 49b8591..3ccab53 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -394,18 +395,20 @@ public class AutoCallEmptyVehicle {
         JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + rows.getJSONObject(0).getString("pcsn") + "'").uniqueResult(0);
         String paper_tube_or_FRP = plan_jo.getString("paper_tube_or_frp");
         String paper_name;
+        String need_size;
+        //todo 88549333 因为新物料描述 纸管和 frp管的尺寸位置不一致，所以之前的取数组第三位的写法就存在问题，现修改为根据不同的类型分别获取。 2026年05月19日 18:55
         if ("1".equals(paper_tube_or_FRP)) {
             paper_name = plan_jo.getString("paper_tube_description");
+            need_size = MdmDescriptionParseUtils.extractPaperTubeSize(paper_name);
         } else {
             paper_name = plan_jo.getString("frp_description");
+            need_size = MdmDescriptionParseUtils.extractFRPTubeSizeTrans(paper_name);
         }
-
         if (StrUtil.isEmpty(paper_name)) {
             //todo:提醒分切计划存在问题无法进行套轴
             return;
         }
-
-        String need_size = String.valueOf(paper_name.split("\\|")[2].charAt(0));
+        //获取尺寸 改到上面处理
         JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + plan_jo.getString("resource_name") + "'").uniqueResult(0);
 
         //获取分切机维护的气涨轴代数
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
index aed9019..94b6eb4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
@@ -35,6 +36,7 @@ import org.nl.wms.pdm.rawfoilworkorder.service.dao.mapper.RawfoilWorkOrderMapper
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.nl.wms.st.instor.check.service.dao.StIvtCheckdtl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -244,9 +246,13 @@ public class CoolCutTask extends AbstractAcsTask {
                 stIvtCutpointivtMapper.updateById(cut_jo);
 
                 //更新该母卷对应分切计划的状态
-                PdmBiSlittingproductionplan pdmBiSlittingproductionplan = pdmBiSlittingproductionplanMapper.selectOne(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getParent_container_name, container_name));
-                pdmBiSlittingproductionplan.setIs_paper_ok("1");
-                pdmBiSlittingproductionplanMapper.updateById(pdmBiSlittingproductionplan);
+               // PdmBiSlittingproductionplan pdmBiSlittingproductionplan = pdmBiSlittingproductionplanMapper.selectOne(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getParent_container_name, container_name));
+               // pdmBiSlittingproductionplan.setIs_paper_ok("1");
+               // pdmBiSlittingproductionplanMapper.updateById(pdmBiSlittingproductionplan);
+                //根据母卷号更新
+                pdmBiSlittingproductionplanMapper.update(null,new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
+                        .set(PdmBiSlittingproductionplan::getIs_paper_ok,"1")
+                        .eq(PdmBiSlittingproductionplan::getParent_container_name, container_name));
 
                 //回传MES
 //                JSONObject mom_jo = new JSONObject();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
index 37677c5..4722d71 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.language.LangBehavior;
 import org.nl.modules.common.exception.BadRequestException;
@@ -101,10 +102,14 @@ public class PaperTubeTask extends AbstractAcsTask {
             JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + req_param.getString("container_name1") + "' AND is_delete = '0'").uniqueResult(0);
             String paper_tube_or_FRP = plan_jo.getString("paper_tube_or_frp");
             String paper_name;
+            String need_size;
+            // todo 88549333 因为新物料描述 纸管和 frp管的尺寸位置不一致，所以之前的取数组第三位的写法就存在问题，现修改为根据不同的类型分别获取。 2026年05月05日 19:10
             if ("1".equals(paper_tube_or_FRP)) {
                 paper_name = plan_jo.getString("paper_tube_description");
+                need_size = MdmDescriptionParseUtils.extractPaperTubeSize(paper_name);
             } else {
                 paper_name = plan_jo.getString("frp_description");
+                need_size = MdmDescriptionParseUtils.extractFRPTubeSizeTrans(paper_name);
             }
 
             if (StrUtil.isEmpty(paper_name)) {
@@ -113,7 +118,7 @@ public class PaperTubeTask extends AbstractAcsTask {
             }
 
             // mark: 此处为对分切计划的纸管规格进行拆解取值
-            String need_size = String.valueOf(paper_name.split("\\|")[2].charAt(0));
+            //解析值的操作在上方
             JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + plan_jo.getString("resource_name") + "'").uniqueResult(0);
 
             //获取分切机维护的气涨轴代数
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java
index a24da28..fbbc1f8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java
@@ -133,7 +133,7 @@ public class RawAssistIStorController {
 
     //@PreAuthorize("@el.check('materialtype:list')")
     public ResponseEntity<Object> divPoint(@RequestBody Map whereJson) {
-        if (whereJson.get("stor_id").toString().equals(IOSEnum.STOR_ID.code("二期"))) {
+        if (whereJson.get("stor_id").toString().equals(IOSEnum.STOR_ID.code("印尼仓库"))) {
             iStIvtIostorinvService.setPoint(whereJson);
         }
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -159,4 +159,27 @@ public class RawAssistIStorController {
         iStIvtIostorinvService.allDivStruct(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+
+    @PostMapping("/confirm")
+    @Log("完成单据")
+
+    //@PreAuthorize("@el.check('materialtype:list')")
+    public ResponseEntity<Object> confirm(@RequestBody Map whereJson) {
+        if (whereJson.get("stor_id").toString().equals(IOSEnum.STOR_ID.code("印尼仓库"))) {
+            iStIvtIostorinvService.confirm(whereJson);
+        } else {
+            rawAssistIStorService.confirm(whereJson);
+
+        }
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @PostMapping("/backConfirm")
+    @Log("完成入库负单")
+
+    //@PreAuthorize("@el.check('materialtype:list')")
+    public ResponseEntity<Object> backConfirm(@RequestBody Map whereJson) {
+        rawAssistIStorService.backConfirm(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java
index c20194a..3e63581 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java
@@ -38,6 +38,11 @@ public interface RawAssistIStorService {
     JSONObject autoDis(JSONObject whereJson);
 
 
+    void confirm(Map whereJson);
+
+    void backConfirm(Map whereJson);
+
+
     JSONArray queryBoxMater(JSONArray rows);
 
     void divPoint(Map whereJson);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
index bc223d7..552b9d5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
@@ -245,7 +245,7 @@ public class OutChargeServiceImpl implements OutChargeService {
             //将包装关系中对应的记录状态改为包装
             HashMap<String, String> map = new HashMap<>();
             map.put("status", "1");
-            if (StrUtil.equals(mst_jo.getString("bill_type"), "1001")) {
+            if (StrUtil.equals(mst_jo.getString("bill_type"), "1001") || StrUtil.equals(mst_jo.getString("bill_type"), "1013") || StrUtil.equals(mst_jo.getString("bill_type"), "1014") || StrUtil.equals(mst_jo.getString("bill_type"), "1015")) {
                 WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "' AND status = '3'");
             } else {
                 WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "'");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index 90a2fe0..b1be7e4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -1514,6 +1514,86 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
         return struct_jo;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirm(Map whereJson) {
+        WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
+        WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl");
+
+        //校验主表状态为分配中、分配完
+        JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0);
+        if (!"30".equals(mst_jo.getString("bill_status")) && !"40".equals(mst_jo.getString("bill_status"))) {
+            throw new BadRequestException("主表状态必须为分配中、分配完！");
+        }
+
+        //分配中任务状态必须全部为完成
+        JSONArray dis_rows = dis_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND work_status < '99'").getResultJSONArray(0);
+        if (dis_rows.size() > 0) {
+            throw new BadRequestException("存在未完成的作业，或存在组盘记录！");
+        }
+
+        //将明细全部变为99
+        HashMap map = new HashMap();
+        map.put("bill_status", "99");
+        dtl_wql.update(map, "iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND bill_status < '99'").getResultJSONArray(0);
+
+        //完成单据
+        inbillService.confirmMst(JSONObject.parseObject(JSON.toJSONString(whereJson)));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void backConfirm(Map whereJson) {
+        WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl");
+        WQLObject mst_wql = WQLObject.getWQLObject("ST_IVT_IOStorInv");
+
+        //校验主表状态为生成
+        JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0);
+        if (!"10".equals(mst_jo.getString("bill_status"))) {
+            throw new BadRequestException("主表状态必须为生成！");
+        }
+
+        JSONObject mst_row = mst_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0);
+        JSONArray dtl_rows = dtl_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").getResultJSONArray(0);
+
+        //生成手工出库单
+        String iostorinv_id = IdUtil.getLongId() + "";
+        String bill_code = org.nl.common.utils.CodeUtil.getNewCode("IO_CODE");
+        whereJson.put("iostorinv_id", iostorinv_id);
+        whereJson.put("bill_code", bill_code);
+        whereJson.put("io_type", "1");
+        whereJson.put("bill_type", "010601");
+        whereJson.put("buss_type", ((String) whereJson.get("bill_type")).substring(0, 4));
+        mst_wql.insert(whereJson);
+        for (int i = 0; i < dtl_rows.size(); i++) {
+            JSONObject dtl_row = dtl_rows.getJSONObject(i);
+            dtl_row.put("source_billdtl_id", dtl_row.getString("iostorinvdtl_id"));
+            dtl_row.put("source_bill_type", mst_row.getString("bill_type"));
+            dtl_row.put("source_bill_code", mst_row.getString("bill_code"));
+            dtl_row.put("source_bill_table", "ST_IVT_IOStorInvDtl");
+            dtl_row.put("iostorinvdtl_id", IdUtil.getLongId());
+            dtl_row.put("iostorinv_id", iostorinv_id);
+            dtl_row.put("bill_status", "10");
+            dtl_wql.insert(dtl_row);
+        }
+
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        mst_row.put("bill_status", "99");
+        mst_row.put("confirm_optid", currentUserId);
+        mst_row.put("confirm_optname", nickName);
+        mst_row.put("confirm_time", now);
+        //更新主表状态为99
+        mst_wql.update(mst_row);
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("bill_status", "99");
+        dtl_wql.update(map, "iostorinv_id = '" + mst_row.get("iostorinv_id") + "'");
+    }
+
+
     /**
      * 1层主存区扩容：空托盘区 ==> 主存区
      */
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
index e7224a4..967a329 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
@@ -71,7 +71,7 @@
             	AND ios.io_type = '0'
             	AND ios.bill_status = '99'
             	AND ios.is_writeoff = '0'
-            	AND ios.bill_type = '0002'
+            	AND ios.bill_type in ('0002','0013','0014')
                 and ios.stor_id in 输入.in_stor_id
             OPTION 输入.bill_code <> ""
                    ios.bill_code like 输入.bill_code
@@ -125,7 +125,7 @@
                 AND ios.io_type = '0'
                 AND ios.bill_status = '99'
                 AND ios.is_writeoff = '0'
-                AND ios.bill_type = '0002'
+                AND ios.bill_type in ('0002','0013','0014')
                 and ios.stor_id in 输入.in_stor_id
             OPTION 输入.bill_code <> ""
                    ios.bill_code like 输入.bill_code
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index c2edcbd..6cfcbbe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -977,7 +977,7 @@
                       AND
                           ios.bill_status = '99'
                       AND
-                          ios.bill_type in ('1001','1009')
+                          ios.bill_type in ('1001','1009','1013','1014','1015')
                       AND
                         ios.stor_id in 输入.in_stor_id
                           OPTION 输入.bill_code <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
index b110553..d6db35a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
@@ -106,6 +106,7 @@ public class ProductScrapServiceImpl implements ProductScrapService {
         mst_jo.put("biz_date", DateUtil.today());
         mst_jo.put("stor_id", MapUtil.getStr(map, "stor_id"));
         mst_jo.put("stor_code", MapUtil.getStr(map, "stor_code"));
+        mst_jo.put("scrap_type", MapUtil.getStr(map, "scrap_type"));
         mst_jo.put("stor_name", MapUtil.getStr(map, "stor_name"));
         mst_jo.put("bill_status", "10");
         mst_jo.put("input_optid", currentUserId + "");
@@ -211,8 +212,13 @@ public class ProductScrapServiceImpl implements ProductScrapService {
         WQLObject mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst");
         WQLObject dtl = WQLObject.getWQLObject("ST_IVT_ProductScrapDtl");
         WQLObject ivt = WQLObject.getWQLObject("st_ivt_structivt");
-        
+
         try {
+            String scrap_type = whereJson.getString("scrap_type");
+            if(StrUtil.isEmpty(scrap_type)){
+                scrap_type = "1002";
+            }
+
             // 查询所有明细
             JSONArray dtlArr = dtl.query("scrap_id = '" + whereJson.getString("scrap_id") + "'").getResultJSONArray(0);
 
@@ -247,8 +253,8 @@ public class ProductScrapServiceImpl implements ProductScrapService {
             jsonOutMst.put("create_mode", "03");
             jsonOutMst.put("biz_date", DateUtil.now());
             jsonOutMst.put("io_type", "1");
-            jsonOutMst.put("buss_type", "1002");
-            jsonOutMst.put("bill_type", "1002");
+            jsonOutMst.put("buss_type", scrap_type);
+            jsonOutMst.put("bill_type", scrap_type);
             jsonOutMst.put("source_name", "成品报废审核单");
 
             JSONArray tableData = new JSONArray();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
index 44fdebe..b504205 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -89,11 +89,31 @@ public class CheckOutBillController {
         iStIvtIostorinvOutService.allDiv(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+
+    @PostMapping("/manualDiv")
+    @Log("出库单手动分配")
+
+    public ResponseEntity<Object> manualDiv(@RequestBody JSONObject whereJson) {
+        if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("印尼仓库"))) {
+            iStIvtIostorinvOutService.manualDiv(whereJson);
+        } else {
+            checkOutBillService.manualDiv(whereJson);
+        }
+
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
     @GetMapping("/getOutBillTask")
     @Log("查询出库单分配任务")
     public ResponseEntity<Object> getOutBillTask(@RequestParam Map whereJson) {
         return new ResponseEntity<>(checkOutBillService.getOutBillTask(whereJson), HttpStatus.OK);
     }
+    @GetMapping("/getStructIvt")
+    @Log("查询可分配库存")
+
+    public ResponseEntity<Object> getStructIvt(@RequestParam Map whereJson) {
+        return new ResponseEntity<>(checkOutBillService.getStructIvt(whereJson), HttpStatus.OK);
+    }
     @PostMapping("/allDivOne")
     @Log("出库单自动分配")
     public ResponseEntity<Object> allDivOne(@RequestBody JSONObject whereJson) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java
index 0042469..8beaca3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java
@@ -71,6 +71,14 @@ public interface CheckOutBillService {
      */
     JSONObject updataIsOverdue(JSONObject whereJson);
 
+    /**
+     * 查询可分配库存
+     *
+     * @param whereJson /
+     * @return
+     */
+    JSONArray getStructIvt(Map whereJson);
+
     /**
      * 导出数据
      * @param param
@@ -136,4 +144,30 @@ public interface CheckOutBillService {
      * @param whereJson /
      */
     String insertDtl2(JSONObject whereJson);
+
+    /**
+     * 新增出库单
+     *
+     * @param whereJson 参数举例：
+     *                  {bill_code=, stor_id=1473161852946092032, stor_code=01, stor_name=原材料库, bill_status=10, total_qty=2, detail_count=1, bill_type=010201, remark=, biz_date=2022-01-08, create_mode=, tableData=[{material_id=1309, material_code=090301010001, bill_status=10, material_name=碳化钨粉 02, pcsn=, quality_scode=02, ivt_level=01, is_active=1, plan_qty=2, qty_unit_name=千克\公斤, qty_unit_id=1, remark=, edit=true}]}
+     *                  /
+     */
+    String insertDtl(JSONObject whereJson);
+
+
+    /**
+     * 全部分配，对同一出库单明细进行分配
+     *
+     * @param whereJson /
+     */
+    void allDiv(JSONObject whereJson);
+
+    /**
+     * 出库单手动分配
+     *
+     * @param whereJson /
+     */
+    void manualDiv(JSONObject whereJson);
+
+
 }
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 4fa7c33..b68ca0b 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
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
@@ -52,12 +53,14 @@ import org.nl.b_lms.storage_manage.st.service.StIvtBsrealstorattrService;
 import org.nl.b_lms.storage_manage.st.service.StIvtSectattrService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.StringDealUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.wms.basedata.st.service.StructattrService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -65,6 +68,7 @@ import org.nl.wms.st.inbill.service.StorPublicService;
 import org.nl.wms.st.outbill.service.CheckOutBillService;
 import org.nl.wms.st.outbill.service.dto.*;
 import org.nl.wms.st.outbill.service.vo.*;
+import org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl;
 import org.nl.wms.stat.service.enums.OutBillTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -242,6 +246,27 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         return result;
     }
 
+    @Override
+    public JSONArray getStructIvt(Map whereJson) {
+        HashMap<String, String> map = new HashMap<String, String>(whereJson);
+        if (StrUtil.isNotEmpty(map.get("remark"))) {
+            map.put("remark", "%" + map.get("remark") + "%");
+        }
+        JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL")
+                .addParam("flag", "33")
+                .addParam("pcsn", map.get("pcsn"))
+                .addParam("sap_pcsn", map.get("sap_pcsn"))
+                .addParam("iostorinv_id", map.get("iostorinv_id"))
+                .addParam("stor_id", map.get("stor_id"))
+                .addParam("sect_id", map.get("sect_id"))
+                .addParam("remark", map.get("remark"))
+                .addParam("sale_order_name", map.get("source_bill_code"))
+                .process()
+                .getResultJSONArray(0);
+        return jo;
+    }
+
+
     @Override
     public void exportExcel(OutManageParam paramMap, HttpServletResponse response) throws IOException {
         // 空格查询
@@ -285,23 +310,23 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
     @Override
     public void outReturn(JSONObject whereJson) {
-        throw new BadRequestException("功能待开发！");
-//        WQLObject mstTab = WQLObject.getWQLObject("st_ivt_iostorinv");
-//
-//        JSONObject jsonMst = mstTab.query("iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'").uniqueResult(0);
-//
-//        if (!StrUtil.equals(jsonMst.getString("bill_type"), "1001")) {
-//            throw new BadRequestException("请选择发货出库单据！");
-//        }
-//
-//        // 调用mes接口回传
-//        JSONObject param = new JSONObject();
-//        JSONArray array = new JSONArray();
-//        array.add(jsonMst);
-//        param.put("rows", array);
-//
-//        InAndOutRetrunServiceImpl bean = SpringContextHolder.getBean(InAndOutRetrunServiceImpl.class);
-//        bean.uploadMES(param);
+        WQLObject mstTab = WQLObject.getWQLObject("st_ivt_iostorinv");
+
+        JSONObject jsonMst = mstTab.query("iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'").uniqueResult(0);
+
+        String bill_type = jsonMst.getString("bill_type");
+        if (!"1001,1011,1013,1014,1015".contains(bill_type)) {
+            throw new BadRequestException("请选择发货出库单据！");
+        }
+
+        // 调用mes接口回传
+        JSONObject param = new JSONObject();
+        JSONArray array = new JSONArray();
+        array.add(jsonMst);
+        param.put("rows", array);
+
+        InAndOutRetrunServiceImpl bean = SpringContextHolder.getBean(InAndOutRetrunServiceImpl.class);
+        bean.uploadMES(param);
     }
 
     @Override
@@ -1192,6 +1217,561 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void manualDiv(JSONObject form) {
+        //出库分配表
+        WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
+        //出库明细表
+        WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
+        //出库主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
+        //库区表
+        WQLObject wo_sect = WQLObject.getWQLObject("st_ivt_sectattr");
+
+        //定义需要更新的仓位集合
+        HashMap<String, JSONObject> Struct_map = new HashMap<>();
+        JSONObject whereJson = form.getJSONObject("row");
+        JSONArray rows = form.getJSONArray("rows");
+        String iostorinv_id = whereJson.getString("iostorinv_id");
+        //查询主表信息
+        JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jo_mst)) {
+            throw new BadRequestException("当前订单无可分配出库明细");
+        }
+
+        // 如果是发货出库则判断运费和物流公司不能为空
+        String bill_type = jo_mst.getString("bill_type");
+        /*if (StrUtil.equals(bill_type, "1001")) {
+            String trans_code = jo_mst.getString("trans_code");
+            String estimated_freight = jo_mst.getString("estimated_freight");
+
+            if (ObjectUtil.isEmpty(trans_code)) {
+                throw new BadRequestException("物流公司不能为空");
+            }
+            if (ObjectUtil.isEmpty(estimated_freight)) {
+                throw new BadRequestException("预估运费不能为空");
+            }
+
+        }*/
+
+        //查询生成和未分配完的明细
+        JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL")
+                .addParam("flag", "2")
+                .addParam("bill_status", "30")
+                .addParam("unassign_flag", "1")
+                .addParam("iostorinv_id", iostorinv_id)
+                .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id"))
+                .process()
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(dtl)) {
+            throw new BadRequestException("当前订单无可分配出库明细");
+        }
+
+        // 判断此明细是否有子卷号：没有则过滤箱号、将此箱子里的所有子卷带出来
+        if (ObjectUtil.isEmpty(dtl.getString("pcsn"))) {
+            HashSet<String> boxSet = new HashSet<>();
+            JSONArray boxArr = new JSONArray();
+
+            for (int i = 0; i < rows.size(); i++) {
+                JSONObject json = rows.getJSONObject(i);
+                boxSet.add(json.getString("storagevehicle_code"));
+            }
+
+            for (String box_no : boxSet) {
+                JSONArray boxIvtArr = WQL.getWO("QST_IVT_CHECKOUTBILL")
+                        .addParam("flag", "33")
+                        .addParam("box_no", box_no)
+                        .process()
+                        .getResultJSONArray(0);
+
+                boxArr.addAll(boxIvtArr);
+            }
+            rows.clear();
+            rows.addAll(boxArr);
+        }
+
+        double assign_qty = dtl.getDoubleValue("assign_qty");
+        double unassign_qty = dtl.getDoubleValue("unassign_qty");
+        double plan_qty = dtl.getDoubleValue("plan_qty");
+
+        if (rows.size() != 0) {
+            for (int j = 0; j < rows.size(); j++) {
+                JSONObject ivt = rows.getJSONObject(j);
+
+                double canuse_qty = ivt.getDoubleValue("ivt_qty");
+                assign_qty = NumberUtil.add(assign_qty, canuse_qty);
+
+                if (unassign_qty >= canuse_qty) {
+//                    unassign_qty = unassign_qty - canuse_qty;
+                    unassign_qty = NumberUtil.sub(unassign_qty, canuse_qty);
+                    ivt.put("change_qty", canuse_qty + "");
+                } else {
+                    ivt.put("change_qty", canuse_qty + "");
+                    unassign_qty = 0;
+                }
+                //更新库存
+                ivt.put("bill_type_scode", jo_mst.getString("bill_type"));
+                ivt.put("inv_id", dtl.getString("iostorinv_id"));
+                ivt.put("bill_code", jo_mst.getString("bill_code"));
+                ivt.put("bill_table", "ST_IVT_IOStorInv");
+                storPublicService.IOStor(ivt, "11");
+                //生成分配明细
+                dtl.put("iostorinvdis_id", org.nl.common.utils.IdUtil.getLongId());
+                dtl.put("sect_id", ivt.getString("sect_id"));
+                dtl.put("sect_code", ivt.getString("sect_code"));
+                dtl.put("sect_name", ivt.getString("sect_name"));
+                dtl.put("struct_id", ivt.getString("struct_id"));
+                dtl.put("struct_code", ivt.getString("struct_code"));
+                dtl.put("struct_name", ivt.getString("struct_name"));
+                dtl.put("pcsn", ivt.getString("pcsn"));
+                dtl.put("box_no", ivt.getString("storagevehicle_code"));
+                dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id"));
+                dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code"));
+                dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type"));
+                dtl.put("is_issued", "0");
+                dtl.put("plan_qty", ivt.getDoubleValue("change_qty"));
+                dtl.put("real_qty", ivt.getDoubleValue("change_qty"));
+                dtl.put("is_overdue", ivt.getString("is_overdue"));
+                dtl.put("instorage_time", ivt.getString("instorage_time"));
+                // 如果所属仓位是虚拟区 则将分配明细状态变为生成
+                JSONObject jsonSect = wo_sect.query("sect_id = '" + ivt.getString("sect_id") + "'").uniqueResult(0);
+                if (StrUtil.equals(jsonSect.getString("sect_type_attr"), "09")) {
+                    dtl.put("work_status", "01");
+                } else {
+                    dtl.put("work_status", "00");
+                }
+
+                // 判断是否超期
+                if (jo_mst.getString("is_overdue").equals("1")) {
+                    if (ivt.getString("is_overdue").equals("1")) {
+                        dtl.put("work_status", "01");
+                    }
+                }
+
+                wo_dis.insert(dtl);
+                //记录需锁定的仓位
+                Struct_map.put(ivt.getString("struct_id"), ivt);
+              /*  if (unassign_qty == 0) {
+                    break;
+                }*/
+            }
+//            HashMap<String, String> map_dtl = new HashMap<String, String>();
+            JSONObject map_dtl = new JSONObject();
+            //更新明细
+            map_dtl.put("unassign_qty", unassign_qty + "");
+            map_dtl.put("assign_qty", assign_qty + "");
+            if (map_dtl.getDoubleValue("unassign_qty") <= 0) {
+                map_dtl.put("bill_status", "40");
+            } else {
+                map_dtl.put("bill_status", "30");
+            }
+            wo_dtl.update(map_dtl, "iostorinvdtl_id='" + dtl.getString("iostorinvdtl_id") + "'");
+        }
+
+        // 判断是否还有相同物料相同仓位的明细
+        if (ObjectUtil.isNotEmpty(dtl.getString("pcsn"))) {
+            JSONObject jsonMap = new JSONObject();
+            jsonMap.put("flag", "4");
+            jsonMap.put("material_id", dtl.getString("material_id"));
+            jsonMap.put("box_no", dtl.getString("box_no"));
+            jsonMap.put("iostorinv_id", iostorinv_id);
+            jsonMap.put("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id"));
+
+            JSONArray dtlArr = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().getResultJSONArray(0);
+            for (int i = 0; i < dtlArr.size(); i++) {
+                JSONObject json = dtlArr.getJSONObject(i);
+
+                JSONObject ivt = WQL.getWO("ST_OUTIVT01")
+                        .addParam("flag", "1")
+                        .addParam("material_id", json.getString("material_id"))
+                        .addParam("pcsn", json.getString("pcsn"))
+                        .process().uniqueResult(0);
+
+                //更新库存
+                ivt.put("change_qty", ivt.getDoubleValue("canuse_qty"));
+                ivt.put("bill_type_scode", jo_mst.getString("bill_type"));
+                ivt.put("inv_id", json.getString("iostorinv_id"));
+                ivt.put("bill_code", jo_mst.getString("bill_code"));
+                ivt.put("bill_table", "ST_IVT_IOStorInv");
+                storPublicService.IOStor(ivt, "11");
+                //生成分配明细
+                json.put("iostorinvdis_id", org.nl.common.utils.IdUtil.getLongId());
+                json.put("sect_id", ivt.getString("sect_id"));
+                json.put("sect_code", ivt.getString("sect_code"));
+                json.put("sect_name", ivt.getString("sect_name"));
+                json.put("struct_id", ivt.getString("struct_id"));
+                json.put("struct_code", ivt.getString("struct_code"));
+                json.put("struct_name", ivt.getString("struct_name"));
+                json.put("pcsn", ivt.getString("pcsn"));
+                json.put("box_no", ivt.getString("storagevehicle_code"));
+                json.put("storagevehicle_id", ivt.getString("storagevehicle_id"));
+                json.put("storagevehicle_code", ivt.getString("storagevehicle_code"));
+                json.put("storagevehicle_type", ivt.getString("storagevehicle_type"));
+                json.put("is_issued", "0");
+                json.put("plan_qty", ivt.getDoubleValue("change_qty"));
+                json.put("real_qty", ivt.getDoubleValue("change_qty"));
+                json.put("is_overdue", ivt.getString("is_overdue"));
+                json.put("instorage_time", ivt.getString("instorage_time"));
+                // 如果所属仓位是虚拟区 则将分配明细状态变为生成
+                JSONObject jsonSect = wo_sect.query("sect_id = '" + ivt.getString("sect_id") + "'").uniqueResult(0);
+                if (StrUtil.equals(jsonSect.getString("sect_type_attr"), "09")) {
+                    json.put("work_status", "01");
+                } else {
+                    json.put("work_status", "00");
+                }
+
+                // 判断是否超期
+                if (jo_mst.getString("is_overdue").equals("1")) {
+                    if (ivt.getString("is_overdue").equals("1")) {
+                        json.put("work_status", "01");
+                    }
+                }
+
+                wo_dis.insert(json);
+
+                // 更新明细
+                HashMap<String, String> map_dtl = new HashMap<String, String>();
+                map_dtl.put("unassign_qty", "0");
+                map_dtl.put("assign_qty", ivt.getString("change_qty"));
+                map_dtl.put("bill_status", "40");
+                wo_dtl.update(map_dtl, "iostorinvdtl_id='" + json.getString("iostorinvdtl_id") + "'");
+            }
+        }
+
+        //更新主表状态
+        this.updateMststatus(iostorinv_id);
+        //锁定点位、仓位
+        Collection<JSONObject> c = Struct_map.values();
+        Iterator<JSONObject> it = c.iterator();
+        for (; it.hasNext(); ) {
+            JSONObject Struct = it.next();
+            //锁定起点仓位点位
+            JSONObject from_start = new JSONObject();
+            from_start.put("struct_id", Struct.getString("struct_id"));
+            from_start.put("lock_type", "3");
+            from_start.put("inv_type", jo_mst.getString("bill_type"));
+            from_start.put("inv_id", jo_mst.getString("iostorinv_id"));
+            from_start.put("inv_code", jo_mst.getString("bill_code"));
+            storPublicService.updateStructAndPoint(from_start);
+        }
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    @SneakyThrows
+    public void allDiv(JSONObject whereJson) {
+        //出库分配表
+        WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
+        //出库明细表
+        WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
+        //出库主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
+        //库区表
+        WQLObject wo_sect = WQLObject.getWQLObject("st_ivt_sectattr");
+
+        //定义需要更新的仓位集合
+        String iostorinv_id = whereJson.getString("iostorinv_id");
+        //查询主表信息
+        JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jo_mst)) {
+            throw new BadRequestException("查不到出库单信息");
+        }
+
+        // 如果是发货出库则判断运费和物流公司不能为空
+        String bill_type = jo_mst.getString("bill_type");
+        /*if (StrUtil.equals(bill_type, "1001")) {
+            String trans_code = jo_mst.getString("trans_code");
+            String estimated_freight = jo_mst.getString("estimated_freight");
+
+            if (ObjectUtil.isEmpty(trans_code)) {
+                throw new BadRequestException("物流公司不能为空");
+            }
+            if (ObjectUtil.isEmpty(estimated_freight)) {
+                throw new BadRequestException("预估运费不能为空");
+            }
+
+        }*/
+        RedissonUtils.lock(a -> {
+            //查询生成和未分配完的明细
+            JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
+                    .addParam("flag", "2")
+                    .addParam("bill_status", "30")
+                    .addParam("unassign_flag", "1")
+                    .addParam("iostorinv_id", iostorinv_id)
+                    .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id"))
+                    .process()
+                    .getResultJSONArray(0);
+            if (ObjectUtil.isEmpty(dtls)) {
+                throw new BadRequestException("当前订单无可分配出库明细");
+            }
+            //定义需要更新的仓位集合
+            HashMap<String, JSONObject> Struct_map = new HashMap<String, JSONObject>();
+            for (int i = 0; i < dtls.size(); i++) {
+                JSONObject dtl = dtls.getJSONObject(i);
+                double unassign_qty = dtl.getDoubleValue("unassign_qty");
+                double plan_qty = dtl.getDoubleValue("plan_qty");
+                /*
+                 * 分配规则：
+                 *  top1.有销售订单号：用销售订单号、物料去找这批物料最早入库的所在的巷道
+                 *  top2.没有销售订单号，有子卷号：固定出某个木箱
+                 *  top3.没有销售订单号，没有子卷号：找此物料最早入库的所在巷道
+                 */
+                boolean is_top3 = false;
+                if (ObjectUtil.isEmpty(dtl.getString("source_bill_code")) && ObjectUtil.isEmpty(dtl.getString("pcsn"))) {
+                    is_top3 = true;
+                }
+                JSONObject jsonMap = new JSONObject();
+                // 已分配重量
+                double assign_qty = dtl.getDoubleValue("assign_qty");
+
+                if (ObjectUtil.isNotEmpty(dtl.getString("source_bill_code")) || is_top3) {
+                    while (unassign_qty > 0) {
+                        // 1.有销售订单号
+                        jsonMap.put("flag", "1");
+                        jsonMap.put("material_id", dtl.getString("material_id"));
+                        jsonMap.put("sale_order_name", dtl.getString("source_bill_code"));
+                        jsonMap.put("sect_id", whereJson.getString("sect_id"));
+                        jsonMap.put("stor_id", whereJson.getString("stor_id"));
+
+                        JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0);
+                        if (ObjectUtil.isEmpty(jsonOneIvt)) {
+                            throw new BadRequestException("库存不足");
+                        }
+
+                        // 查询这一巷道所有此物料此库存此销售订单的库存
+                        jsonMap.put("flag", "2");
+                        jsonMap.put("row_num", jsonOneIvt.getString("row_num"));
+                        jsonMap.put("block_num", jsonOneIvt.getString("block_num"));
+                        JSONArray ivtAllArr = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().getResultJSONArray(0);
+
+                        for (int j = 0; j < ivtAllArr.size(); j++) {
+                            JSONObject ivt = ivtAllArr.getJSONObject(j);
+                            double canuse_qty = ivt.getDoubleValue("canuse_qty");
+                            assign_qty = NumberUtil.add(assign_qty, canuse_qty);
+
+                            if (unassign_qty >= canuse_qty) {
+                                unassign_qty = NumberUtil.sub(unassign_qty, canuse_qty);
+                            } else {
+                                unassign_qty = 0;
+                            }
+
+                            // 查询此木箱下的所有子卷
+                            jsonMap.put("flag", "3");
+                            jsonMap.put("storagevehicle_code", ivt.getString("storagevehicle_code"));
+                            JSONArray ivtAllArr2 = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().getResultJSONArray(0);
+
+                            for (int k = 0; k < ivtAllArr2.size(); k++) {
+                                // 更新库存
+                                JSONObject ivt2 = ivtAllArr2.getJSONObject(k);
+                                ivt2.put("change_qty", ivt2.getDoubleValue("canuse_qty"));
+                                ivt2.put("bill_type_scode", jo_mst.getString("bill_type"));
+                                ivt2.put("inv_id", dtl.getString("iostorinv_id"));
+                                ivt2.put("bill_code", jo_mst.getString("bill_code"));
+                                ivt2.put("bill_table", "ST_IVT_IOStorInv");
+                                storPublicService.IOStor(ivt2, "11");
+
+                                //生成分配明细
+                                dtl.put("iostorinvdis_id", org.nl.common.utils.IdUtil.getLongId());
+                                dtl.put("sect_id", ivt2.getString("sect_id"));
+                                dtl.put("sect_code", ivt2.getString("sect_code"));
+                                dtl.put("sect_name", ivt2.getString("sect_name"));
+                                dtl.put("struct_id", ivt2.getString("struct_id"));
+                                dtl.put("struct_code", ivt2.getString("struct_code"));
+                                dtl.put("struct_name", ivt2.getString("struct_name"));
+                                dtl.put("pcsn", ivt2.getString("pcsn"));
+                                dtl.put("box_no", ivt2.getString("storagevehicle_code"));
+                                dtl.put("storagevehicle_id", ivt2.getString("storagevehicle_id"));
+                                dtl.put("storagevehicle_code", ivt2.getString("storagevehicle_code"));
+                                dtl.put("storagevehicle_type", ivt2.getString("storagevehicle_type"));
+                                dtl.put("is_issued", "0");
+                                dtl.put("plan_qty", ivt2.getDoubleValue("change_qty"));
+                                dtl.put("real_qty", ivt2.getDoubleValue("change_qty"));
+                                dtl.put("is_overdue", ivt2.getString("is_overdue"));
+                                dtl.put("instorage_time", ivt2.getString("instorage_time"));
+
+                                // 如果所属仓位是虚拟区 则将分配明细状态变为生成
+                                JSONObject jsonSect = wo_sect.query("sect_id = '" + ivt2.getString("sect_id") + "'").uniqueResult(0);
+                                if (StrUtil.equals(jsonSect.getString("sect_type_attr"), "09")) {
+                                    dtl.put("work_status", "01");
+                                } else {
+                                    dtl.put("work_status", "00");
+                                }
+
+                                if (jo_mst.getString("is_overdue").equals("1")) {
+                                    // 判断是否超期
+                                    if (ivt2.getString("is_overdue").equals("1")) {
+                                        dtl.put("work_status", "01");
+                                    }
+                                }
+                                wo_dis.insert(dtl);
+                            }
+                            //记录需锁定的仓位
+                            Struct_map.put(ivt.getString("struct_id"), ivt);
+                            // 为零结束
+                            if (unassign_qty == 0) {
+                                break;
+                            }
+                        }
+                    }
+
+                } else {
+                    // 确定子卷: 根据子卷找到库存出掉
+                    jsonMap.put("flag", "1");
+                    jsonMap.put("material_id", dtl.getString("material_id"));
+                    jsonMap.put("pcsn", dtl.getString("pcsn"));
+                    jsonMap.put("box_no", dtl.getString("box_no"));
+                    jsonMap.put("sect_id", whereJson.getString("sect_id"));
+                    jsonMap.put("stor_id", whereJson.getString("stor_id"));
+
+                    JSONObject jsonIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0);
+                    if (ObjectUtil.isEmpty(jsonIvt)) {
+                        throw new BadRequestException("库存不足");
+                    }
+
+                    double canuse_qty;
+                    if (StrUtil.equals(bill_type, "1011")) {
+                        canuse_qty = dtl.getDoubleValue("plan_qty");
+                    } else {
+                        canuse_qty = jsonIvt.getDoubleValue("canuse_qty");
+                    }
+
+                    jsonIvt.put("change_qty", canuse_qty + "");
+                    unassign_qty = 0;
+                    assign_qty = NumberUtil.add(assign_qty, canuse_qty);
+
+                    //更新库存
+                    jsonIvt.put("bill_type_scode", jo_mst.getString("bill_type"));
+                    jsonIvt.put("inv_id", dtl.getString("iostorinv_id"));
+                    jsonIvt.put("bill_code", jo_mst.getString("bill_code"));
+                    jsonIvt.put("bill_table", "ST_IVT_IOStorInv");
+                    storPublicService.IOStor(jsonIvt, "11");
+                    //生成分配明细
+                    dtl.put("iostorinvdis_id", org.nl.common.utils.IdUtil.getLongId());
+                    dtl.put("sect_id", jsonIvt.getString("sect_id"));
+                    dtl.put("sect_code", jsonIvt.getString("sect_code"));
+                    dtl.put("sect_name", jsonIvt.getString("sect_name"));
+                    dtl.put("struct_id", jsonIvt.getString("struct_id"));
+                    dtl.put("struct_code", jsonIvt.getString("struct_code"));
+                    dtl.put("struct_name", jsonIvt.getString("struct_name"));
+                    dtl.put("pcsn", jsonIvt.getString("pcsn"));
+                    dtl.put("box_no", jsonIvt.getString("storagevehicle_code"));
+                    dtl.put("storagevehicle_id", jsonIvt.getString("storagevehicle_id"));
+                    dtl.put("storagevehicle_code", jsonIvt.getString("storagevehicle_code"));
+                    dtl.put("storagevehicle_type", jsonIvt.getString("storagevehicle_type"));
+                    dtl.put("is_issued", "0");
+                    dtl.put("plan_qty", jsonIvt.getDoubleValue("change_qty"));
+                    dtl.put("real_qty", jsonIvt.getDoubleValue("change_qty"));
+                    dtl.put("is_overdue", jsonIvt.getString("is_overdue"));
+                    dtl.put("instorage_time", jsonIvt.getString("instorage_time"));
+                    // 如果所属仓位是虚拟区 则将分配明细状态变为生成
+                    JSONObject jsonSect = wo_sect.query("sect_id = '" + jsonIvt.getString("sect_id") + "'").uniqueResult(0);
+                    if (StrUtil.equals(jsonSect.getString("sect_type_attr"), "09")) {
+                        dtl.put("work_status", "01");
+                    } else {
+                        dtl.put("work_status", "00");
+                    }
+
+                    // 判断是否超期
+                    if (jo_mst.getString("is_overdue").equals("1")) {
+                        if (jsonIvt.getString("is_overdue").equals("1")) {
+                            dtl.put("work_status", "01");
+                        }
+                    }
+
+                    wo_dis.insert(dtl);
+
+                    //记录需锁定的仓位 （如果此明细有相同物料的且子卷号不能为空的则在最后一个明细分配完成后锁定仓位）
+                    JSONObject map = new JSONObject();
+                    map.put("flag", "5");
+                    map.put("material_id", dtl.getString("material_id"));
+                    map.put("box_no", dtl.getString("box_no"));
+                    map.put("iostorinv_id", iostorinv_id);
+                    map.put("iostorinvdtl_id", dtl.getString("iostorinvdtl_id"));
+                    JSONArray dtlArr = WQL.getWO("ST_OUTIVT01").addParamMap(map).process().getResultJSONArray(0);
+                    if (dtlArr.size() == 0) {
+                        Struct_map.put(jsonIvt.getString("struct_id"), jsonIvt);
+                    }
+
+                }
+                HashMap<String, String> map_dtl = new HashMap<String, String>();
+                //更新明细
+                map_dtl.put("unassign_qty", unassign_qty + "");
+                map_dtl.put("assign_qty", assign_qty + "");
+                if (unassign_qty == 0) {
+                    map_dtl.put("bill_status", "40");
+                } else {
+                    map_dtl.put("bill_status", "30");
+                }
+                wo_dtl.update(map_dtl, "iostorinvdtl_id='" + dtl.getString("iostorinvdtl_id") + "'");
+
+                //更新主表状态
+                this.updateMststatus(iostorinv_id);
+
+                //锁定起点点位、仓位
+                Collection<JSONObject> c = Struct_map.values();
+                Iterator<JSONObject> it = c.iterator();
+                JSONObject from_start = new JSONObject();
+                from_start.put("lock_type", "3");
+                for (; it.hasNext(); ) {
+                    JSONObject Struct = it.next();
+                    from_start.put("struct_id", Struct.getString("struct_id"));
+                    from_start.put("inv_type", jo_mst.getString("bill_type"));
+                    from_start.put("inv_id", jo_mst.getString("iostorinv_id"));
+                    from_start.put("inv_code", jo_mst.getString("bill_code"));
+                    storPublicService.updateStructAndPoint(from_start);
+                }
+            }
+            return null;
+        }, "all_divOne", whereJson);
+    }
+
+    /**
+     * 更新主表状态
+     *
+     * @param iostorinv_id
+     */
+    void updateMststatus(String iostorinv_id) {
+        //出库主表
+        WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
+        //出库明细表
+        WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
+
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        //查询主表信息
+        JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
+        jo_mst.put("update_optid", currentUserId + "");
+        jo_mst.put("update_optname", nickName);
+        jo_mst.put("update_time", now);
+        jo_mst.put("dis_optid", currentUserId + "");
+        jo_mst.put("dis_optname", nickName);
+        jo_mst.put("dis_time", now);
+        //更新主表状态
+        JSONArray dtls_40 = wo_dtl.query("bill_status='40' and iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
+        //已分配完明细数小于总明细数
+        if (dtls_40.size() < jo_mst.getInteger("detail_count")) {
+            JSONArray dtls_30 = wo_dtl.query("bill_status='30' and iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
+            //存在分配完的明细
+            if (dtls_40.size() != 0) {//分配中明细数不为0
+                jo_mst.put("bill_status", "30");
+            } else if (dtls_40.size() == 0) {
+                //不存在分配中和分配完的明细
+                if (dtls_30.size() == 0) {
+                    jo_mst.put("bill_status", "10");
+                }//存在分配中的明细
+                else if (dtls_30.size() != 0) {
+                    jo_mst.put("bill_status", "30");
+                }
+            }
+        } else {//已分配完明细数等于总明细数
+            jo_mst.put("bill_status", "40");
+        }
+        wo_mst.update(jo_mst);
+    }
+
     @Override
     public void issueTask(JSONObject whereJson) {
 
@@ -1257,10 +1837,16 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             }
         }
     }
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String insertDtl2(JSONObject map) {
-//        WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
+
+    /**
+     * 拣选出库新增
+     *
+     * @param map 、
+     * @return 单据标识
+     */
+    private String inserdtlPic(JSONObject map) {
+
+        WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
         //明细另一种写法
         JSONArray rows = map.getJSONArray("tableData");
 
@@ -1279,13 +1865,10 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             }
         }
         String now = DateUtil.now();
-        String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + "";
+        String iostorinv_id = org.nl.common.utils.IdUtil.getLongId() + "";
         String bill_code = CodeUtil.getNewCode("IO_CODE");
 
-//        JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id ='" + MapUtil.getStr(map, "stor_id") + "'").uniqueResult(0);
-
-        StIvtBsrealstorattr stIvtBsrealstorattr = bsrealstorattrService.getOne(new LambdaQueryWrapper<StIvtBsrealstorattr>().eq(StIvtBsrealstorattr::getStor_id, map.getString("stor_id")));
-
+        JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id ='" + MapUtil.getStr(map, "stor_id") + "'").uniqueResult(0);
         map.put("iostorinv_id", iostorinv_id);
         map.put("bill_code", bill_code);
         map.put("biz_date", map.getString("biz_date").substring(0, 10));
@@ -1294,8 +1877,279 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         map.put("io_type", "1");
         map.put("detail_count", rows.size() + "");
         map.put("create_mode", "01");
-        map.put("stor_code", stIvtBsrealstorattr.getStor_code());
-        map.put("stor_name", stIvtBsrealstorattr.getStor_name());
+        map.put("stor_code", jsonStor.getString("stor_code"));
+        map.put("stor_name", jsonStor.getString("stor_name"));
+        map.put("input_optid", currentUserId + "");
+        map.put("input_optname", nickName);
+        map.put("input_time", now);
+        map.put("update_optid", currentUserId + "");
+        map.put("update_optname", nickName);
+        map.put("update_time", now);
+        map.put("is_delete", "0");
+        map.put("is_upload", "0");
+        map.put("out_stor_id", map.getString("out_stor_id"));
+        if (ObjectUtil.isNotEmpty(user)) {
+            if (!"mes".equals(user) || "sap".equals(user)) {
+                Long deptId = SecurityUtils.getDeptId();
+                map.put("sysdeptid", deptId);
+                map.put("syscompanyid", deptId);
+            }
+        }
+        double qty = 0.0; // 主表重量
+        int num = rows.size(); // 明细数
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.getJSONObject(i);
+            // 校验计划数量不能为零
+            double plan_qty = row.getDoubleValue("plan_qty");
+            if (Double.compare(plan_qty, 0.0) == 0) {
+                throw new BadRequestException("数量不能为0");
+            }
+            JSONObject jsonDtl = new JSONObject();
+            jsonDtl.put("iostorinvdtl_id", org.nl.common.utils.IdUtil.getLongId() + "");
+            jsonDtl.put("iostorinv_id", iostorinv_id);
+            jsonDtl.put("seq_no", (i + 1) + "");
+            jsonDtl.put("material_id", row.getString("material_id"));
+            jsonDtl.put("pcsn", row.getString("pcsn"));
+            jsonDtl.put("box_no", row.getString("box_no"));
+            jsonDtl.put("quality_scode", "01");
+            jsonDtl.put("bill_status", "10");
+            jsonDtl.put("qty_unit_id", row.get("qty_unit_id"));
+            jsonDtl.put("qty_unit_name", row.getString("qty_unit_name"));
+            jsonDtl.put("plan_qty", row.get("plan_qty"));
+            jsonDtl.put("remark", row.getString("remark"));
+            jsonDtl.put("source_bill_code", row.getString("source_bill_code"));
+            jsonDtl.put("assign_qty", "0");
+            jsonDtl.put("unassign_qty", row.get("plan_qty"));
+            jsonDtl.put("vbeln", row.getString("vbeln"));
+            jsonDtl.put("posnr", row.getString("posnr"));
+            WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
+            qty += jsonDtl.getDoubleValue("plan_qty");
+
+            // 判断此明细子卷是否存在，存在则将此木箱下的子卷全部生成明细
+            String pcsn = row.getString("pcsn");
+            String box_no = row.getString("box_no");
+            //查询该箱子所在货位
+            JSONObject struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + box_no + "'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(pcsn)) {
+                if (ObjectUtil.isEmpty(struct_jo)) {
+                    throw new BadRequestException("未查询到该批次所在货位！");
+                }
+                String struct_code = struct_jo.getString("struct_code");
+                JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(json)) {
+                    continue;
+                }
+            }
+
+        }
+        map.put("total_qty", qty);
+        map.put("detail_count", num);
+        WQLObject.getWQLObject("ST_IVT_IOStorInv").insert(map);
+
+        return iostorinv_id;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String insertDtl(JSONObject map) {
+        if (MapUtil.getStr(map, "bill_type").equals("1011")) {
+            String iostorinv_id = inserdtlPic(map);
+            return iostorinv_id;
+        }
+
+        WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
+        //明细另一种写法
+        JSONArray array = map.getJSONArray("tableData");
+        JSONArray rows = new JSONArray();
+        // 过滤相同箱号的明细
+        HashSet<String> boxSet = new HashSet<>();
+        for (int i = 0; i < array.size(); i++) {
+            JSONObject json = array.getJSONObject(i);
+            if (ObjectUtil.isNotEmpty(json.getString("box_no"))) {
+                boxSet.add(json.getString("box_no"));
+            } else {
+                rows.add(json);
+            }
+        }
+        if (ObjectUtil.isNotEmpty(boxSet)) {
+            // 遍历
+            for (String box_no : boxSet) {
+                JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "77").addParam("box_no", box_no).process().uniqueResult(0);
+                rows.add(jsonObject);
+            }
+        }
+
+
+        map.remove("tableData");
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String user = map.getString("user");
+        if (ObjectUtil.isNotEmpty(user)) {
+            if ("mes".equals(user)) {
+                currentUserId = "2";
+                nickName = "mes用户";
+            }
+            if ("sap".equals(user)) {
+                currentUserId = "3";
+                nickName = "sap用户";
+            }
+        }
+        String now = DateUtil.now();
+        String iostorinv_id = org.nl.common.utils.IdUtil.getLongId() + "";
+        String bill_code = CodeUtil.getNewCode("IO_CODE");
+
+        JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id ='" + MapUtil.getStr(map, "stor_id") + "'").uniqueResult(0);
+        map.put("iostorinv_id", iostorinv_id);
+        map.put("bill_code", bill_code);
+        map.put("biz_date", map.getString("biz_date").substring(0, 10));
+        String bill_type = (String) map.get("bill_type");
+        map.put("buss_type", bill_type.substring(0, 4));
+        map.put("io_type", "1");
+        map.put("detail_count", rows.size() + "");
+        map.put("create_mode", "01");
+        map.put("stor_code", jsonStor.getString("stor_code"));
+        map.put("stor_name", jsonStor.getString("stor_name"));
+        map.put("input_optid", currentUserId + "");
+        map.put("input_optname", nickName);
+        map.put("input_time", now);
+        map.put("update_optid", currentUserId + "");
+        map.put("update_optname", nickName);
+        map.put("update_time", now);
+        map.put("is_delete", "0");
+        map.put("is_upload", "0");
+        map.put("out_stor_id", map.getString("out_stor_id"));
+        if (ObjectUtil.isNotEmpty(user)) {
+            if (!"mes".equals(user) || "sap".equals(user)) {
+                Long deptId = SecurityUtils.getDeptId();
+                map.put("sysdeptid", deptId);
+                map.put("syscompanyid", deptId);
+            }
+        }
+        double qty = 0.0; // 主表重量
+        int num = rows.size(); // 明细数
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.getJSONObject(i);
+            // 校验计划数量不能为零
+            double plan_qty = row.getDoubleValue("plan_qty");
+            if (Double.compare(plan_qty, 0.0) == 0) {
+                throw new BadRequestException("数量不能为0");
+            }
+            JSONObject jsonDtl = new JSONObject();
+            jsonDtl.put("iostorinvdtl_id", org.nl.common.utils.IdUtil.getLongId() + "");
+            jsonDtl.put("iostorinv_id", iostorinv_id);
+            jsonDtl.put("seq_no", (i + 1) + "");
+            jsonDtl.put("material_id", row.getString("material_id"));
+            jsonDtl.put("pcsn", row.getString("pcsn"));
+            jsonDtl.put("box_no", row.getString("box_no"));
+            jsonDtl.put("quality_scode", "01");
+            jsonDtl.put("bill_status", "10");
+            jsonDtl.put("qty_unit_id", row.get("qty_unit_id"));
+            jsonDtl.put("qty_unit_name", row.getString("qty_unit_name"));
+            jsonDtl.put("plan_qty", row.get("plan_qty"));
+            jsonDtl.put("remark", row.getString("remark"));
+            jsonDtl.put("source_bill_code", row.getString("source_bill_code"));
+            jsonDtl.put("assign_qty", "0");
+            jsonDtl.put("unassign_qty", row.get("plan_qty"));
+            jsonDtl.put("vbeln", row.getString("vbeln"));
+            jsonDtl.put("posnr", row.getString("posnr"));
+            WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
+            qty += jsonDtl.getDoubleValue("plan_qty");
+
+            // 判断此明细子卷是否存在，存在则将此木箱下的子卷全部生成明细
+            String pcsn = row.getString("pcsn");
+            String box_no = row.getString("box_no");
+            //查询该箱子所在货位
+            JSONObject struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + box_no + "'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(pcsn)) {
+                if (ObjectUtil.isEmpty(struct_jo)) {
+                    throw new BadRequestException("未查询到该批次所在货位！");
+                }
+                String struct_code = struct_jo.getString("struct_code");
+                JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(json)) {
+                    continue;
+                }
+
+                JSONObject jsonMap = new JSONObject();
+                jsonMap.put("flag", "1");
+                jsonMap.put("pcsn", pcsn);
+                jsonMap.put("struct_id", json.getString("struct_id"));
+
+                JSONArray ivtArr = WQL.getWO("ST_OUTIVT02").addParamMap(jsonMap).process().getResultJSONArray(0);
+                for (int j = 0; j < ivtArr.size(); j++) {
+                    JSONObject jsonIvt = ivtArr.getJSONObject(j);
+                    JSONObject jsonDtl2 = new JSONObject();
+                    jsonDtl2.put("iostorinvdtl_id", org.nl.common.utils.IdUtil.getLongId() + "");
+                    jsonDtl2.put("iostorinv_id", iostorinv_id);
+                    jsonDtl2.put("seq_no", i + 2 + j);
+                    jsonDtl2.put("material_id", jsonIvt.getString("material_id"));
+                    jsonDtl2.put("pcsn", jsonIvt.getString("pcsn"));
+                    jsonDtl2.put("box_no", jsonIvt.getString("box_no"));
+                    jsonDtl2.put("quality_scode", "01");
+                    jsonDtl2.put("bill_status", "10");
+                    jsonDtl2.put("qty_unit_id", jsonIvt.get("qty_unit_id"));
+                    jsonDtl2.put("qty_unit_name", jsonIvt.getString("qty_unit_name"));
+                    jsonDtl2.put("plan_qty", jsonIvt.get("canuse_qty"));
+                    jsonDtl2.put("remark", "");
+                    jsonDtl2.put("assign_qty", "0");
+                    jsonDtl2.put("unassign_qty", jsonIvt.get("canuse_qty"));
+                    jsonDtl2.put("source_billdtl_id", jsonDtl.getString("iostorinvdtl_id"));
+                    // 校验计划数量不能为零
+                    double plan_qty2 = jsonDtl2.getDoubleValue("plan_qty");
+                    if (Double.compare(plan_qty2, 0.0) == 0) {
+                        throw new BadRequestException("数量不能为0");
+                    }
+                    WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl2);
+
+                    qty += jsonDtl2.getDoubleValue("plan_qty");
+                }
+                num += ivtArr.size();
+            }
+
+        }
+        map.put("total_qty", qty);
+        map.put("detail_count", num);
+        WQLObject.getWQLObject("ST_IVT_IOStorInv").insert(map);
+
+        return iostorinv_id;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String insertDtl2(JSONObject map) {
+        WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
+        //明细另一种写法
+        JSONArray rows = map.getJSONArray("tableData");
+
+        map.remove("tableData");
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String user = map.getString("user");
+        if (ObjectUtil.isNotEmpty(user)) {
+            if ("mes".equals(user)) {
+                currentUserId = "2";
+                nickName = "mes用户";
+            }
+            if ("sap".equals(user)) {
+                currentUserId = "3";
+                nickName = "sap用户";
+            }
+        }
+        String now = DateUtil.now();
+        String iostorinv_id = org.nl.common.utils.IdUtil.getLongId() + "";
+        String bill_code = CodeUtil.getNewCode("IO_CODE");
+
+        JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id ='" + MapUtil.getStr(map, "stor_id") + "'").uniqueResult(0);
+        map.put("iostorinv_id", iostorinv_id);
+        map.put("bill_code", bill_code);
+        map.put("biz_date", map.getString("biz_date").substring(0, 10));
+        String bill_type = (String) map.get("bill_type");
+        map.put("buss_type", bill_type.substring(0, 4));
+        map.put("io_type", "1");
+        map.put("detail_count", rows.size() + "");
+        map.put("create_mode", "01");
+        map.put("stor_code", jsonStor.getString("stor_code"));
+        map.put("stor_name", jsonStor.getString("stor_name"));
         map.put("input_optid", currentUserId + "");
         map.put("input_optname", nickName);
         map.put("input_time", now);
@@ -1321,131 +2175,78 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 throw new BadRequestException("数量不能为0");
             }
 
-//            JSONObject jsonDtl = new JSONObject();
-//            jsonDtl.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + "");
-//            jsonDtl.put("iostorinv_id", iostorinv_id);
-//            jsonDtl.put("seq_no", (i + 1) + "");
-//            jsonDtl.put("material_id", row.getString("material_id"));
-//            jsonDtl.put("pcsn", row.getString("pcsn"));
-//            jsonDtl.put("box_no", row.getString("box_no"));
-//            jsonDtl.put("quality_scode", "01");
-//            jsonDtl.put("bill_status", "10");
-//            jsonDtl.put("qty_unit_id", row.get("qty_unit_id"));
-//            jsonDtl.put("qty_unit_name", row.getString("qty_unit_name"));
-//            jsonDtl.put("plan_qty", row.get("plan_qty"));
-//            jsonDtl.put("remark", row.getString("remark"));
-//            jsonDtl.put("source_bill_code", row.getString("source_bill_code"));
-//            jsonDtl.put("assign_qty", "0");
-//            jsonDtl.put("unassign_qty", row.get("plan_qty"));
-//            jsonDtl.put("vbeln", row.getString("vbeln"));
-//            jsonDtl.put("posnr", row.getString("posnr"));
-//            jsonDtl.put("width", row.getString("width"));
-
-            StIvtIostorinvdtl stIvtIostorinvdtl = new StIvtIostorinvdtl();
-            stIvtIostorinvdtl.setIostorinvdtl_id(IdUtil.getSnowflake(1, 1).nextId()+"");
-            stIvtIostorinvdtl.setIostorinv_id(iostorinv_id);
-            stIvtIostorinvdtl.setSeq_no(new BigDecimal(i + 1));
-            stIvtIostorinvdtl.setMaterial_id(row.getString("material_id"));
-            stIvtIostorinvdtl.setPcsn(row.getString("pcsn"));
-            stIvtIostorinvdtl.setBox_no(row.getString("box_no"));
-            stIvtIostorinvdtl.setQuality_scode("01");
-            stIvtIostorinvdtl.setBill_status("10");
-            stIvtIostorinvdtl.setQty_unit_id((String) row.get("qty_unit_id"));
-            stIvtIostorinvdtl.setQty_unit_name(row.getString("qty_unit_name"));
-            stIvtIostorinvdtl.setPlan_qty(new BigDecimal(row.get("plan_qty").toString()));
-            stIvtIostorinvdtl.setRemark(row.getString("remark"));
-            stIvtIostorinvdtl.setSource_bill_code(row.getString("source_bill_code"));
-            stIvtIostorinvdtl.setAssign_qty(new BigDecimal("0"));
-            stIvtIostorinvdtl.setUnassign_qty(new BigDecimal(row.get("plan_qty").toString()));
-            stIvtIostorinvdtl.setVbeln(row.getString("vbeln"));
-            stIvtIostorinvdtl.setPosnr(row.getString("posnr"));
-            stIvtIostorinvdtl.setWidth(row.getString("width"));
-
-//            WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
-
-            stIvtIostorinvdtlMapper.insert(stIvtIostorinvdtl);
-            qty += stIvtIostorinvdtl.getPlan_qty().doubleValue();
+            JSONObject jsonDtl = new JSONObject();
+            jsonDtl.put("iostorinvdtl_id", org.nl.common.utils.IdUtil.getLongId() + "");
+            jsonDtl.put("iostorinv_id", iostorinv_id);
+            jsonDtl.put("seq_no", (i + 1) + "");
+            jsonDtl.put("material_id", row.getString("material_id"));
+            jsonDtl.put("pcsn", row.getString("pcsn"));
+            jsonDtl.put("box_no", row.getString("box_no"));
+            jsonDtl.put("quality_scode", "01");
+            jsonDtl.put("bill_status", "10");
+            jsonDtl.put("qty_unit_id", row.get("qty_unit_id"));
+            jsonDtl.put("qty_unit_name", row.getString("qty_unit_name"));
+            jsonDtl.put("plan_qty", row.get("plan_qty"));
+            jsonDtl.put("remark", row.getString("remark"));
+            jsonDtl.put("source_bill_code", row.getString("source_bill_code"));
+            jsonDtl.put("assign_qty", "0");
+            jsonDtl.put("unassign_qty", row.get("plan_qty"));
+            jsonDtl.put("vbeln", row.getString("vbeln"));
+            jsonDtl.put("posnr", row.getString("posnr"));
+            jsonDtl.put("width", row.getString("width"));
+            WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
+            qty += jsonDtl.getDoubleValue("plan_qty");
 
             // 判断此明细子卷是否存在，存在则将此木箱下的子卷全部生成明细
             String pcsn = row.getString("pcsn");
             String box_no = row.getString("box_no");
             //查询该箱子所在货位
-//            JSONObject struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + box_no + "'").uniqueResult(0);
-            StIvtStructattr struct_jo = stIvtStructattrMapper.selectOne(new LambdaQueryWrapper<StIvtStructattr>().eq(StIvtStructattr::getStoragevehicle_code, box_no));
+            JSONObject struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + box_no + "'").uniqueResult(0);
             if (ObjectUtil.isNotEmpty(pcsn)) {
                 if (ObjectUtil.isEmpty(struct_jo)) {
                     throw new BadRequestException("未查询到该批次所在货位！");
                 }
-                String struct_code = struct_jo.getStruct_code();
-//                JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0);
-                StIvtStructivt stIvtStructivt = stIvtStructivtMapper.selectOne(new LambdaQueryWrapper<StIvtStructivt>().eq(StIvtStructivt::getPcsn, pcsn).eq(StIvtStructivt::getStruct_code, struct_code));
-
-
-                if (ObjectUtil.isEmpty(stIvtStructivt)) {
+                String struct_code = struct_jo.getString("struct_code");
+                JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(json)) {
                     continue;
                 }
 
-//                JSONObject jsonMap = new JSONObject();
-//                jsonMap.put("flag", "1");
-//                jsonMap.put("pcsn", pcsn);
-//                jsonMap.put("struct_id", json.getString("struct_id"));
-//
-//                JSONArray ivtArr = WQL.getWO("ST_OUTIVT02").addParamMap(jsonMap).process().getResultJSONArray(0);
-
-                OutBillStIvtStructivtDto outBillStIvtStructivtDto = new OutBillStIvtStructivtDto();
-                outBillStIvtStructivtDto.setPcsn(pcsn);
-                outBillStIvtStructivtDto.setStruct_id(stIvtStructivt.getStruct_id());
-                List<OutBillStIvtStructivtVo> outBillStIvtStructivtVos = stIvtStructivtMapper.selectByPcsnAndStructId(outBillStIvtStructivtDto);
-
-                for (int j = 0; j < outBillStIvtStructivtVos.size(); j++) {
-
-                    OutBillStIvtStructivtVo outBillStIvtStructivtVo = outBillStIvtStructivtVos.get(j);
-//                    JSONObject jsonDtl2 = new JSONObject();
-//                    jsonDtl2.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + "");
-//                    jsonDtl2.put("iostorinv_id", iostorinv_id);
-//                    jsonDtl2.put("seq_no", i + 2 + j);
-//                    jsonDtl2.put("material_id", jsonIvt.getString("material_id"));
-//                    jsonDtl2.put("pcsn", jsonIvt.getString("pcsn"));
-//                    jsonDtl2.put("box_no", jsonIvt.getString("box_no"));
-//                    jsonDtl2.put("quality_scode", "01");
-//                    jsonDtl2.put("bill_status", "10");
-//                    jsonDtl2.put("qty_unit_id", jsonIvt.get("qty_unit_id"));
-//                    jsonDtl2.put("qty_unit_name", jsonIvt.getString("qty_unit_name"));
-//                    jsonDtl2.put("plan_qty", jsonIvt.get("canuse_qty"));
-//                    jsonDtl2.put("remark", "");
-//                    jsonDtl2.put("assign_qty", "0");
-//                    jsonDtl2.put("unassign_qty", jsonIvt.get("canuse_qty"));
-//                    jsonDtl2.put("source_billdtl_id", jsonDtl.getString("iostorinvdtl_id"));
-
-                    StIvtIostorinvdtl stIvtIostorinvdtl2 = new StIvtIostorinvdtl();
-                    stIvtIostorinvdtl2.setIostorinvdtl_id(IdUtil.getSnowflake(1, 1).nextId()+"");
-                    stIvtIostorinvdtl2.setIostorinv_id(iostorinv_id);
-                    stIvtIostorinvdtl2.setSeq_no(new BigDecimal(i + 2 + j));
-                    stIvtIostorinvdtl2.setMaterial_id(outBillStIvtStructivtVo.getMaterial_id());
-                    stIvtIostorinvdtl2.setPcsn(outBillStIvtStructivtVo.getPcsn());
-                    stIvtIostorinvdtl2.setBox_no(outBillStIvtStructivtVo.getBox_no());
-                    stIvtIostorinvdtl2.setQuality_scode("01");
-                    stIvtIostorinvdtl2.setBill_status("10");
-                    stIvtIostorinvdtl2.setQty_unit_id(outBillStIvtStructivtVo.getQty_unit_id());
-                    stIvtIostorinvdtl2.setQty_unit_name(outBillStIvtStructivtVo.getQty_unit_name());
-                    stIvtIostorinvdtl2.setPlan_qty(new BigDecimal(outBillStIvtStructivtVo.getCanuse_qty().toString()));
-                    stIvtIostorinvdtl2.setRemark("");
-                    stIvtIostorinvdtl2.setAssign_qty(new BigDecimal("0"));
-                    stIvtIostorinvdtl2.setUnassign_qty(new BigDecimal(outBillStIvtStructivtVo.getCanuse_qty().toString()));
-                    stIvtIostorinvdtl2.setSource_billdtl_id(stIvtIostorinvdtl.getIostorinvdtl_id());
+                JSONObject jsonMap = new JSONObject();
+                jsonMap.put("flag", "1");
+                jsonMap.put("pcsn", pcsn);
+                jsonMap.put("struct_id", json.getString("struct_id"));
 
+                JSONArray ivtArr = WQL.getWO("ST_OUTIVT02").addParamMap(jsonMap).process().getResultJSONArray(0);
+                for (int j = 0; j < ivtArr.size(); j++) {
+                    JSONObject jsonIvt = ivtArr.getJSONObject(j);
+                    JSONObject jsonDtl2 = new JSONObject();
 
+                    jsonDtl2.put("iostorinvdtl_id", org.nl.common.utils.IdUtil.getLongId() + "");
+                    jsonDtl2.put("iostorinv_id", iostorinv_id);
+                    jsonDtl2.put("seq_no", i + 2 + j);
+                    jsonDtl2.put("material_id", jsonIvt.getString("material_id"));
+                    jsonDtl2.put("pcsn", jsonIvt.getString("pcsn"));
+                    jsonDtl2.put("box_no", jsonIvt.getString("box_no"));
+                    jsonDtl2.put("quality_scode", "01");
+                    jsonDtl2.put("bill_status", "10");
+                    jsonDtl2.put("qty_unit_id", jsonIvt.get("qty_unit_id"));
+                    jsonDtl2.put("qty_unit_name", jsonIvt.getString("qty_unit_name"));
+                    jsonDtl2.put("plan_qty", jsonIvt.get("canuse_qty"));
+                    jsonDtl2.put("remark", "");
+                    jsonDtl2.put("assign_qty", "0");
+                    jsonDtl2.put("unassign_qty", jsonIvt.get("canuse_qty"));
+                    jsonDtl2.put("source_billdtl_id", jsonDtl.getString("iostorinvdtl_id"));
                     // 校验计划数量不能为零
-                    double plan_qty2 = stIvtIostorinvdtl2.getPlan_qty().doubleValue();
+                    double plan_qty2 = jsonDtl2.getDoubleValue("plan_qty");
                     if (Double.compare(plan_qty2, 0) == 0) {
                         throw new BadRequestException("数量不能为0");
                     }
-//                    WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl2);
+                    WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl2);
 
-                    stIvtIostorinvdtlMapper.insert(stIvtIostorinvdtl2);
-                    qty +=  stIvtIostorinvdtl2.getPlan_qty().doubleValue();
+                    qty += jsonDtl2.getDoubleValue("plan_qty");
                 }
-                num += outBillStIvtStructivtVos.size();
+                num += ivtArr.size();
             }
 
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index 97c800c..9b332df 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -602,6 +602,58 @@
                 ENDQUERY
         ENDIF
 
+       IF 输入.flag = "33"
+                QUERY
+                    SELECT
+                        ivt2.*,
+                        '0' AS plan_qty,
+                        mb.material_code,
+                        mb.material_name,
+                        struct.sect_id,
+                        struct.sect_name,
+                        struct.sect_code,
+                        struct.storagevehicle_id,
+                        struct.storagevehicle_code,
+                        point.point_id,
+                        sub.sap_pcsn,
+                         CASE
+                           WHEN SUBSTRING(sub.container_name,1,1) = 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '180'
+                               THEN '1'
+                           WHEN SUBSTRING(sub.container_name,1,1) != 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '90'
+                               THEN '1'
+                               ELSE '0'
+                        END AS is_overdue
+                    FROM
+                        ST_IVT_StructIvt ivt2
+                    LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt2.struct_id
+                    LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt2.material_id
+                    LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
+                    LEFT JOIN pdm_bi_subpackagerelation sub ON struct.storagevehicle_code = sub.package_box_sn and ivt2.pcsn = sub.container_name
+                    WHERE
+                        struct.lock_type='1'
+                    OPTION 输入.sale_order_name <> ""
+                          sub.sale_order_name = 输入.sale_order_name
+                    ENDOPTION
+                    OPTION 输入.pcsn <> ""
+                          ivt2.pcsn = 输入.pcsn
+                    ENDOPTION
+                    OPTION 输入.sect_id <> ""
+                          struct.sect_id = 输入.sect_id
+                    ENDOPTION
+                    OPTION 输入.stor_id <> ""
+                          struct.stor_id = 输入.stor_id
+                    ENDOPTION
+                    OPTION 输入.box_no <> ""
+                          sub.package_box_sn = 输入.box_no
+                    ENDOPTION
+                    OPTION 输入.sap_pcsn <> ""
+                          sub.sap_pcsn = 输入.sap_pcsn
+                    ENDOPTION
+                    order by ivt2.canuse_qty,ivt2.pcsn desc
+                    ENDSELECT
+                ENDQUERY
+        ENDIF
+
         IF 输入.flag = "4"
                 QUERY
                     SELECT
@@ -985,7 +1037,8 @@
                 mater.material_code,
                 unit.unit_name AS qty_unit_name,
                 attr.storagevehicle_code AS box_no,
-                sub.sap_pcsn
+                sub.sap_pcsn,
+                sub.sale_order_name source_bill_code
             FROM
             	ST_IVT_StructIvt ivt
             	LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index f0ff466..f5bcd9e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -327,7 +327,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                 // 销售出库
 //                if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) {
-                if (StrUtil.equals(bill_type, "1001")) {
+                if (StrUtil.equals(bill_type, "1001")|| StrUtil.equals(bill_type, "1011") ||  StrUtil.equals(bill_type, "1013")  ||  StrUtil.equals(bill_type, "1014") ||  StrUtil.equals(bill_type, "1015")) {
                     // 2.回传mes
                     JSONObject paramMesMst = new JSONObject();
                     String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
@@ -450,71 +450,71 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     stIvtIostorinvMapper.updateById(stIvtIostorinvdis);
                 }
 
-                // 报废出库：回传mes
-                if (StrUtil.equals(bill_type, "1007") || StrUtil.equals(bill_type, "1008") || StrUtil.equals(bill_type, "1010") || StrUtil.equals(bill_type, "1002")) {
+//              // 报废出库：回传mes
+//              if (StrUtil.equals(bill_type, "1007") || StrUtil.equals(bill_type, "1008") || StrUtil.equals(bill_type, "1010") || StrUtil.equals(bill_type, "1002")) {
 
-                    JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "3").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
+//                  JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "3").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
 
-                    String box_no_in = disArr.toJavaList(JSONObject.class).stream()
-                            .map(row -> row.getString("box_no"))
-                            .collect(Collectors.joining("','"));
+//                  String box_no_in = disArr.toJavaList(JSONObject.class).stream()
+//                          .map(row -> row.getString("box_no"))
+//                          .collect(Collectors.joining("','"));
 
-                    // 所有子卷
-                    List<JSONObject> disList = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no in ('" + box_no_in + "') and iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class);
+//                  // 所有子卷
+//                  List<JSONObject> disList = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no in ('" + box_no_in + "') and iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class);
 
-                    // 查询仓库
-                    JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr")
-                            .query("stor_code = '" + jo_mst.getString("stor_code") + "'").uniqueResult(0);
+//                  // 查询仓库
+//                  JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr")
+//                          .query("stor_code = '" + jo_mst.getString("stor_code") + "'").uniqueResult(0);
 
-                    for (int j = 0; j < disArr.size(); j++) {
-                        JSONObject param = new JSONObject();
-                        JSONArray item = new JSONArray();
+//                  for (int j = 0; j < disArr.size(); j++) {
+//                      JSONObject param = new JSONObject();
+//                      JSONArray item = new JSONArray();
 
-                        JSONObject json = disArr.getJSONObject(j);
+//                      JSONObject json = disArr.getJSONObject(j);
 
-                        JSONObject jsonDtl = new JSONObject();
-                        JSONArray details = new JSONArray();
+//                      JSONObject jsonDtl = new JSONObject();
+//                      JSONArray details = new JSONArray();
 
-                        jsonDtl.put("PackageBoxSN", json.getString("box_no"));
-                        jsonDtl.put("Status", "1");
+//                      jsonDtl.put("PackageBoxSN", json.getString("box_no"));
+//                      jsonDtl.put("Status", "1");
 
-                        List<JSONObject> collect = disList.stream()
-                                .filter(row -> row.getString("box_no").equals(json.getString("box_no")))
-                                .collect(Collectors.toList());
+//                      List<JSONObject> collect = disList.stream()
+//                              .filter(row -> row.getString("box_no").equals(json.getString("box_no")))
+//                              .collect(Collectors.toList());
 
-                        for (int k = 0; k < collect.size(); k++) {
-                            JSONObject jsonObject = collect.get(k);
+//                      for (int k = 0; k < collect.size(); k++) {
+//                          JSONObject jsonObject = collect.get(k);
 
-                            JSONObject jsonObject1 = new JSONObject();
-                            jsonObject1.put("ContainerName", jsonObject.getString("pcsn"));
-                            jsonObject1.put("NetWeight",NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty")));
-                            details.add(jsonObject1);
-                        }
-                        jsonDtl.put("Details", details);
-                        item.add(jsonDtl);
+//                          JSONObject jsonObject1 = new JSONObject();
+//                          jsonObject1.put("ContainerName", jsonObject.getString("pcsn"));
+//                          jsonObject1.put("NetWeight",NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty")));
+//                          details.add(jsonObject1);
+//                      }
+//                      jsonDtl.put("Details", details);
+//                      item.add(jsonDtl);
 
-                        param.put("Items", item);
+//                      param.put("Items", item);
 
-                        // 仓库编码
-                        param.put("WareHouse", jsonStor.getString("ext_id"));
-                        SpringContextHolder.getBean(LmsToMesServiceImpl.class).ChildScrapUpdate(param);
+//                      // 仓库编码
+//                      param.put("WareHouse", jsonStor.getString("ext_id"));
+//                      SpringContextHolder.getBean(LmsToMesServiceImpl.class).ChildScrapUpdate(param);
 
-                        // 更新分配回传成功
-                        JSONObject jsonUpdate = new JSONObject();
-                        jsonUpdate.put("is_upload", "1");
+//                      // 更新分配回传成功
+//                      JSONObject jsonUpdate = new JSONObject();
+//                      jsonUpdate.put("is_upload", "1");
 
-                        WQLObject.getWQLObject("st_ivt_iostorinvdis")
-                                .update(jsonUpdate,"iostorinv_id = '"+jo_mst.getString("iostorinv_id")+"' and box_no = '"+json.getString("box_no")+"'");
-                    }
+//                      WQLObject.getWQLObject("st_ivt_iostorinvdis")
+//                              .update(jsonUpdate,"iostorinv_id = '"+jo_mst.getString("iostorinv_id")+"' and box_no = '"+json.getString("box_no")+"'");
+//                  }
 
-                    StIvtIostorinv stIvtIostorinvdis = new StIvtIostorinv();
-                    stIvtIostorinvdis.setIs_upload("1");
-                    stIvtIostorinvdis.setUpload_mes("1");
-                    stIvtIostorinvdis.setUpload_optid(SecurityUtils.getCurrentUserId());
-                    stIvtIostorinvdis.setUpload_time(DateUtil.now());
-                    stIvtIostorinvdis.setIostorinv_id(jo_mst.getString("iostorinv_id"));
-                    stIvtIostorinvMapper.updateById(stIvtIostorinvdis);
-                }
+//                  StIvtIostorinv stIvtIostorinvdis = new StIvtIostorinv();
+//                  stIvtIostorinvdis.setIs_upload("1");
+//                  stIvtIostorinvdis.setUpload_mes("1");
+//                  stIvtIostorinvdis.setUpload_optid(SecurityUtils.getCurrentUserId());
+//                  stIvtIostorinvdis.setUpload_time(DateUtil.now());
+//                  stIvtIostorinvdis.setIostorinv_id(jo_mst.getString("iostorinv_id"));
+//                  stIvtIostorinvMapper.updateById(stIvtIostorinvdis);
+//              }
 
                 /*// 改切出库
                 if (StrUtil.equals(bill_type, "1003")) {
@@ -559,6 +559,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
         WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelationrecord");
         // 子卷包装关系表
         WQLObject subTab2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
+        // 成品报废审核主表
+        WQLObject scrapTab = WQLObject.getWQLObject("st_ivt_productscrapmst");
+        //成品报废审核明细表
+        WQLObject scrapDtlTab = WQLObject.getWQLObject("st_ivt_productscrapdtl");
 
         JSONArray rows = whereJson.getJSONArray("rows");
         for (int i = 0; i < rows.size(); i++) {
@@ -570,8 +574,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 JSONObject stor_jo = WQLObject.getWQLObject("ST_IVT_BSRealStorAttr").query("stor_id = '" + stor_id + "'").uniqueResult(0);
                 String lgort = stor_jo.getString("ext_id");
                 String is_productstore = stor_jo.getString("is_productstore");
-                //退货入库
-                if (StrUtil.equals(bill_type, "0002")) {
+                //退货入库 1.回传sap
+                if (StrUtil.equals(bill_type, "0002") || StrUtil.equals(bill_type, "0013") || StrUtil.equals(bill_type, "0014")) {
                     // 1.回传sap
                     JSONArray paramSapMstArr = new JSONArray();
 
@@ -712,7 +716,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 }
 
                 // 销售出库
-                if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011")) {
+                if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011") ||  StrUtil.equals(bill_type, "1013")  ||  StrUtil.equals(bill_type, "1014") ||  StrUtil.equals(bill_type, "1015")) {
                     // 1.回传sap
                     JSONArray paramSapMstArr = new JSONArray();
 
@@ -817,7 +821,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         paramDis.put("ZZWLHD", jsonSub.getString("thickness"));
                         paramDis.put("CHARG", jsonSub.getString("sap_pcsn"));
                         paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"), 3));
-                        paramDis.put("WERKS", "2460");
+                        paramDis.put("WERKS", "2211");
                         paramSapMstArr.add(paramDis);
                     }
                     param.put("ITEM", paramSapMstArr);
@@ -870,7 +874,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         jsonDtl.put("BWART", "311");
                         jsonDtl.put("MENGE", json.getDoubleValue("real_qty"));
                         jsonDtl.put("MEINS", json.getString("qty_unit_name"));
-                        jsonDtl.put("WERKS", "2460");
+                        jsonDtl.put("WERKS", "2211");
 
                         JSONObject jsonSect = sectTab.query("sect_id = '" + json.getString("sect_id") + "'").uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonSect)) {
@@ -978,6 +982,71 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                     }
                 }
+                // 报废出库
+                // 2026年05月08日 新改需求修改。
+                // 修改内容 1： 报废出库以前回传MES,现不回传MES,直接回传SAP
+                // 修改内容2： 调整报废出库的类型 bill_type  其中 1002 为 其他报废，进行保留，适配历史数据
+                // 其他报废类型： 传SAP业务类型字段： 2003：成品库整卷报废 2004：成品库超期报废 2005：成品库退货报废
+                if (StrUtil.equals(bill_type, "2003") || StrUtil.equals(bill_type, "2004") || StrUtil.equals(bill_type, "2005") || StrUtil.equals(bill_type, "1002")) {
+                    JSONObject paramSapScrapMst = new JSONObject();
+                    JSONArray paramSapScrapDtlArr = new JSONArray();
+                    JSONArray dtlArr = wo_dtl.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0);
+                    for (int k = 0; k < dtlArr.size(); k++) {
+                        JSONObject json = dtlArr.getJSONObject(k);
+                        JSONObject jsonMater = materTab.query("material_id = '" + json.getString("material_id") + "'").uniqueResult(0);
+
+                        // 明细
+                        JSONObject jsonDtl = new JSONObject();
+                        jsonDtl.put("WERKS", "2211");
+                        jsonDtl.put("MATNR", jsonMater.getString("material_code"));
+
+                        //获取分配表相关信息
+                        JSONArray disArr = wo_dis.query("iostorinvdtl_id = '" + json.getString("iostorinvdtl_id") + "'").getResultJSONArray(0);
+                        for (int j = 0; j < disArr.size(); j++) {
+                            JSONObject json2 = disArr.getJSONObject(j);
+                            JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
+                            if (ObjectUtil.isNotEmpty(jsonSect)) {
+                                jsonDtl.put("LGORT", lgort); // 明細储存地点
+                            }
+                            JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "' AND bill_id = '" + json2.getString("iostorinv_id") + "'").uniqueResult(0);
+                            if (ObjectUtil.isNotEmpty(jsonSub)) {
+                                jsonDtl.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次
+                            }
+                        }
+                        // 数量
+                        jsonDtl.put("BDMNG", json.getString("assign_qty"));
+                        // 返检修改差异重量
+                        jsonDtl.put("ZCJZ", json.getString("assign_qty"));
+                        // 返检修改后重量
+                        jsonDtl.put("ZGHZL", "0");
+                        // 单位
+                        jsonDtl.put("VRKME", json.getString("qty_unit_name"));
+                        // MES批次
+                        jsonDtl.put("Z1", json.getString("pcsn"));
+
+                        String sourceBillCode = json.getString("source_bill_code");
+                        String[] billCode = sourceBillCode.split("-");
+                        if(billCode.length == 2){
+                            //销售订单
+                            jsonDtl.put("VBELN", billCode[0]);
+                            //销售订单行
+                            jsonDtl.put("POSNR", billCode[1]);
+                        }
+                        //移动原因
+                        jsonDtl.put("ZYDYY", bill_type);
+                        //来源系统
+                        jsonDtl.put("ZLYXT", "lms");
+                        paramSapScrapDtlArr.add(jsonDtl);
+                    }
+                    paramSapScrapMst.put("IT_ITEM", paramSapScrapDtlArr);
+                    // 调用接口回传
+                    SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnScrapDtl(paramSapScrapMst);
+                    jo_mst.put("upload_sap", "1");
+                    jo_mst.put("is_upload", "1");
+                    jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId());
+                    jo_mst.put("upload_time", DateUtil.now());
+                    WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
+                }
             }
         }
     }
@@ -1188,7 +1257,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramDis.put("ZZWLHD", jsonSub.getString("thickness"));
                     paramDis.put("CHARG", jsonSub.getString("sap_pcsn"));
                     paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"), 3));
-                    paramDis.put("WERKS", "2460");
+                    paramDis.put("WERKS", "2211");
                     paramSapMstArr.add(paramDis);
                 }
                 param.put("ITEM", paramSapMstArr);
@@ -1344,7 +1413,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
             }
 
             // 销售出库
-            if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011") ) {
+            if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011") ||  StrUtil.equals(bill_type, "1013")  ||  StrUtil.equals(bill_type, "1014") ||  StrUtil.equals(bill_type, "1015")) {
                 // 1.回传sap
                 JSONArray paramSapMstArr = new JSONArray();
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
index 6b701d5..282fbc4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
@@ -316,10 +317,11 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 mp.put("实际尺寸（mm）（实际幅宽）", String.format("%.0f", json.getDoubleValue("width")));
                 String box_name = json.getString("box_name");
                 if (StrUtil.isNotEmpty(box_name)) {
-                    String[] s = box_name.split("木箱");
-                    String s1 = s[1];
-                    String[] split = s1.split("\\\\");
-                    mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
+                    // todo 88549333  箱号规格解析 2026年5月20日16:05:45
+//                    String[] s = box_name.split("木箱");
+//                    String s1 = s[1];
+//                    String[] split = s1.split("\\|");
+                    String[] split = MdmDescriptionParseUtils.parseMxBoxDetailInfo(box_name);
                 } else {
                     mp.put("木箱规格/尺寸", "");
                 }
@@ -496,10 +498,12 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 mp.put("实际尺寸（mm）（实际幅宽）", String.format("%.0f", json.getDoubleValue("width")));
                 String box_name = json.getString("box_name");
                 if (StrUtil.isNotEmpty(box_name)) {
-                    String[] s = box_name.split("木箱");
-                    String s1 = s[1];
-                    String[] split = s1.split("\\\\");
-                    mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
+                    // todo 88549333  箱号规格解析 2026年5月20日16:05:45
+//                    String[] s = box_name.split("木箱");
+//                    String s1 = s[1];
+//                    String[] split = s1.split("\\|");
+//                    mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
+                    String[] split = MdmDescriptionParseUtils.parseMxBoxDetailInfo(box_name);
                 } else {
                     mp.put("木箱规格/尺寸", "");
                 }
diff --git a/lms/nladmin-system/src/main/resources/language/i18n/en.js b/lms/nladmin-system/src/main/resources/language/i18n/en.js
index b275da6..beef0c4 100644
--- a/lms/nladmin-system/src/main/resources/language/i18n/en.js
+++ b/lms/nladmin-system/src/main/resources/language/i18n/en.js
@@ -49,6 +49,7 @@ var config = {
         "mesErrorTitle": "MES Error"
     },
     "common": {
+        "vbeln":"vbeln",
         "siteAlreadySet":"Site already set",
         "outboundAllocation":"Outbound Allocation",
         "allocateAll":"Allocate All",
@@ -3647,6 +3648,8 @@ var config = {
                 },
                 "customer": {
                     "isSingleRollSingleBox": "Is single roll single box",
+                    "outerPackagingPrintNum": "outer packaging print num",
+                    "containerPrintNum": "Subvolume inner label print num",
                     "enterCustomerCodeOrName": "Enter customer code or name",
                     "customerCode": "Customer Code",
                     "customerName": "Customer Name",
diff --git a/lms/nladmin-system/src/main/resources/language/i18n/id.js b/lms/nladmin-system/src/main/resources/language/i18n/id.js
index bf591a8..137208f 100644
--- a/lms/nladmin-system/src/main/resources/language/i18n/id.js
+++ b/lms/nladmin-system/src/main/resources/language/i18n/id.js
@@ -48,6 +48,7 @@ var config = {
         "load_text5": "Hanya dapat mengunggah satu file excel!"
     },
     "common": {
+        "vbeln":"Surat Pengiriman",
         "siteAlreadySet":"Situs sudah diatur",
         "outboundAllocation":"Alokasi Pengeluaran",
         "allocateAll":"Alokasi Semua",
@@ -3606,6 +3607,8 @@ var config = {
                     "topCategoryCannotBeEmpty": "Apakah kategori teratas tidak boleh kosong"
                 },
                 "customer": {
+                    "outerPackagingPrintNum": "nomor cetak kemasan luar",
+                    "containerPrintNum": "nomor cetak label dalam subvolume",
                     "isSingleRollSingleBox": "Apakah satu gulung per kotak",
                     "enterCustomerCodeOrName": "Masukkan kode atau nama pelanggan",
                     "customerCode": "Kode Pelanggan",
diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js
index edae6fd..f72a7a9 100644
--- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js
+++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js
@@ -93,6 +93,7 @@ var config = {
         "correspondingDeepLocationError": "对应的深货位错误!"
     },
     "common": {
+        "vbeln":"交货单",
         "siteAlreadySet":"站点已设置",
         "outboundAllocation":"出库分配",
         "allocateAll":"全部分配",
@@ -3690,6 +3691,8 @@ var config = {
                     "topCategoryCannotBeEmpty": "是否顶级分类不能为空"
                 },
                 "customer": {
+                    "outerPackagingPrintNum": "外包装标签打印份数",
+                    "containerPrintNum": "子卷内标打印份数",
                     "isSingleRollSingleBox": "是否单卷单箱",
                     "enterCustomerCodeOrName": "输入客户编码或名称",
                     "customerCode": "客户编码",
diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
index 0c4fe50..68f39e6 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
@@ -167,6 +167,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('wms.basedata.master.customer.outerPackagingPrintNum')">
+                <el-input-number v-model="form.outer_packaging_print_num" :min="1" :max="100" :precision="0" :controls="false" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('wms.basedata.master.customer.containerPrintNum')">
+                <el-input-number v-model="form.container_print_num" :min="1" :max="100" :precision="0" :controls="false" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="16">
@@ -201,6 +211,8 @@
         <el-table-column prop="bz_print_within" :label="$t('wms.basedata.master.customer.innerLabelPrintTemplate')" width="150px" :formatter="printTemple2" show-overflow-tooltip />
         <el-table-column prop="shd_print_no" :label="$t('wms.basedata.master.customer.deliveryNotePrintTemplatePath')" width="180px" show-overflow-tooltip />
         <el-table-column prop="shd_dtl_num" :label="$t('wms.basedata.master.customer.deliveryNoteDetailCount')" width="150px" show-overflow-tooltip />
+        <el-table-column prop="outer_packaging_print_num" :label="$t('wms.basedata.master.customer.outerPackagingPrintNum')" width="150px" show-overflow-tooltip />
+        <el-table-column prop="container_print_num" :label="$t('wms.basedata.master.customer.containerPrintNum')" width="150px" show-overflow-tooltip />
         <el-table-column prop="is_auto_table" :label="$t('wms.basedata.master.customer.isAutoLabeling')" width="150px" show-overflow-tooltip :formatter="autoTable" />
         <el-table-column prop="is_single_roll_single_box" :label="$t('wms.basedata.master.customer.isSingleRollSingleBox')" width="150px" show-overflow-tooltip :formatter="singleRollSingleBox" />
         <el-table-column prop="update_optname" :label="$t('wms.basedata.master.customer.modifier')" width="150px" />
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 0b8ec44..36cd6b7 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -96,12 +96,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('common.vbeln_order')">
+          <el-form-item :label="$t('common.deliveryOrderNumber')">
             <el-input
               v-model="query.vbeln"
               size="mini"
               clearable
-              :placeholder="$t('common.vbeln_order')"
+              :placeholder="$t('common.deliveryOrderNumber')"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -327,7 +327,7 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip :label="$t('common.customer')" align="center" prop="cust_simple_name" width="100" />
         <el-table-column show-overflow-tooltip :label="$t('common.customer_name')" align="center" prop="cust_code" width="100" />
-        <el-table-column show-overflow-tooltip :label="$t('common.vbeln_order')" align="center" prop="vbeln" width="100" />
+        <el-table-column show-overflow-tooltip :label="$t('common.deliveryOrderNumber')" align="center" prop="vbeln" width="100" />
         <el-table-column show-overflow-tooltip :label="$t('common.is_upload')" align="center" prop="is_upload" width="80" :formatter="formatIsUpload" />
         <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" :label="$t('common.create_mode')" width="100" />
         <el-table-column show-overflow-tooltip :formatter="isOverdue" prop="is_overdue" :label="$t('common.isOverdueShipment')" width="220" />
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 8a99237..875cce8 100644
--- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
@@ -37,7 +37,7 @@
               :start-placeholder="$t('common.startDate')"
               :end-placeholder="$t('common.endDate')"
               :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
+              @change="mytoQuery(query.createTime)"
             />
           </el-form-item>
 
diff --git a/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue b/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
index 217ec1e..9f5e5fe 100644
--- a/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue
@@ -118,11 +118,11 @@
             />
           </el-form-item>
 
-          <el-form-item :label="$t('common.vbeln_order')">
+          <el-form-item :label="$t('common.orderCode')">
             <el-input
               v-model="query.sale_order_name"
               clearable
-              :placeholder="$t('common.vbeln_order')"
+              :placeholder="$t('common.orderCode')"
               size="mini"
               style="width: 185px;"
               class="filter-item"