diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml
index 5a0947d80..8f6408f96 100644
--- a/lms/nladmin-system/pom.xml
+++ b/lms/nladmin-system/pom.xml
@@ -113,6 +113,11 @@
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
+            <version>5.1.1</version>
+        </dependency>
         <!--Spring boot 核心 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -201,8 +206,8 @@
         <!-- druid数据源驱动 -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
+            <artifactId>druid</artifactId>
+            <version>1.1.20</version>
         </dependency>
         <dependency>
             <groupId>net.dreamlu</groupId>
diff --git a/lms/nladmin-system/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/src/main/java/org/nl/AppRun.java
index a7c66f3c1..e63337706 100644
--- a/lms/nladmin-system/src/main/java/org/nl/AppRun.java
+++ b/lms/nladmin-system/src/main/java/org/nl/AppRun.java
@@ -7,6 +7,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2021/2/22 9:20:19
  */
 @EnableAsync
+@EnableCaching
 @RestController
 @EnableDynamicTp
 @SpringBootApplication(exclude = {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/controller/BstIvtCutpointivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/controller/BstIvtCutpointivtController.java
index a01c7c5ac..946b61c9d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/controller/BstIvtCutpointivtController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/controller/BstIvtCutpointivtController.java
@@ -1,20 +1,34 @@
 package org.nl.b_lms.bst.ivt.cutpointivt.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtQuery;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtVo;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.SubInfo;
+import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
+import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-import java.util.Set;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
 /**
  * @author lyd
  * @date 2024-02-26
@@ -26,17 +40,17 @@ public class BstIvtCutpointivtController {
 
     @Autowired
     private IBstIvtCutpointivtService bstIvtCutpointivtService;
+    @Autowired
+    private IPdmBiSlittingproductionplanService iPdmBiSlittingproductionplanService;
 
     @GetMapping
     @Log("查询分切区缓存点位库存")
-    //@SaCheckPermission("@el.check('bstIvtCutpointivt:list')")
     public ResponseEntity<Object> query(BstIvtCutpointivtQuery whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(bstIvtCutpointivtService.queryAll(whereJson,page)),HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增分切区缓存点位库存")
-    //@SaCheckPermission("@el.check('bstIvtCutpointivt:add')")
     public ResponseEntity
             <Object> create(@Validated @RequestBody BstIvtCutpointivt entity){
         bstIvtCutpointivtService.create(entity);
@@ -45,17 +59,77 @@ public class BstIvtCutpointivtController {
 
     @PutMapping
     @Log("修改分切区缓存点位库存")
-    //@SaCheckPermission("@el.check('bstIvtCutpointivt:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody BstIvtCutpointivt entity){
         bstIvtCutpointivtService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除分切区缓存点位库存")
-    //@SaCheckPermission("@el.check('bstIvtCutpointivt:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         bstIvtCutpointivtService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    //区域看板
+    @GetMapping("/cutBoard")
+    @SaIgnore
+    public ResponseEntity<Object> cutBoard(@RequestParam Map whereJson){
+        JSONObject param = new JSONObject(whereJson);
+        String 车间 = param.getString("product_area");
+        String 暂存架区域 = param.getString("point_type");
+        QueryWrapper<BstIvtCutpointivt> queryWrapper = new QueryWrapper<BstIvtCutpointivt>()
+                .orderByAsc("point_code").select("update_time","point_code","qzz_no1","qzz_no2","product_area","point_status","point_type");
+        if (StringUtils.isNotEmpty(车间)){
+            queryWrapper.eq("product_area", 车间);
+        }
+        if (StringUtils.isNotEmpty(暂存架区域)){
+            queryWrapper.eq("point_type", 暂存架区域);
+        }
+        List<BstIvtCutpointivt> list = bstIvtCutpointivtService.list(queryWrapper);
+        ArrayList<String> qzzs = new ArrayList<>();
+        for (BstIvtCutpointivt cutpointivt : list) {
+            String qzzNo1 = cutpointivt.getQzz_no1();
+            String qzzNo2 = cutpointivt.getQzz_no2();
+            if (StringUtils.isNotEmpty(qzzNo1)){qzzs.add(qzzNo1);};
+            if (StringUtils.isNotEmpty(qzzNo2)){qzzs.add(qzzNo2);};
+        }
+        List<PdmBiSlittingproductionplan> slit = iPdmBiSlittingproductionplanService.list(new QueryWrapper<PdmBiSlittingproductionplan>()
+                .select("qzzno","container_name", "split_breadth", "split_height", "split_weight")
+                .eq("is_delete", "0")
+                .ne("description","虚拟卷")
+                .in("qzzno", qzzs));
+        Map<String, List<PdmBiSlittingproductionplan>> slitMap = slit.stream().collect(Collectors.groupingBy(PdmBiSlittingproductionplan::getQzzno));
+        List<Object> result = new ArrayList<>();
+        for (BstIvtCutpointivt cutpointivt : list) {
+            BstIvtCutpointivtVo vo = new BstIvtCutpointivtVo();
+            vo.setQzz_no1(cutpointivt.getQzz_no1());
+            vo.setQzz_no2(cutpointivt.getQzz_no2());
+            vo.setPoint_type(cutpointivt.getPoint_type());
+            vo.setPoint_code(cutpointivt.getPoint_code());
+            vo.setPoint_status(cutpointivt.getPoint_status());
+            vo.setProduct_area(cutpointivt.getProduct_area());
+            vo.setUpdate_time(cutpointivt.getUpdate_time());
+            Map<String, List<String>> subInfo = new HashMap<>();
+            if (StringUtils.isNotEmpty(cutpointivt.getQzz_no1())){
+                List<PdmBiSlittingproductionplan> qzz1 = slitMap.get(cutpointivt.getQzz_no1());
+                if (!CollectionUtils.isEmpty(qzz1)){
+                    List<String> collect = qzz1.stream()
+                            .map(sub -> sub.getContainer_name()+"幅宽"+sub.getSplit_breadth().intValue()+"长度"+sub.getSplit_height().intValue()).collect(Collectors.toList());
+                    subInfo.put(cutpointivt.getQzz_no1(),collect);
+                }
+            }
+            if (StringUtils.isNotEmpty(cutpointivt.getQzz_no2())){
+                List<PdmBiSlittingproductionplan> qzz2 = slitMap.get(cutpointivt.getQzz_no2());
+                if (!CollectionUtils.isEmpty(qzz2)){
+                    List<String> collect = qzz2.stream()
+                            .map(sub -> sub.getContainer_name()+"幅宽"+sub.getSplit_breadth().intValue()+"长度"+sub.getSplit_height().intValue()).collect(Collectors.toList());
+                    subInfo.put(cutpointivt.getQzz_no2(),collect);
+                }
+            }
+            vo.setSubInfo(subInfo);
+            result.add(vo);
+        }
+        return new ResponseEntity<>(result,HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
index 38d0c44c4..ac3e1fd77 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
@@ -2,6 +2,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtQuery;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
 import org.nl.common.domain.query.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -93,6 +94,7 @@ public interface IBstIvtCutpointivtService extends IService<BstIvtCutpointivt> {
      * @return
      */
     List<BstIvtCutpointivt> getAreaNotTaskPointByLocationAreaAndStatus(String location);
+    List<CutpointAirShhaftDto> getAreaNotTaskPointByTcQzzPoint(String location);
 
     /**
      * 获取一半的点位
@@ -132,4 +134,8 @@ public interface IBstIvtCutpointivtService extends IService<BstIvtCutpointivt> {
      * @return /
      */
     List<BstIvtCutpointivt> getPintByAgvCodesByPointTypeAndArea(String area, List<String> types);
+
+    List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort);
+
+    List<BstIvtCutpointivt> getNBJAreaNotTaskPointByStatus(String type, String pointStatus, String area, String sort);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
index 257f2d933..0a1e42765 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
@@ -2,6 +2,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
 
 import java.util.List;
@@ -18,6 +19,8 @@ public interface BstIvtCutpointivtMapper extends BaseMapper<BstIvtCutpointivt> {
 
     List<BstIvtCutpointivt> getAreaNotTaskPointByLocationAreaAndStatus(String location);
 
+    List<CutpointAirShhaftDto> getAreaNotTaskPointByTcQzzPoint(String location);
+
     List<BstIvtCutpointivt> getAllHalfPlacePoints(String type, String pointStatus, String location);
 
     List<BstIvtCutpointivt> getCachePointSame(SlitterPlanDistinctDto dto);
@@ -25,4 +28,8 @@ public interface BstIvtCutpointivtMapper extends BaseMapper<BstIvtCutpointivt> {
     List<BstIvtCutpointivt> getReallyQzzSameDevice(String resourceName);
 
     List<BstIvtCutpointivt> getAreaNotTaskPointByStatusNotCheckPickUpCompleted(String type, String pointStatus, String area, String sort);
+
+    List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort);
+
+    List<BstIvtCutpointivt> getNBJAreaNotTaskPointByStatus(String type, String pointStatus, String area, String sort);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
index 67f068412..51dfdddc0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
@@ -15,8 +15,8 @@
                    WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
                      AND t.is_delete = '0'
                      AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code
-                              OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1
-                              OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2)
+                              OR t.point_code1 = bic.truss_point_code1 OR t.point_code2 = bic.truss_point_code1
+                              OR t.point_code1 = bic.truss_point_code2 OR t.point_code2 = bic.truss_point_code2)
                    )
         <if test="sort == '1'">
             ORDER BY bic.sort_seq ASC
@@ -40,6 +40,7 @@
           </if>
           AND bc.is_used = '1'
           AND bc.point_status = '3'
+          AND IFNULL(pp.workorder_id,'') <![CDATA[ <> ]]> ''
           AND 0 = (SELECT COUNT(*)
                    FROM sch_base_task t
                    WHERE t.task_status <![CDATA[ < ]]> '07'
@@ -136,4 +137,87 @@
             ORDER BY bic.sort_seq DESC
         </if>
     </select>
+    <select id="getNBJCanUsePoint" resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
+        SELECT bic.*
+        FROM bst_ivt_cutpointivt bic
+        WHERE bic.point_type = #{type}
+        AND bic.is_used = '1'
+        AND bic.point_status = #{pointStatus}
+        AND bic.point_location = #{area}
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status <![CDATA[ < ]]> '07'
+        AND t.is_delete = '0'
+        AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code
+        OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1
+        OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2)
+        )
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status = '071'
+        AND t.is_delete = '0'
+        AND t.point_code2 = bic.point_code
+        )
+        <if test="sort == '1'">
+            ORDER BY bic.sort_seq ASC
+        </if>
+        <if test="sort == '2'">
+            ORDER BY bic.sort_seq DESC
+        </if>
+    </select>
+    <select id="getNBJAreaNotTaskPointByStatus"
+            resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
+        SELECT bic.*
+        FROM bst_ivt_cutpointivt bic
+        WHERE bic.point_type = #{type}
+        AND bic.is_used = '1'
+        AND bic.point_status = #{pointStatus}
+        AND bic.point_location = #{area}
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
+        AND t.is_delete = '0'
+        AND (t.point_code2 = bic.point_code
+        OR t.point_code1 = bic.truss_point_code1 OR t.point_code2 = bic.truss_point_code1
+        OR t.point_code1 = bic.truss_point_code2 OR t.point_code2 = bic.truss_point_code2)
+        )
+        <if test="sort == '1'">
+            ORDER BY bic.sort_seq ASC
+        </if>
+        <if test="sort == '2'">
+            ORDER BY bic.sort_seq DESC
+        </if>
+    </select>
+    <select id="getAreaNotTaskPointByTcQzzPoint"
+            resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto">
+        SELECT  bic.ivt_id,bic.point_code,bic.qzz_no1 as qzz_no,bic.truss_point_code1 as qzz_point, p.qzz_generation, p.qzz_size
+        FROM bst_ivt_cutpointivt bic
+        LEFT JOIN pdm_bi_slittingproductionplan p ON ((p.qzzno = bic.qzz_no1 AND IFNULL(bic.qzz_no1,'') != '')
+        OR (p.qzzno = bic.qzz_no2 AND IFNULL(bic.qzz_no2,'') != ''))
+        WHERE bic.point_type = '1'
+        AND bic.is_used = '1'
+        AND bic.point_status = '3'
+        AND qzz_no1 !=''
+        AND bic.point_location = #{area}
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
+        AND t.is_delete = '0'
+        AND  (t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1))
+        UNION all
+        SELECT  bic.ivt_id,bic.point_code,bic.qzz_no2 as qzz_no,bic.truss_point_code2 as qzz_point, p.qzz_generation, p.qzz_size
+        FROM bst_ivt_cutpointivt bic
+        LEFT JOIN pdm_bi_slittingproductionplan p ON ((p.qzzno = bic.qzz_no1 AND IFNULL(bic.qzz_no1,'') != '')
+        OR (p.qzzno = bic.qzz_no2 AND IFNULL(bic.qzz_no2,'') != ''))
+        WHERE bic.point_type = '1'
+        AND bic.is_used = '1'
+        AND bic.point_location = #{area}
+        AND bic.point_status = '3'
+        AND qzz_no2 !=''
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
+        AND t.is_delete = '0'
+        AND  (t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2));
+    </select>
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/BstIvtCutpointivtVo.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/BstIvtCutpointivtVo.java
new file mode 100644
index 000000000..533ab1b0c
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/BstIvtCutpointivtVo.java
@@ -0,0 +1,20 @@
+package org.nl.b_lms.bst.ivt.cutpointivt.service.dto;
+
+import lombok.Data;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description /
+ * @author lyd
+ * @date 2024-02-26
+ **/
+@Data
+public class BstIvtCutpointivtVo extends BstIvtCutpointivt {
+    /**
+     * 气胀轴子卷信息
+     */
+    private Map<String,List<String>> subInfo;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/CutpointAirShhaftDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/CutpointAirShhaftDto.java
new file mode 100644
index 000000000..316bf1516
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/CutpointAirShhaftDto.java
@@ -0,0 +1,34 @@
+package org.nl.b_lms.bst.ivt.cutpointivt.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @description /
+ * @author lyd
+ * @date 2024-02-26
+ **/
+@Data
+public class CutpointAirShhaftDto implements Serializable {
+
+    private Long ivt_id;
+
+    private String point_code;
+
+    private String qzz_no;
+
+    private String qzz_point;
+
+    private String point_location;
+
+    private String qzz_generation;
+
+    private String qzz_size;
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/SubInfo.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/SubInfo.java
new file mode 100644
index 000000000..2a2a439f7
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dto/SubInfo.java
@@ -0,0 +1,30 @@
+package org.nl.b_lms.bst.ivt.cutpointivt.service.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @description /
+ * @author lyd
+ * @date 2024-02-26
+ **/
+@Data
+@Builder
+public class SubInfo {
+    /**
+     * 气胀轴子卷号
+     */
+   private String container_name;
+    /**
+     * 子卷幅宽
+     */
+   private Integer split_breadth;
+    /**
+     * 子卷长度
+     */
+   private Integer split_height;
+    /**
+     * 子卷重量
+     */
+   private Integer split_weight;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
index fc302a2cb..5908cdfa2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
@@ -13,6 +13,7 @@ import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.mapper.BstIvtCutpointivtMapper;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtQuery;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
 import org.nl.common.domain.query.PageQuery;
@@ -126,6 +127,11 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl<BstIvtCutpointivtM
         return bstIvtCutpointivtMapper.getAreaNotTaskPointByLocationAreaAndStatus(location);
     }
 
+    @Override
+    public List<CutpointAirShhaftDto> getAreaNotTaskPointByTcQzzPoint(String location) {
+        return bstIvtCutpointivtMapper.getAreaNotTaskPointByTcQzzPoint(location);
+    }
+
     @Override
     public List<BstIvtCutpointivt> getAllHalfPlacePoints(String type, String pointStatus, String location) {
         return bstIvtCutpointivtMapper.getAllHalfPlacePoints(type, pointStatus, location);
@@ -153,4 +159,14 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl<BstIvtCutpointivtM
                 .eq(BstIvtCutpointivt::getProduct_area, area)
                 .in(BstIvtCutpointivt::getPoint_type, types));
     }
+
+    @Override
+    public List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort) {
+        return bstIvtCutpointivtMapper.getNBJCanUsePoint(type, pointStatus, area, sort);
+    }
+
+    @Override
+    public List<BstIvtCutpointivt> getNBJAreaNotTaskPointByStatus(String type, String pointStatus, String area, String sort) {
+        return bstIvtCutpointivtMapper.getNBJAreaNotTaskPointByStatus(type, pointStatus, area, sort);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/IMdPbPapervehicleService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/IMdPbPapervehicleService.java
index 276892380..017d1ea72 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/IMdPbPapervehicleService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/IMdPbPapervehicleService.java
@@ -1,10 +1,14 @@
 package org.nl.b_lms.bst.ivt.papervehicle.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.GxQtyDto;
+import org.nl.b_lms.sch.tasks.slitter.service.impl.SlitterServiceImpl;
 import org.nl.common.domain.query.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -40,4 +44,23 @@ public interface IMdPbPapervehicleService extends IService<MdPbPapervehicle> {
     * @param ids /
     */
     void deleteAll(Set<String> ids);
+
+    /**
+     * 获取管芯
+     * @param pointLocation
+     * @param tubes
+     * @return
+     */
+    List<MdPbPapervehicle> getGXs(String pointLocation, List<String> tubes);
+
+    List<GxQtyDto> getGxPoints(String pointLocation, List<String> tubes);
+
+    Integer checkHaveTaskByPoints(List<String> pointCodes);
+
+    /**
+     * 获取对接位的所有管芯信息
+     * @param location
+     * @return
+     */
+    List<MdPbPapervehicle> getAllTubesByPoint(String location);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.java
index a206284ce..695d7ec11 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.java
@@ -2,6 +2,11 @@ package org.nl.b_lms.bst.ivt.papervehicle.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.GxQtyDto;
+import org.nl.b_lms.sch.tasks.slitter.service.impl.SlitterServiceImpl;
+
+import java.util.List;
 
 /**
 * @author lyd
@@ -9,4 +14,11 @@ import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 **/
 public interface MdPbPapervehicleMapper extends BaseMapper<MdPbPapervehicle> {
 
+    List<MdPbPapervehicle> getGXs(String pointLocation, List<String> tubes);
+
+    List<GxQtyDto> getGxPoints(String pointLocation, List<String> tubes);
+
+    Integer checkHaveTaskByPoints(List<String> pointCodes);
+
+    List<MdPbPapervehicle> getAllTubesByPoint(String location);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.xml
index 88f38812e..99a8c5987 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/mapper/MdPbPapervehicleMapper.xml
@@ -2,4 +2,72 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.b_lms.bst.ivt.papervehicle.service.dao.mapper.MdPbPapervehicleMapper">
 
+    <select id="getGXs" resultType="org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle">
+        SELECT
+        p.*
+        FROM
+        `bst_ivt_stockingivt` bs
+        LEFT JOIN md_pb_papervehicle p ON bs.vehicle_code = p.vehicle_code
+        WHERE bs.point_type = '1' AND bs.ivt_status = '1'
+        AND bs.is_used = '1' AND bs.point_location = #{pointLocation}
+        AND IFNULL(p.ivt_id,'') <![CDATA[ <> ]]> '' AND p.qty > 0
+        AND p.material_code IN
+        <foreach item="code" collection="tubes" open="(" separator="," close=")">
+            #{code}
+        </foreach>
+        AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07'
+        AND (t.point_code1 = bs.point_code OR t.point_code2 = bs.point_code) AND t.is_delete = '0')
+    </select>
+    <select id="getGxPoints" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.GxQtyDto">
+        SELECT
+            bs.point_code,
+            bs.point_type,
+            SUM( mp.qty ) AS qty
+        FROM
+            md_pb_papervehicle mp
+                LEFT JOIN bst_ivt_stockingivt bs ON bs.vehicle_code = mp.vehicle_code
+        WHERE
+            mp.material_code IN
+            <foreach item="code" collection="tubes" open="(" separator="," close=")">
+                #{code}
+            </foreach>
+          AND mp.qty > 0
+          AND bs.point_location = #{pointLocation}
+        GROUP BY bs.point_code, bs.point_type
+    </select>
+    <select id="checkHaveTaskByPoints" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            sch_base_task
+        WHERE
+            is_delete = '0'
+            AND task_status <![CDATA[ < ]]> '07'
+            AND (
+                (
+                task_type = '010807'
+                AND point_code3 IN
+                <foreach item="code" collection="pointCodes" open="(" separator="," close=")">
+                    #{code}
+                </foreach>
+                )
+                OR (
+                task_type = '010808'
+                AND point_code1 IN
+                <foreach item="code" collection="pointCodes" open="(" separator="," close=")">
+                    #{code}
+                </foreach>
+                )
+            )
+    </select>
+    <select id="getAllTubesByPoint"
+            resultType="org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle">
+        SELECT p.*
+        FROM bst_ivt_stockingivt bs
+                 LEFT JOIN md_pb_papervehicle p ON p.vehicle_code = bs.vehicle_code
+        WHERE bs.point_type = '1'
+          AND bs.point_location = #{location}
+          AND bs.is_used = '1'
+          AND p.qty > 0
+    </select>
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
index bec262a5b..c7ef3784e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
@@ -10,6 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.mapper.MdPbPapervehicleMapper;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.GxQtyDto;
+import org.nl.b_lms.sch.tasks.slitter.service.impl.SlitterServiceImpl;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
@@ -17,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -67,7 +71,8 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
         entity.setUpdate_optname(nickName);
         entity.setUpdate_time(now);
 
-        mdPbPapervehicleMapper.updateById(entity);
+        int updateFlag = mdPbPapervehicleMapper.updateById(entity);
+        log.warn("mdPbPapervehicleMapper更新结果：" +updateFlag);
     }
 
     @Override
@@ -76,4 +81,24 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
         mdPbPapervehicleMapper.deleteBatchIds(ids);
     }
 
+    @Override
+    public List<MdPbPapervehicle> getGXs(String pointLocation, List<String> tubes) {
+        return mdPbPapervehicleMapper.getGXs(pointLocation, tubes);
+    }
+
+    @Override
+    public List<GxQtyDto> getGxPoints(String pointLocation, List<String> tubes) {
+        return mdPbPapervehicleMapper.getGxPoints(pointLocation, tubes);
+    }
+
+    @Override
+    public Integer checkHaveTaskByPoints(List<String> pointCodes) {
+        return mdPbPapervehicleMapper.checkHaveTaskByPoints(pointCodes);
+    }
+
+    @Override
+    public List<MdPbPapervehicle> getAllTubesByPoint(String location) {
+        return mdPbPapervehicleMapper.getAllTubesByPoint(location);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java
index 61edd60c2..84550d7ad 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java
@@ -76,7 +76,7 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
      * @param location 位置：上半部分还是下半部分
      * @return
      */
-    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location);
+    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize ,String pointCode, String location);
 
     /**
      * 获取没任务的气涨轴缓存位
@@ -86,6 +86,14 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
      * @return
      */
     List<BstIvtShafttubeivt> getNotTaskShaftCache(String qzzSize, String specification, String location);
+    /**
+     * 获取没任务的气涨轴缓存位2
+     * @param qzzSize
+     * @param specification
+     * @param location
+     * @return
+     */
+    List<BstIvtShafttubeivt> getNotTaskShaftCache2(String qzzSize, String specification, String location);
 
     /**
      * 获取没任务的空的位置
@@ -103,4 +111,6 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
      * @return /
      */
     List<BstIvtShafttubeivt> getOtherCBJData(String pointCode, String location);
+
+    List<BstIvtShafttubeivt> getNotTaskEmptyShaftCache(String size, String qzz_generation, String location);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java
index c03347bdb..80995005c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java
@@ -14,7 +14,7 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper<BstIvtShafttubeivt>
 
     List<BstIvtShafttubeivt> getAllShaftPointsByConditions(String type, String location, String have);
 
-    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location);
+    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize ,String pointCode, String location);
 
     /**
      * 获取含有气胀轴的气胀轴暂存位
@@ -35,4 +35,19 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper<BstIvtShafttubeivt>
     List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(@Param("startPoint") BstIvtShafttubeivt startPoint);
 
     List<BstIvtShafttubeivt> getOtherCBJData(String pointCode, String location);
+
+    List<BstIvtShafttubeivt> getNotTaskEmptyShaftCache(@Param("size") String size,
+                                                       @Param("qzz_generation") String qzz_generation,
+                                                       @Param("location") String location);
+
+    /**
+     * 获取含有气胀轴的气胀轴暂存位
+     * @param qzzSize 气胀轴尺寸
+     * @param specification 标箔/锂电
+     * @param location 位置（上下）
+     * @return /
+     */
+    List<BstIvtShafttubeivt> getNotTaskShaftCache2(@Param("qzzSize") String qzzSize,
+                                                  @Param("specification") String specification,
+                                                  @Param("location") String location);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
index fef818915..8d2842d02 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
@@ -47,10 +47,10 @@
               AND b.qzz_generation = #{startPoint.qzz_generation}
           </if>
           AND b.point_location = #{startPoint.point_location}
-          AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
+          AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code AND t.is_delete = '0')
             AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6'
                 <if test="startPoint.qzz_size != 6">
-                    AND b.qzz_generation = #{startPoint.qzz_generation}
+                    AND bb.qzz_generation = #{startPoint.qzz_generation}
                 </if>
             AND bb.qzz_size = #{startPoint.qzz_size} AND bb.point_location = #{startPoint.point_location} AND bb.sort_seq > b.sort_seq)
         ORDER BY b.sort_seq ASC
@@ -64,4 +64,38 @@
         AND (IFNULL(bsf.container_name1,'') <![CDATA[ <> ]]> '' OR IFNULL(bsf.container_name2,'') <![CDATA[ <> ]]> '')
         AND point_location = #{location}
     </select>
+    <select id="getNotTaskEmptyShaftCache"
+            resultType="org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt">
+        SELECT *
+        FROM `bst_ivt_shafttubeivt` b
+        WHERE b.have_qzz = '0'
+          AND b.point_type = '6'
+          AND b.qzz_size = #{size}
+        <if test="size != 6">
+            AND b.qzz_generation = #{qzz_generation}
+        </if>
+        AND b.point_location = #{location}
+        AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
+        AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6'
+        <if test="size != 6">
+            AND bb.qzz_generation = #{qzz_generation}
+        </if>
+        AND bb.qzz_size = #{size} AND bb.point_location = #{location} AND bb.sort_seq > b.sort_seq)
+        ORDER BY b.sort_seq ASC
+    </select>
+    <select id="getNotTaskShaftCache2"
+            resultType="org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt">
+        SELECT *
+        FROM `bst_ivt_shafttubeivt` b
+        WHERE b.have_qzz = '1'
+        AND b.point_type = '6'
+        AND b.qzz_size = #{qzzSize}
+        <if test="qzzSize != 6">
+            AND b.qzz_generation = #{specification}
+        </if>
+        AND b.point_location = #{location}
+        AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code1 = b.point_code)
+        AND (b.plan <![CDATA[ <> ]]> '1' OR b.plan IS NULL)
+        ORDER BY b.sort_seq DESC
+    </select>
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
index b486b4421..03a3a67eb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
@@ -118,8 +118,8 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
     }
 
     @Override
-    public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location) {
-        return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, pointCode, location);
+    public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize ,String pointCode, String location) {
+        return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize,pointCode, location);
     }
 
     @Override
@@ -127,6 +127,11 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
         return bstIvtShafttubeivtMapper.getNotTaskShaftCache(qzzSize, specification, location);
     }
 
+    @Override
+    public List<BstIvtShafttubeivt> getNotTaskShaftCache2(String qzzSize, String specification, String location) {
+        return bstIvtShafttubeivtMapper.getNotTaskShaftCache2(qzzSize, specification, location);
+    }
+
     @Override
     public List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint) {
         return bstIvtShafttubeivtMapper.getNotTaskShaftCacheEmpty(startPoint);
@@ -149,4 +154,9 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
         return bstIvtShafttubeivtMapper.getOtherCBJData(pointCode, location);
     }
 
+    @Override
+    public List<BstIvtShafttubeivt> getNotTaskEmptyShaftCache(String size, String qzz_generation,String location) {
+        return bstIvtShafttubeivtMapper.getNotTaskEmptyShaftCache(size, qzz_generation, location);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java
index c9f0a05cb..8a194adae 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java
@@ -67,5 +67,24 @@ public class BstIvtStockingivtController {
         return new ResponseEntity<>(bstIvtStockingivtService.operateIvt(param), HttpStatus.OK);
     }
 
+    @Log("管芯托盘库存")
+    //@SaCheckPermission("@el.check('bstIvtStockingivt:del')")
+    @PostMapping("/showDetail")
+    public ResponseEntity<Object> showDetail(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(bstIvtStockingivtService.showDetail(param), HttpStatus.OK);
+    }
+
+    @Log("管芯托盘库存")
+    @GetMapping("/showDetail2")
+    public ResponseEntity<Object> showDetail2(@RequestParam Map param) {
+        return new ResponseEntity<>(bstIvtStockingivtService.showDetail2(param), HttpStatus.OK);
+    }
+
+    @Log("查询bom记录")
+    @GetMapping("/showBom2")
+    public ResponseEntity<Object> showBom2(@RequestParam Map param) {
+        return new ResponseEntity<>(bstIvtStockingivtService.showBom2(param), HttpStatus.OK);
+    }
+
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java
index d87e371b8..b987f4fff 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java
@@ -2,9 +2,14 @@ package org.nl.b_lms.bst.ivt.stockingivt.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo;
+import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
+import org.nl.common.domain.query.PageQuery;
 
 import java.util.List;
 import java.util.Map;
@@ -78,4 +83,27 @@ public interface IBstIvtStockingivtService extends IService<BstIvtStockingivt> {
     BstIvtStockingivt getCanMovePointOne(String location, String pointType);
 
     JSONObject operateIvt(JSONObject jsonObject) ;
+
+    /**
+     * 分组聚合获取需要管芯的托盘位置
+     * @param pointType
+     * @param tube
+     * @param location
+     * @return
+     */
+    List<BhTubePointDto> getNeedPaperTubePoint(String pointType, String tube, String location);
+
+    /**
+     * 获取3个托盘的数据
+     * @param location
+     * @param pointType
+     * @return
+     */
+    List<BhTubeMovePointDto> getCanMovePointList(String location, String pointType);
+
+    List<List<ShowStockVo>> showDetail(JSONObject param);
+
+    List<MdPbPapervehicle> showDetail2(Map param);
+
+    PdmBiOrderbominfo showBom2(Map param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.java
index 49eaa768d..42edf4d39 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.java
@@ -2,6 +2,8 @@ package org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
 
 import java.util.List;
 
@@ -29,4 +31,15 @@ public interface BstIvtStockingivtMapper extends BaseMapper<BstIvtStockingivt> {
     List<BstIvtStockingivt> getEmptyPointNotTask(String location, String pointType);
 
     BstIvtStockingivt getCanMovePointOne(String location, String pointType);
+
+    /**
+     * 分组聚合获取备货区中数量够用的的货位
+     * @param pointType 类型：0暂存位置，1靠近分切机
+     * @param tube 纸管号 两个都是一样的，因此拿一个就行
+     * @param location 位置：0上区域，1下区域
+     * @return /
+     */
+    List<BhTubePointDto> getNeedPaperTubePoint(String pointType, String tube, String location);
+
+    List<BhTubeMovePointDto> getCanMovePointList(String location, String pointType);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.xml
index 41faca610..baaa70bff 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dao/mapper/BstIvtStockingivtMapper.xml
@@ -12,7 +12,7 @@
           AND bs.ivt_status = '1'
           AND bs.is_used = '1'
           AND mp.material_code = #{tube}
-          AND mp.qty <![CDATA[ >= ]]> #{qty}
+          AND mp.qty <![CDATA[ > ]]> #{qty}
           AND 0 = (SELECT COUNT(*)
                    FROM sch_base_task t
                    WHERE (t.point_code1 = bs.point_code OR t.point_code2 = bs.point_code OR
@@ -48,4 +48,46 @@
                      AND t.task_status <![CDATA[ < ]]> '07')
         ORDER BY bs.ivt_status, mp.qty LIMIT 1
     </select>
+    <select id="getNeedPaperTubePoint" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto">
+        SELECT bs.point_code,
+               MAX(bs.vehicle_code) AS vehicle_code,
+               SUM(mp.qty)          AS qty
+        FROM `bst_ivt_stockingivt` bs
+                 LEFT JOIN
+             md_pb_papervehicle mp
+             ON mp.vehicle_code = bs.vehicle_code
+        WHERE bs.point_location = #{location}
+          AND bs.point_type = #{pointType}
+          AND bs.ivt_status = '1'
+          AND bs.is_used = '1'
+          AND mp.material_code = #{tube}
+          AND 0 = (SELECT COUNT(*)
+                   FROM sch_base_task t
+                   WHERE (t.point_code1 = bs.point_code OR t.point_code2 = bs.point_code OR
+                          t.point_code3 = bs.point_code)
+                     AND t.task_status <![CDATA[ < ]]> '07')
+        GROUP BY bs.point_code;
+    </select>
+    <select id="getCanMovePointList" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto">
+        SELECT bs.point_code,
+               MAX(bs.vehicle_code)   AS vehicle_code,
+               MAX(bs.ivt_status)     AS ivt_status,
+               IFNULL(SUM(mp.qty), 0) AS qty
+        FROM `bst_ivt_stockingivt` bs
+                 LEFT JOIN
+             md_pb_papervehicle mp
+             ON mp.vehicle_code = bs.vehicle_code
+        WHERE bs.point_type = #{pointType}
+          AND bs.point_location = #{location}
+          AND bs.is_used = '1'
+          AND 0 = (SELECT COUNT(*)
+                   FROM sch_base_task t
+                   WHERE (t.point_code1 = bs.point_code
+                       OR t.point_code2 = bs.point_code
+                       OR t.point_code3 = bs.point_code)
+                     AND t.task_status <![CDATA[ < ]]> '07')
+        GROUP BY bs.point_code
+        ORDER BY ivt_status ASC,
+                 qty ASC;
+    </select>
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dto/ShowStockVo.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dto/ShowStockVo.java
new file mode 100644
index 000000000..2a53896fe
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/dto/ShowStockVo.java
@@ -0,0 +1,20 @@
+package org.nl.b_lms.bst.ivt.stockingivt.service.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/3/20
+ */
+@Data
+public class ShowStockVo {
+    /**
+     * 0: 空， 1：空位，2：管芯
+     */
+    private String have_qzz;
+
+    /**
+     * 管芯信息
+     */
+    private String tube;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
index f831eeb14..19b40105c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
@@ -2,32 +2,35 @@ package org.nl.b_lms.bst.ivt.stockingivt.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
+import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
+import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
+import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo;
+import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
+import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService;
 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.mapper.dto.BhTubeMovePointDto;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
 import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
-import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
-import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
-import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.service.MaterialbaseService;
 import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,11 +49,15 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
     @Autowired
     private BstIvtStockingivtMapper bstIvtStockingivtMapper;
     @Autowired
-    private IMdPbPapervehicleService PapervehicleService;
+    private IMdPbPapervehicleService papervehicleService;
     @Autowired
     private WmsToAcsService wmsToAcsService;
     @Autowired
     private MaterialbaseService materialbaseService;
+    @Autowired
+    private IPdmBiOrderbominfoService pdmBiOrderbominfoService;
+    @Autowired
+    private IBstIvtStockingivtService stockingivtService;
 
     @Override
     public IPage<BstIvtStockingivt> queryAll(Map whereJson, PageQuery page) {
@@ -121,32 +128,38 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
     }
 
     public static void main(String[] args) {
-        List<String> lines = new ArrayList<>();
-        lines.add("纸制简管|纸管|6英寸|1300");
-        lines.add("纸制简管|纸管|3英寸|12|650");
-        lines.add("玻璃纤维及其制品|FRP管|6英寸|15-20|1700|阶梯");
-        lines.add("玻璃纤维及其制品|FRP管|6英寸|15|1700|高强");
-        // 定义正则表达式，去除最后的中文部分
-        String regex = "\\|[\\u4e00-\\u9fa5]+$";
-
-        // 处理每一行数据
-        List<String> cleanedLines = new ArrayList<>();
-        for (String line : lines) {
-            cleanedLines.add(line.replaceAll(regex, ""));
-        }
-
-        // 打印结果
-        for (String cleanedLine : cleanedLines) {
-            System.out.println(cleanedLine);
-        }
+//        List<String> lines = new ArrayList<>();
+//        lines.add("纸制简管|纸管|6英寸|1300");
+//        lines.add("纸制简管|纸管|3英寸|12|650");
+//        lines.add("玻璃纤维及其制品|FRP管|6英寸|15-20|1700|阶梯");
+//        lines.add("玻璃纤维及其制品|FRP管|6英寸|15|1700|高强");
+//        // 定义正则表达式，去除最后的中文部分
+//        String regex = "\\|[\\u4e00-\\u9fa5]+$";
+//
+//        // 处理每一行数据
+//        List<String> cleanedLines = new ArrayList<>();
+//        for (String line : lines) {
+//            cleanedLines.add(line.replaceAll(regex, ""));
+//        }
+//
+//        // 打印结果
+//        for (String cleanedLine : cleanedLines) {
+//            System.out.println(cleanedLine);
+//        }
+        String material_name = "玻璃纤维及其制品|FRP管|6英寸|15-20|1100|阶梯";
+        String[] tubeArray = material_name.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|");
+        System.out.println(tubeArray);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public JSONObject operateIvt(JSONObject jsonObject) {
+        log.info("手持操作管芯托盘 - {}", jsonObject);
         String vehicle_code = jsonObject.getString("vehicle_code");
         String row_num = jsonObject.getString("row_num");
         String material_code = jsonObject.getString("material_code");
-
+        String point_code = jsonObject.getString("point_code");
+        Integer now_qty = jsonObject.getInteger("qty");
 
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
@@ -155,12 +168,26 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
         //1-绑定；2-清除
         String type = jsonObject.getString("type");
         if (type.equals("1")) {
+            //校验数据
+            BstIvtStockingivt pointByCode = stockingivtService.getPointByCode(point_code, true);
+            if (ObjectUtil.isEmpty(pointByCode)) {
+                throw new BadRequestException("点位 [" + point_code + "] 不存在或者已被禁用！");
+            }
+            if (ObjectUtil.isEmpty(vehicle_code)) {
+                throw new BadRequestException("托盘信息不能为空！");
+            }
+            if(!vehicle_code.contains("GX")){
+                throw new BadRequestException("请扫描或输入正确的托盘码！");
+            }
+            if(now_qty<=0 || now_qty>5){
+                throw new BadRequestException("数量只允许输入1-5");
+            }
             //
             MaterialbaseDto mater = materialbaseService.findByCode(material_code);
             String material_name = mater.getMaterial_name();
 
             //查询当前载具和排是否存在库存
-            MdPbPapervehicle papervehicle = PapervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
+            MdPbPapervehicle papervehicle = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
                     .eq(MdPbPapervehicle::getRow_num, row_num));
             if (ObjectUtil.isNotEmpty(papervehicle) && !papervehicle.getMaterial_code().equals(material_code)) {
                 throw new BadRequestException("当前排物料为【" + papervehicle.getMaterial_code() + "】，与绑定的物料不同，如需要请先清除库存，再进行绑定！");
@@ -177,42 +204,42 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
             if (num == 1) {
                 //只判断第二排的纸管长度
                 int nextNum = num + 1;
-                MdPbPapervehicle nextPaper = PapervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
+                MdPbPapervehicle nextPaper = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
                         .eq(MdPbPapervehicle::getRow_num, nextNum));
                 if (ObjectUtil.isNotEmpty(nextPaper)) {
                     //获取第二排的纸管高度和纸管类型
                     String nextMaterialName = nextPaper.getMaterial_name();
-                    String[] nextArray = nextMaterialName.split("\\|");
+                    String[] nextArray = nextMaterialName.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|");
                     int nextLength = Integer.parseInt(nextArray[nextArray.length - 1]);
-                    if (Math.abs(nextLength - currLength) <= 50) {
+                    if (Math.abs(nextLength - currLength) <= 50 && !material_code.equals(nextPaper.getMaterial_code())) {
                         throw new BadRequestException("相邻排的纸管高度差要大于等于50MM！");
                     }
                 }
             } else {
                 //判断后一排的纸管高度
                 int nextNum = num + 1;
-                MdPbPapervehicle nextPaper = PapervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
+                MdPbPapervehicle nextPaper = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
                         .eq(MdPbPapervehicle::getRow_num, nextNum));
                 if (ObjectUtil.isNotEmpty(nextPaper)) {
                     //获取后一排的纸管高度和纸管类型
                     String nextMaterialName = nextPaper.getMaterial_name();
-                    String[] nextArray = nextMaterialName.split("\\|");
+                    String[] nextArray = nextMaterialName.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|");
                     int nextLength = Integer.parseInt(nextArray[nextArray.length - 1]);
-                    if (Math.abs(nextLength - currLength) <= 50) {
+                    if (Math.abs(nextLength - currLength) <= 50 && !material_code.equals(nextPaper.getMaterial_code())) {
                         throw new BadRequestException("相邻排的纸管高度差要大于等于50MM！");
                     }
                 }
 
                 //判断前一排的纸管高度
                 int preNum = num - 1;
-                MdPbPapervehicle prePaper = PapervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
+                MdPbPapervehicle prePaper = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
                         .eq(MdPbPapervehicle::getRow_num, preNum));
                 if (ObjectUtil.isNotEmpty(prePaper)) {
                     //获取后一排的纸管高度和纸管类型
                     String preMaterialName = prePaper.getMaterial_name();
-                    String[] preArray = preMaterialName.split("\\|");
+                    String[] preArray = preMaterialName.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|");
                     int preLength = Integer.parseInt(preArray[preArray.length - 1]);
-                    if (Math.abs(preLength - currLength) <= 50) {
+                    if (Math.abs(preLength - currLength) <= 50 && !material_code.equals(prePaper.getMaterial_code())) {
                         throw new BadRequestException("相邻排的纸管高度差要大于等于50MM！");
                     }
                 }
@@ -224,7 +251,7 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
                 papervehicle.setUpdate_optid(currentUserId);
                 papervehicle.setUpdate_optname(nickName);
                 papervehicle.setUpdate_time(now);
-                PapervehicleService.updateById(papervehicle);
+                papervehicleService.updateById(papervehicle);
             } else {
                 papervehicle = new MdPbPapervehicle();
                 papervehicle.setIvt_id(IdUtil.getSnowflake(1, 1).nextIdStr());
@@ -236,20 +263,37 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
                 papervehicle.setUpdate_optid(currentUserId);
                 papervehicle.setUpdate_optname(nickName);
                 papervehicle.setUpdate_time(now);
-                PapervehicleService.save(papervehicle);
+                papervehicleService.save(papervehicle);
             }
-
+            // 插入托盘数据到点位
+            // 检查托盘号是不是在其他点位上
+            List<BstIvtStockingivt> stockingivts = bstIvtStockingivtMapper.selectList(new LambdaQueryWrapper<BstIvtStockingivt>()
+                    .eq(BstIvtStockingivt::getVehicle_code, vehicle_code)
+                    .ne(BstIvtStockingivt::getPoint_code, point_code));
+            if (stockingivts.size() > 1) {
+                throw new BadRequestException("该托盘绑定了多个位置！");
+            }
+            if (stockingivts.size() > 0) {
+                BstIvtStockingivt bstIvtStockingivt = stockingivts.get(0);
+                bstIvtStockingivt.setVehicle_code("");
+                bstIvtStockingivtMapper.updateById(bstIvtStockingivt);
+            }
+            BstIvtStockingivt currentStock = bstIvtStockingivtMapper.selectOne(new LambdaQueryWrapper<BstIvtStockingivt>()
+                    .eq(BstIvtStockingivt::getPoint_code, point_code));
+            currentStock.setVehicle_code(vehicle_code);
+            currentStock.setIvt_status("1");
+            bstIvtStockingivtMapper.updateById(currentStock);
         }
 
         if (type.equals("2")) {
-            PapervehicleService.remove(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
+            papervehicleService.remove(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
                     .eq(MdPbPapervehicle::getRow_num, row_num));
         }
 
         //判断绑定的纸管是否在机械手范围内，如果存在的话把最新库存推送给电气
         BstIvtStockingivt bstIvtStockingivt = bstIvtStockingivtMapper.selectOne(new LambdaQueryWrapper<BstIvtStockingivt>().eq(BstIvtStockingivt::getVehicle_code, vehicle_code));
         if (bstIvtStockingivt != null && bstIvtStockingivt.getPoint_type().equals("1")) {
-            List<MdPbPapervehicle> list = PapervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code));
+            List<MdPbPapervehicle> list = papervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code));
             JSONObject jo = new JSONObject();
             SlitterTaskUtil.doSavePaperInfos(list, jo);
             jo.put("product_area", bstIvtStockingivt.getProduct_area());
@@ -262,4 +306,77 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
         result.put("message", "操作成功!");
         return result;
     }
+
+    @Override
+    public List<BhTubePointDto> getNeedPaperTubePoint(String pointType, String tube, String location) {
+        return bstIvtStockingivtMapper.getNeedPaperTubePoint(pointType, tube, location);
+    }
+
+    @Override
+    public List<BhTubeMovePointDto> getCanMovePointList(String location, String pointType) {
+        return bstIvtStockingivtMapper.getCanMovePointList(location, pointType);
+    }
+
+    @Override
+    public List<List<ShowStockVo>> showDetail(JSONObject param) {
+        List<List<ShowStockVo>> res = new ArrayList<>();
+        // vehicle_code
+        String vehicleCode = param.getString("vehicle_code");
+        if (ObjectUtil.isEmpty(vehicleCode)) {
+            // 5*5的0
+            for (int i = 0; i < 5; i++) {
+                List<ShowStockVo> list = new ArrayList<>();
+                for (int j = 0; j < 5; j++) {
+                    ShowStockVo one = new ShowStockVo();
+                    one.setHave_qzz("0");
+                    one.setTube("-");
+                    list.add(one);
+                }
+                res.add(list);
+            }
+        } else {
+            // 获取数据
+            List<MdPbPapervehicle> papers = papervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>()
+                    .eq(MdPbPapervehicle::getVehicle_code, vehicleCode)
+                    .orderByAsc(MdPbPapervehicle::getRow_num));
+            // 初始化 5*5的1
+            for (int i = 0; i < 5; i++) {
+                // 获取对应排的数据
+                int index = i;
+                MdPbPapervehicle mdPbPapervehicle = papers.stream().filter(p -> p.getRow_num().equals(index + 1)).findFirst().orElse(null);
+                int indexJ = mdPbPapervehicle == null ? 0 : mdPbPapervehicle.getQty().intValue();
+                List<ShowStockVo> list = new ArrayList<>();
+                for (int j = 0; j < 5; j++) {
+                    ShowStockVo one = new ShowStockVo();
+                    one.setHave_qzz("1");
+                    one.setTube("-");
+                    if (j < indexJ && indexJ != 0) {
+                        one.setHave_qzz("2");
+                        one.setTube(mdPbPapervehicle.getMaterial_name());
+                    }
+                    list.add(one);
+                }
+                res.add(list);
+            }
+
+        }
+        return res;
+    }
+
+    @Override
+    public List<MdPbPapervehicle> showDetail2(Map whereJson) {
+        // 获取数据
+        List<MdPbPapervehicle> papers = papervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>()
+                .eq(MdPbPapervehicle::getVehicle_code, whereJson.get("vehicle_code"))
+                .orderByAsc(MdPbPapervehicle::getRow_num));
+        return papers;
+    }
+    @Override
+    public PdmBiOrderbominfo showBom2(Map param){
+        String  mfg_order_name = String.valueOf(param.get("mfg_order_name"));
+        LambdaQueryWrapper<PdmBiOrderbominfo> lam = new LambdaQueryWrapper<>();
+        lam.eq(PdmBiOrderbominfo::getMfgOrder,mfg_order_name);
+        PdmBiOrderbominfo order = pdmBiOrderbominfoService.getOne(lam);
+        return order;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
index f3c5c7786..bb42a7cb1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
@@ -83,4 +83,11 @@ public class ProductOutTwoController {
         return new ResponseEntity<>(TableDataInfo.build(productOutTwoService.woodenBoxPoint(whereJson)), HttpStatus.OK);
     }
 
+    @PostMapping("/boxOut")
+    @Log("木箱出库")
+    @SaIgnore
+    public ResponseEntity<Object> boxOut(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(productOutTwoService.boxOut(whereJson),HttpStatus.OK);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
index b318642a6..e6601d2ec 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
@@ -8,10 +8,7 @@ import org.nl.modules.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-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 org.springframework.web.bind.annotation.*;
 
 /**
  * @Author: lyd
@@ -24,87 +21,100 @@ import org.springframework.web.bind.annotation.RestController;
 public class SlitterPdaController {
 
     @Autowired
-    private SlitterService slitterDevices;
+    private SlitterService slitterService;
 
     @PostMapping("/slitterDevices")
     @Log("获取分切设备")
     @SaIgnore
     public ResponseEntity<Object> slitterDevices(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.slitterDevices(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.slitterDevices(param), HttpStatus.OK);
     }
 
     @PostMapping("/downRolls")
     @Log("下卷")
     @SaIgnore
     public ResponseEntity<Object> downRolls(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.downRolls(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.downRolls(param), HttpStatus.OK);
+    }
+
+    @PostMapping("/downRolls2")
+    @Log("下卷2")
+    @SaIgnore
+    public ResponseEntity<Object> downRolls2(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.downRolls2(param), HttpStatus.OK);
+    }
+    @PostMapping("/downRollsCheck")
+    @Log("下卷2提示确认")
+    @SaIgnore
+    public ResponseEntity<Object> downRollsCheck(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.downRollsCheck(param), HttpStatus.OK);
     }
 
     @PostMapping("/moveVehicle")
     @Log("搬运废箔斗")
     @SaIgnore
     public ResponseEntity<Object> moveVehicle(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.moveVehicle(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.moveVehicle(param), HttpStatus.OK);
     }
 
     @PostMapping("/getShaftPoint")
     @Log("获取套拔轴下拉框数据")
     @SaIgnore
     public ResponseEntity<Object> getShaftPoint() {
-        return new ResponseEntity<>(slitterDevices.getShaftPoint(), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.getShaftPoint(), HttpStatus.OK);
     }
 
     @PostMapping("/doInitShaftPoint")
     @Log("初始化套拔轴点位")
     @SaIgnore
     public ResponseEntity<Object> doInitShaftPoint(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doInitShaftPoint(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doInitShaftPoint(param), HttpStatus.OK);
     }
 
     @PostMapping("/cutIn")
     @Log("分切母卷上料")
     @SaIgnore
     public ResponseEntity<Object> cutIn(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.cutIn(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.cutIn(param), HttpStatus.OK);
     }
     @PostMapping("/sendSubVolumeToNBJ")
     @Log("分切缓存到内包间任务")
     @SaIgnore
     public ResponseEntity<Object> sendSubVolumeToNBJ(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.pdaSendSubVolumeToNBJ(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.pdaSendSubVolumeToNBJ(param), HttpStatus.OK);
     }
     @PostMapping("/markingFoilSlittingToCache")
     @Log("标箔分切下料AGV任务")
     @SaIgnore
     public ResponseEntity<Object> markingFoilSlittingToCache(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.markingFoilSlittingToCache(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.markingFoilSlittingToCache(param), HttpStatus.OK);
     }
     @PostMapping("/getCutCacheAgvPoints")
     @Log("获取分切暂存位AGV点位下拉框数据")
     @SaIgnore
     public ResponseEntity<Object> getCutCacheAgvPoints(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.getCutCacheAgvPoints(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.getCutCacheAgvPoints(param), HttpStatus.OK);
     }
 
     @PostMapping("/toCleanCutCacheInventory")
     @Log("清理分切缓存")
     @SaIgnore
     public ResponseEntity<Object> toCleanCutCacheInventory(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.toCleanCutCacheInventory(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.toCleanCutCacheInventory(param), HttpStatus.OK);
     }
 
     @PostMapping("/toSubvolumeBinding")
     @Log("子卷绑定")
     @SaIgnore
     public ResponseEntity<Object> toSubvolumeBinding(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.toSubvolumeBinding(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.toSubvolumeBinding(param), HttpStatus.OK);
     }
 
     @PostMapping("/shaftMaintenanceInventory")
     @Log("气胀轴库维护库存")
     @SaIgnore
     public ResponseEntity<Object> shaftMaintenanceInventory(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.shaftMaintenanceInventory(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.shaftMaintenanceInventory(param), HttpStatus.OK);
     }
 
 
@@ -112,92 +122,130 @@ public class SlitterPdaController {
     @Log("气胀轴绑定")
     @SaIgnore
     public ResponseEntity<Object> toShaftBinding(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.toShaftBinding(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.toShaftBinding(param), HttpStatus.OK);
     }
 
     @PostMapping("/querySlitterSubVolumeInfo")
     @Log("查询分切机上的子卷信息")
     @SaIgnore
     public ResponseEntity<Object> querySlitterSubVolumeInfo(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.querySlitterSubVolumeInfo(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.querySlitterSubVolumeInfo(param), HttpStatus.OK);
     }
     @PostMapping("/bindSlitterSubVolumeInfo")
     @Log("绑定分切机上的子卷信息")
     @SaIgnore
     public ResponseEntity<Object> bindSlitterSubVolumeInfo(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.bindSlitterSubVolumeInfo(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.bindSlitterSubVolumeInfo(param), HttpStatus.OK);
     }
     @PostMapping("/unBindSlitterSubVolumeInfo")
     @Log("接绑分切机上的子卷信息")
     @SaIgnore
     public ResponseEntity<Object> unBindSlitterSubVolumeInfo(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.unBindSlitterSubVolumeInfo(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.unBindSlitterSubVolumeInfo(param), HttpStatus.OK);
     }
     @PostMapping("/querySlitterDeviceSubVolumeInfos")
     @Log("查询手持查询设备对应的子卷数据")
     @SaIgnore
     public ResponseEntity<Object> querySlitterDeviceSubVolumeInfos(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.querySlitterDeviceSubVolumeInfos(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.querySlitterDeviceSubVolumeInfos(param), HttpStatus.OK);
     }
     @PostMapping("/queryCacheDownSubVolumeInfos")
     @Log("手持查询暂存位置的子卷数据")
     @SaIgnore
     public ResponseEntity<Object> queryCacheDownSubVolumeInfos(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.queryCacheDownSubVolumeInfos(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.queryCacheDownSubVolumeInfos(param), HttpStatus.OK);
     }
     @PostMapping("/doStockAreaBinding")
     @Log("手持备货区绑定")
     @SaIgnore
     public ResponseEntity<Object> doStockAreaBinding(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doStockAreaBinding(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doStockAreaBinding(param), HttpStatus.OK);
     }
     @PostMapping("/doStockAreaUnbinding")
     @Log("手持备货区解除绑定")
     @SaIgnore
     public ResponseEntity<Object> doStockAreaUnbinding(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doStockAreaUnbinding(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doStockAreaUnbinding(param), HttpStatus.OK);
     }
     @PostMapping("/doSubRollWeightBinding")
     @Log("手持子卷重量绑定")
     @SaIgnore
     public ResponseEntity<Object> doSubRollWeightBinding(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doSubRollWeightBinding(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doSubRollWeightBinding(param), HttpStatus.OK);
     }
     @PostMapping("/doSubRollWeightBindingTip")
     @Log("手持子卷重量绑定提示")
     @SaIgnore
     public ResponseEntity<Object> doSubRollWeightBindingTip(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doSubRollWeightBindingTip(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doSubRollWeightBindingTip(param), HttpStatus.OK);
     }
     @PostMapping("/doUpShaftToSlitter")
     @Log("手持分切机上气胀轴")
     @SaIgnore
     public ResponseEntity<Object> doUpShaftToSlitter(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doUpShaftToSlitter(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doUpShaftToSlitter(param), HttpStatus.OK);
     }
     @PostMapping("/doUpShaftToSlitterByDevice")
     @Log("手持分切机上气胀轴2")
     @SaIgnore
     public ResponseEntity<Object> doUpShaftToSlitterByDevice(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doUpShaftToSlitterByDevice(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doUpShaftToSlitterByDevice(param), HttpStatus.OK);
     }
     @PostMapping("/doUpShaftToSlitterByDeviceTip")
     @Log("手持分切机上气胀轴提示")
     @SaIgnore
     public ResponseEntity<Object> doUpShaftToSlitterByDeviceTip(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.doUpShaftToSlitterByDeviceTip(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.doUpShaftToSlitterByDeviceTip(param), HttpStatus.OK);
     }
     @PostMapping("/getUpShaftTip")
     @Log("手持分切机上气胀轴-查询信息")
     @SaIgnore
     public ResponseEntity<Object> getUpShaftTip(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.getUpShaftTip(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.getUpShaftTip(param), HttpStatus.OK);
     }
 
     @PostMapping("/forcedFeedShaft")
     @Log("强制送轴")
     @SaIgnore
     public ResponseEntity<Object> forcedFeedShaft(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(slitterDevices.forcedFeedShaft(param), HttpStatus.OK);
+        return new ResponseEntity<>(slitterService.forcedFeedShaft(param), HttpStatus.OK);
+    }
+    @PostMapping("/showManualView")
+    @Log("送轴情况")
+    @SaIgnore
+    public ResponseEntity<Object> showManualView(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.showManualView(param), HttpStatus.OK);
+    }
+    @PostMapping("/urgentPlan")
+    @Log("加急送轴")
+    @SaIgnore
+    public ResponseEntity<Object> urgentPlan(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.urgentPlan(param), HttpStatus.OK);
+    }
+    @PostMapping("/rollCacheManage")
+    @Log("母卷暂存架子管理")
+    @SaIgnore
+    public ResponseEntity<Object> rollCacheManage(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.rollCacheManage(param), HttpStatus.OK);
+    }
+    @PostMapping("/rollCacheManageTip")
+    @Log("母卷暂存架子管理提示")
+    @SaIgnore
+    public ResponseEntity<Object> rollCacheManageTip(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.rollCacheManageTip(param), HttpStatus.OK);
+    }
+
+    @PostMapping("/downBait")
+    @Log("饵料下卷")
+    @SaIgnore
+    public ResponseEntity<Object> downBait(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(slitterService.downBait(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/returnShaft")
+    @Log("空轴送回")
+    @SaIgnore
+    public ResponseEntity<Object> returnShaft(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterService.returnShaft(param), HttpStatus.OK);
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
index a22ba2469..0dabf07cc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.pda.service.VehicleTwoService;
+import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.modules.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * @author liuxy
@@ -29,8 +31,10 @@ public class VehicleTwoController {
     @Autowired
     private VehicleTwoService vehicleTwoService;
 
-    @Resource
+    @Autowired
     private IbstIvtPackageinfoivtService bstIvtPackageInfoIvtService;
+    @Autowired
+    private IpdmBiSubpackagerelationService subpackagerelationService;
 
 
     @PostMapping("/vehicleIn")
@@ -69,4 +73,11 @@ public class VehicleTwoController {
         return new ResponseEntity<>(bstIvtPackageInfoIvtService.update(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/toEndSub")
+    @Log("二期子卷包装解绑")
+    @SaIgnore
+    public ResponseEntity<Object> toEndSub(@RequestBody JSONObject whereJson) {
+        Map result = subpackagerelationService.toEndSubpackagerelation(whereJson.getString("container_name"));
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
index d6e1824aa..59ed6c3ef 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
@@ -84,4 +84,10 @@ public interface ProductOutTwoService {
      */
     List<JSONObject> woodenBoxPoint(JSONObject whereJson);
 
+    /**
+     * 要出库的木箱明细
+     * @param whereJson 、
+     * @return 、
+     */
+    JSONObject boxOut(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
index 0c0d53299..7136e178f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
@@ -13,11 +13,13 @@ import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound;
 import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pda.st.service.impl.ProductionOutServiceImpl;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +48,9 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService {
     @Autowired
     private IPdmBiOrderbominfoService iPdmBiOrderbominfoService;
 
+    @Autowired
+    private OutBoxManageService outBoxManageService;
+
 
     @Override
     public JSONObject ivtQuery(JSONObject whereJson) {
@@ -190,4 +195,24 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService {
         }
         return null;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject boxOut(JSONObject whereJson) {
+        // 判断当前是否有正在出库的空托盘任务
+        JSONArray resultJSONArray = WQLObject.getWQLObject("sch_base_task")
+                .query("task_type = '010706' and task_status < '" + TaskStatusEnum.FINISHED.getCode() + "' and is_delete = '0'")
+                .getResultJSONArray(0);
+
+        if (ObjectUtil.isNotEmpty(resultJSONArray)) {
+            throw new BadRequestException("当前正在执行空托盘出库任务，请稍后再出库!");
+        }
+
+        List<JSONObject> data = whereJson.getJSONArray("data").toJavaList(JSONObject.class);
+        outBoxManageService.publicBoxOut(data);
+
+        JSONObject result = new JSONObject();
+        result.put("message", "下发出库成功!");
+        return result;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java
index 33e027036..bbefbee98 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java
@@ -7,8 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pda.service.VehicleTwoService;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
+import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService;
+import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl;
 import org.nl.b_lms.sch.point.dao.SchBasePoint;
 import org.nl.b_lms.sch.point.service.IschBasePointService;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.TwoInEmpExcepTask;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
@@ -16,13 +21,25 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBoxManageService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBussManageService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InVehicleManageService;
+import org.nl.common.enums.SpecEnum;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.system.service.param.dao.Param;
+import org.nl.system.service.param.impl.SysParamServiceImpl;
+import org.nl.wms.basedata.st.service.StructattrService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.ext.mes.service.LmsToMesService;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -32,7 +49,7 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
      * 入空载具服务
      */
     @Autowired
-    private InVehicleManageService inVehicleManageService;
+    private IschBaseTaskService ischBaseTaskService;
 
     /**
      * 入空木箱服务
@@ -62,6 +79,8 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
 
     @Autowired
     private InBussManageService inBussManageService;
+    @Autowired
+    private IPdmBiContainerinboundService iPdmBiContainerinboundService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -163,7 +182,12 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
     @Override
     public JSONObject boxIn(JSONObject whereJson) {
         // 调用接口
-        inBoxManageService.boxBinVehicle(whereJson);
+        String startCode = whereJson.getString("point_code");
+        if ("MXRKW1".equals(startCode)){
+            inBoxManageService.boxBinVehicle(whereJson);
+        }else if ("THRKDJW1".equals(startCode)){
+            inBoxManageService.boxBinVehicleByTHRK(whereJson);
+        }
         JSONObject result = new JSONObject();
         result.put("message", "入库成功!");
         return result;
@@ -178,6 +202,19 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
         return result;
     }
 
+    public static void main(String[] args) {
+        ArrayList<String> msg = new ArrayList<>();
+//        msg.add("称重562不匹配564");
+        msg.add("手动至异常口");
+        System.out.println(msg.toString());
+        System.out.println(JSONObject.toJSONString(msg));
+        String a = JSONObject.toJSONString(msg);
+        List<String> list = JSONObject.parseObject(a, List.class);
+        Optional<String> 称重 = list.stream().filter(m -> m.contains("称重")).findAny();
+        if (称重.isPresent()){
+            System.out.println(称重.get());
+        }
+    }
     @Override
     @Transactional(rollbackFor = Exception.class)
     public JSONObject reback(JSONObject whereJson) {
@@ -186,6 +223,29 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
         String bill_type = whereJson.getString("bill_type");
         whereJson.put("material_barcode", whereJson.getString("box_no"));
         whereJson.put("device_code", whereJson.getString("point_code"));
+        if ("RK1002".equals(whereJson.getString("point_code"))){
+            List<SchBaseTask> list = ischBaseTaskService.list(new QueryWrapper<SchBaseTask>()
+                    .select("task_id")
+                    .eq("point_code2", "RK1004")
+                    .eq("task_type", "010706")
+                    .eq("is_delete", "0")
+                    .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+            if (!CollectionUtils.isEmpty(list)){
+                throw new BadRequestException("稍后再试,异常口存在正在执行的任务"+ list.stream().map(SchBaseTask::getTask_id).collect(Collectors.joining(",")));
+            }
+            Param forceWeight = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("force_weight");
+            if (forceWeight!=null && "1".equals(forceWeight.getValue())){
+                PdmBiContainerinbound one = iPdmBiContainerinboundService.getOne(new QueryWrapper<PdmBiContainerinbound>()
+                        .eq("box", whereJson.getString("box_no")));
+                if (one!=null && !StringUtils.isEmpty(one.getRemark())){
+                    List<String> remark = JSONObject.parseObject(one.getRemark(), List.class);
+                    Optional<String> 称重 = remark.stream().filter(m -> m.contains("称重")).findAny();
+                    if (称重.isPresent()){
+                        throw new BadRequestException("开启称重强制校验"+称重.get());
+                    }
+                }
+            }
+        }
         if (bill_type.equals("1")) {
             whereJson.put("bill_type", IOSEnum.IN_TYPE.code("返检入库"));
         } else if (bill_type.equals("2")) {
@@ -196,17 +256,20 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
             whereJson.put("bill_type", IOSEnum.IN_TYPE.code("手工入库"));
         }
         whereJson.put("box_no", whereJson.getString("box_no"));
-        JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status = '0'").getResultJSONArray(0);
+        JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0);
         if (ObjectUtil.isEmpty(resultJSONArray)) {
             throw new BadRequestException("未查询到子卷包装信息!");
         }
         String material_barcode = "";
+        List<String> subs = new ArrayList<>();
         for (int i = 0; i < resultJSONArray.size(); i++) {
             JSONObject resultObj = resultJSONArray.getJSONObject(i);
+            String containerName = resultObj.getString("container_name");
+            subs.add(containerName);
             if (i == 0) {
-                material_barcode = resultObj.getString("container_name");
+                material_barcode = containerName;
             } else {
-                material_barcode += "," + resultObj.getString("container_name");
+                material_barcode += "," + containerName;
             }
         }
         whereJson.put("material_barcode", material_barcode);
@@ -244,10 +307,25 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
         if (ObjectUtil.isEmpty(jsonExt)) {
             throw new BadRequestException("载具不存在!"+whereJson.getString("vehicle_code"));
         }
+        int hasTask = ischBaseTaskService.count(new QueryWrapper<SchBaseTask>()
+                .eq("is_delete", "0")
+                .eq("vehicle_code2", whereJson.getString("vehicle_code"))
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+        if (hasTask>0){
+            throw new BadRequestException("托盘"+whereJson.getString("vehicle_code")+"存在执行的任务");
+        }
+        String pcsn = jsonExt.getString("pcsn");
+        if (StringUtils.isNotEmpty(pcsn)){
+            JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + pcsn + "'").getResultJSONArray(0);
+            if (stIvtStructattr != null && stIvtStructattr.size() > 0) {
+                throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经绑定木箱"+pcsn);
+            }
+        }
         jsonExt.put("pcsn", whereJson.getString("box_no"));
         extTab.update(jsonExt);
 
         inBussManageService.inTask(whereJson);
+        PdmProductSpecServiceImpl.doRecord(SpecEnum.RK_YC,null,Boolean.TRUE,null,subs);
         JSONObject result = new JSONObject();
         result.put("message", "入库成功!");
         return result;
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
index e610bc0b7..38552f473 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
@@ -130,5 +130,29 @@ public interface IPdmBiSlittingproductionplanService extends IService<PdmBiSlitt
      */
     List<PdmBiSlittingproductionplan> getByQzzNoByNoStatus(String qzzno);
 
+    /**
+     * 根据子卷号获取一条记录
+     * @param containerName
+     * @return
+     */
+    PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName);
+
+    List<SlitterPlanDistinctDto> getAllHalfPlanRestruct(List<String> qzzs);
+
+    /**
+     * 获取能够套轴的分切计划，虚拟卷，固定是常规卷
+     * @param day 天数
+     * @return
+     */
+    List<SlitterPlanDistinctDto> getAllCutPlan2(Integer day);
+
+    /**
+     * 根据设备获取计划
+     * @param deviceCode
+     * @return
+     */
+    List<PdmBiSlittingproductionplan> getXnPlanByDevice(String deviceCode);
+
     int getCountXN(String area, String location);
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
index 4a81910aa..6fc701608 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
@@ -18,5 +18,10 @@ public interface PdmBiSlittingproductionplanMapper extends BaseMapper<PdmBiSlitt
 
     List<PdmBiSlittingproductionplan> getCurrentPlanInfos(SlitterPlanDistinctDto dto);
 
+    List<SlitterPlanDistinctDto> getAllHalfPlanRestruct(List<String> qzzs);
+
+    List<SlitterPlanDistinctDto> getAllCutPlan2(Integer day);
+
     int getCountXN(String area, String location);
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
index a75fe5674..b019e50cb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
@@ -71,7 +71,6 @@
         AND IFNULL(p.up_or_down,'') <![CDATA[ <> ]]> ''
         AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> ''
         AND DATE(p.start_time) >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY)
-        AND p.FRP_description NOT LIKE '%1800%'
         AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name)
         GROUP BY
             p.resource_name,
@@ -151,6 +150,84 @@
           AND (p.parent_container_name = #{parent_container_name} OR restruct_container_name = #{parent_container_name})
           AND p.split_group <![CDATA[ <> ]]> #{split_group}
     </select>
+    <select id="getAllHalfPlanRestruct"
+            resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto">
+        WITH RankedData AS (
+        SELECT
+        p1.resource_name,
+        p1.restruct_container_name AS parent_container_name,
+        p1.split_group,
+        p1.up_or_down,
+        '1' AS num,
+        p1.qzz_size,
+        p1.qzz_generation,
+        ROW_NUMBER() OVER ( PARTITION BY p1.restruct_container_name, p1.split_group ORDER BY p1.resource_name ) AS rn
+        FROM
+        pdm_bi_slittingproductionplan p1
+        JOIN (
+        SELECT DISTINCT
+        p.qzzno,
+        p.restruct_container_name,
+        p.split_group,
+        p.up_or_down
+        FROM
+        pdm_bi_slittingproductionplan p
+        WHERE
+        p.qzzno IN
+        <foreach item="item" index="index" collection="qzzs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        ) p2 ON p1.restruct_container_name = p2.restruct_container_name
+        AND p1.split_group = p2.split_group
+        AND p1.up_or_down <![CDATA[ <> ]]> p2.up_or_down
+        AND p1.is_delete = '0'
+        AND p1.is_paper_ok = '1'
+        ) SELECT
+        resource_name,
+        parent_container_name,
+        split_group,
+        up_or_down,
+        num,
+        qzz_size,
+        qzz_generation
+        FROM
+        RankedData
+        WHERE
+        rn = 1;
+    </select>
+    <select id="getAllCutPlan2" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto">
+        SELECT p.resource_name,
+               p.parent_container_name,
+               p.split_group,
+               p.up_or_down,
+               p.manufacture_sort,
+               p.qzz_size,
+               p.qzz_generation,
+               MIN(p.start_time) AS start_time
+        FROM `pdm_bi_slittingproductionplan` p
+        WHERE p.`status` = '01'
+          AND p.is_child_tz_ok = '0'
+          AND p.is_paper_ok = '1'
+          AND p.is_delete = '0'
+          AND IFNULL(p.up_or_down, '') <![CDATA[ <> ]]> ''
+          AND IFNULL(p.left_or_right, '') <![CDATA[ <> ]]> ''
+          AND DATE ( p.start_time ) >= DATE_SUB( CURDATE()
+            , INTERVAL #{day} DAY )
+          AND p.container_name LIKE '%虚拟-B%'
+          AND '1' = ( SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name )
+        GROUP BY
+            p.resource_name,
+            p.parent_container_name,
+            p.split_group,
+            p.up_or_down,
+            p.start_time,
+            p.manufacture_sort,
+            p.qzz_size,
+            p.qzz_generation
+        order by p.qzz_size,
+            p.manufacture_sort desc,
+            p.start_time
+    </select>
     <select id="getCountXN" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM pdm_bi_slittingproductionplan p
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
index 264f7eba9..9f77c6f2e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
@@ -93,7 +93,7 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
         LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
         lam.eq(PdmBiSlittingproductionplan::getQzzno, qzzNo)
                 .eq(PdmBiSlittingproductionplan::getIs_delete, "0")
-                .eq(PdmBiSlittingproductionplan::getStatus, "09");
+                .ge(PdmBiSlittingproductionplan::getStatus, "05");
         return pdmBiSlittingproductionplanMapper.selectList(lam);
     }
 
@@ -159,8 +159,8 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
     @Override
     public List<PdmBiSlittingproductionplan> getByContainerNames(List<String> collect) {
         LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
-        lam.in(PdmBiSlittingproductionplan::getContainer_name, collect)
-                .eq(PdmBiSlittingproductionplan::getIs_delete, "0");
+        lam.in(PdmBiSlittingproductionplan::getContainer_name, collect);
+        lam.eq(PdmBiSlittingproductionplan::getIs_delete,"0");
         return pdmBiSlittingproductionplanMapper.selectList(lam);
     }
 
@@ -174,7 +174,7 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
         LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
         lam.eq(PdmBiSlittingproductionplan::getQzzno, qzzNo)
                 .eq(PdmBiSlittingproductionplan::getIs_delete, "0")
-                .eq(PdmBiSlittingproductionplan::getStatus, status);
+                .eq(ObjectUtil.isNotEmpty(status), PdmBiSlittingproductionplan::getStatus, status);
         return pdmBiSlittingproductionplanMapper.selectList(lam);
     }
 
@@ -186,6 +186,32 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
         return pdmBiSlittingproductionplanMapper.selectList(lam);
     }
 
+    @Override
+    public PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName) {
+        LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
+        lam.eq(PdmBiSlittingproductionplan::getContainer_name, containerName);
+        return getOne(lam, false);
+    }
+
+    @Override
+    public List<SlitterPlanDistinctDto> getAllHalfPlanRestruct(List<String> qzzs) {
+        return pdmBiSlittingproductionplanMapper.getAllHalfPlanRestruct(qzzs);
+    }
+
+    @Override
+    public List<SlitterPlanDistinctDto> getAllCutPlan2(Integer day) {
+        return pdmBiSlittingproductionplanMapper.getAllCutPlan2(day);
+    }
+
+    @Override
+    public List<PdmBiSlittingproductionplan> getXnPlanByDevice(String deviceCode) {
+        LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
+        lam.eq(PdmBiSlittingproductionplan::getResource_name, deviceCode)
+                .like(PdmBiSlittingproductionplan::getContainer_name, "虚拟")
+                .lt(PdmBiSlittingproductionplan::getStatus, "03")
+                .eq(PdmBiSlittingproductionplan::getIs_delete, "0");
+        return this.list(lam);
+    }
     @Override
     public int getCountXN(String area, String location) {
         return pdmBiSlittingproductionplanMapper.getCountXN(area, location);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinbound.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinbound.java
new file mode 100644
index 000000000..7070c950c
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinbound.java
@@ -0,0 +1,52 @@
+package org.nl.b_lms.pdm.info.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 子卷下线记录表
+ * </p>
+ *
+ * @author author
+ * @since 2024-07-19
+ */
+@Data
+@TableName("pdm_bi_containerinbound")
+public class PdmBiContainerinbound implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标识
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 子卷号
+     */
+    private String container_name;
+    /**
+     * 木箱
+     */
+    private String box;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 直接入库
+     */
+    private Boolean inbound;
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/mapper/PdmBiContainerinboundMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/mapper/PdmBiContainerinboundMapper.java
new file mode 100644
index 000000000..ae69568c2
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/mapper/PdmBiContainerinboundMapper.java
@@ -0,0 +1,17 @@
+package org.nl.b_lms.pdm.info.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinfo;
+
+/**
+ * <p>
+ * 子卷下线记录表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-07-19
+ */
+public interface PdmBiContainerinboundMapper extends BaseMapper<PdmBiContainerinbound> {
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/IPdmBiContainerinboundService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/IPdmBiContainerinboundService.java
new file mode 100644
index 000000000..c17e0d1b1
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/IPdmBiContainerinboundService.java
@@ -0,0 +1,17 @@
+package org.nl.b_lms.pdm.info.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinfo;
+
+/**
+ * <p>
+ * 子卷下线记录表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-07-19
+ */
+public interface IPdmBiContainerinboundService extends IService<PdmBiContainerinbound> {
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinbooundServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinbooundServiceImpl.java
new file mode 100644
index 000000000..678525327
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/service/impl/PdmBiContainerinbooundServiceImpl.java
@@ -0,0 +1,21 @@
+package org.nl.b_lms.pdm.info.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
+import org.nl.b_lms.pdm.info.mapper.PdmBiContainerinboundMapper;
+import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 子卷下线记录表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-07-19
+ */
+@Service
+public class PdmBiContainerinbooundServiceImpl extends ServiceImpl<PdmBiContainerinboundMapper, PdmBiContainerinbound> implements IPdmBiContainerinboundService {
+
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java
new file mode 100644
index 000000000..eca342d54
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java
@@ -0,0 +1,102 @@
+package org.nl.b_lms.pdm.productSpec.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec;
+import org.nl.b_lms.pdm.productSpec.dto.PdmProductSpecDto;
+import org.nl.b_lms.pdm.productSpec.service.IpdmProductSpecService;
+import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
+import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
+import org.nl.b_lms.sch.tasks.TwoOutBoxTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.auto.AutoSendVehicleToDjq;
+import org.nl.b_lms.sch.tasks.first_floor_area.auto.Prun;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.common.enums.SpecEnum;
+import org.nl.common.utils.CopyUtil;
+import org.nl.common.utils.MapOf;
+import org.nl.common.utils.RedissonUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.FileUtil;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+
+/**
+ * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)控制层
+ * {@code @Author:} gbx
+ *
+ * @since 2024-02-01
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/pdmProductSpec")
+@Slf4j
+public class PdmProductSpecController {
+
+    @Autowired
+    private IpdmProductSpecService ipdmProductSpecService;
+
+    @GetMapping("/subSpec/{code}")
+    public ResponseEntity<Object> subSpec(@PathVariable String code) {
+        List<PdmProductSpecDto> result = new ArrayList<>();
+        if (!StringUtils.isEmpty(code)){
+            List<PdmProductSpec> list = ipdmProductSpecService.list(new QueryWrapper<PdmProductSpec>()
+                    .eq("container_name", code).orderByAsc("id"));
+            result = CopyUtil.copyList(list, PdmProductSpecDto.class);
+            result.forEach(a->{
+                a.setUrl(SpecEnum.conversUrl(a.getSpec()));
+            });
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @GetMapping("/querySpec/{code}")
+    @SaIgnore
+    public void querySpec(@PathVariable int code,HttpServletResponse response) {
+        DateTime dateTime = DateUtil.offsetDay(new Date(), -code);
+        List<PdmProductSpec> pdmProductSpecs = ipdmProductSpecService.querySubSepc(dateTime.toString());
+        String[] col = {"子卷","子卷下线","质检","包装","包装解除","装箱入库","验箱","入库"};
+        if (!CollectionUtils.isEmpty(pdmProductSpecs)){
+            Map<String, List<PdmProductSpec>> collect = pdmProductSpecs.stream().collect(Collectors.groupingBy(PdmProductSpec::getContainer_name));
+            List<Map<String,String>> data = new ArrayList<>();
+            PdmProductSpec pdmProductSpec = new PdmProductSpec();
+
+            for (String sub : collect.keySet()) {
+                List<PdmProductSpec> item = collect.get(sub);
+                //2,3,4,5,7,9,10
+                String 子卷下线 = DateUtil.format((item.stream().filter(a -> 2 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                String 质检 = DateUtil.format((item.stream().filter(a -> 3 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                String 包装 = DateUtil.format((item.stream().filter(a -> 4 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                String 包装解除 = DateUtil.format((item.stream().filter(a -> 5 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                String 装箱入库 = DateUtil.format((item.stream().filter(a -> 6 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                String 验箱 = DateUtil.format((item.stream().filter(a -> 9 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                String 入库 = DateUtil.format((item.stream().filter(a -> 10 == a.getSpec()).findFirst().orElse(pdmProductSpec).getCreate_time()),"yyyy-MM-dd HH:mm:ss.SSS");
+                data.add(MapOf.of("子卷",sub,"子卷下线",子卷下线,"质检",质检,"包装",包装,"包装解除",包装解除,"装箱入库",装箱入库,"验箱",验箱,"入库",入库));
+                }
+            new FileUtil().downloadExcelIO(data,col, response);
+        }
+    }
+
+}
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java
new file mode 100644
index 000000000..fef9d74ea
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java
@@ -0,0 +1,34 @@
+package org.nl.b_lms.pdm.productSpec.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 子卷生产步序表
+ */
+@Data
+@TableName("pdm_product_spec")
+public class PdmProductSpec extends Model<PdmProductSpec> {
+
+    @TableId(value = "id")
+    private Long id;
+    private String container_name;
+    private Integer spec;
+    private String param;
+    private Boolean result;
+    private String msg;
+    private Date create_time;
+
+}
+
+
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java
new file mode 100644
index 000000000..4cf8beb5b
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java
@@ -0,0 +1,22 @@
+package org.nl.b_lms.pdm.productSpec.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)数据持久层
+ * {@code @Author:} gbx
+ *
+ * @since 2024-02-01
+ */
+public interface PdmProductSpecMapper extends BaseMapper<PdmProductSpec> {
+
+    @Select("select * from pdm_product_spec where create_time > #{date} and spec in (2,3,4,5,7,9,10)")
+    List<PdmProductSpec> querySpec(String date);
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dto/PdmProductSpecDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dto/PdmProductSpecDto.java
new file mode 100644
index 000000000..756d688b6
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dto/PdmProductSpecDto.java
@@ -0,0 +1,28 @@
+package org.nl.b_lms.pdm.productSpec.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 子卷生产步序表
+ */
+@Data
+public class PdmProductSpecDto{
+
+    private Long id;
+    private String container_name;
+    private Integer spec;
+    private String url;
+    private String param;
+    private Boolean result;
+    private String msg;
+    private Date create_time;
+
+}
+
+
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java
new file mode 100644
index 000000000..4c80c8ff8
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java
@@ -0,0 +1,28 @@
+package org.nl.b_lms.pdm.productSpec.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.enums.SpecEnum;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)服务接口层
+ * {@code @Author:} gbx
+ *
+ * @since 2024-02-01
+ */
+public interface IpdmProductSpecService extends IService<PdmProductSpec> {
+    public void record(SpecEnum spec, Map param, Boolean sucess,String msg, List<String> container_name);
+
+    public List<PdmProductSpec> querySubSepc(String date);
+}
+
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java
new file mode 100644
index 000000000..e6123029d
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java
@@ -0,0 +1,3 @@
+package org.nl.b_lms.pdm.productSpec.service;
+
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java
new file mode 100644
index 000000000..b1e11a152
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java
@@ -0,0 +1,72 @@
+package org.nl.b_lms.pdm.productSpec.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.log4j.Log4j;
+
+import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec;
+import org.nl.b_lms.pdm.productSpec.dao.mapper.PdmProductSpecMapper;
+import org.nl.b_lms.pdm.productSpec.service.IpdmProductSpecService;
+import org.nl.common.enums.SpecEnum;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)服务实现层
+ * {@code @Author:} gbx
+ *
+ * @since 2024-02-01
+ */
+@Service
+@Log4j
+public class PdmProductSpecServiceImpl extends ServiceImpl<PdmProductSpecMapper, PdmProductSpec> implements IpdmProductSpecService {
+
+
+    public static void doRecord(SpecEnum spec, Map param, Boolean sucess,String msg, List<String> container_name) {
+        IpdmProductSpecService service = SpringContextHolder.getBean(IpdmProductSpecService.class);
+        service.record(spec,param,sucess,msg,container_name);
+    }
+
+    public static void doRecord(SpecEnum spec, Map param, Boolean sucess,String msg, String container_name) {
+        IpdmProductSpecService service = SpringContextHolder.getBean(IpdmProductSpecService.class);
+        List<String> list = new ArrayList<>();
+        list.add(container_name);
+        service.record(spec,param,sucess,msg,list);
+    }
+
+    @Override
+    @Async
+    public void record(SpecEnum spec, Map param, Boolean sucess,String msg, List<String> container_name) {
+        if (!CollectionUtils.isEmpty(container_name)){
+            for (String s : container_name) {
+                PdmProductSpec productSpec = new PdmProductSpec();
+                productSpec.setSpec(spec.getValue());
+                productSpec.setContainer_name(s);
+                productSpec.setResult(sucess);
+                productSpec.setMsg(msg);
+                if (!CollectionUtils.isEmpty(param)){
+                    productSpec.setParam(JSONObject.toJSONString(param));
+                }
+                this.save(productSpec);
+            }
+        }
+    }
+
+    @Override
+    public List<PdmProductSpec> querySubSepc(String date) {
+        if (StringUtils.isEmpty(date)){
+            return null;
+        }
+        List<PdmProductSpec> pdmProductSpecs = this.baseMapper.querySpec(date);
+        return pdmProductSpecs;
+    }
+}
+
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 b2ed125e5..7b5b50b7a 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
@@ -9,14 +9,17 @@ import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
+import org.nl.b_lms.sch.tasks.TwoOutBoxTask;
 import org.nl.b_lms.sch.tasks.first_floor_area.auto.AutoSendVehicleToDjq;
 import org.nl.b_lms.sch.tasks.first_floor_area.auto.Prun;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -52,7 +56,7 @@ public class PdmBiSubpackagerelationController {
     private IpdmBiSubpackagerelationService pdmBiSubpackagerelationService;
 
     @Autowired
-    private IbstIvtPackageinfoivtService packageinfoivtService;
+    private TwoOutBoxTask twoOutBoxTask;
     @Autowired
     private AutoSendVehicleToDjq autoSendVehicleToDjq;
 
@@ -170,25 +174,24 @@ public class PdmBiSubpackagerelationController {
     @Log("子卷装箱入库")
     //@SaCheckPermission("@el.check(updateEntityList)")
     public ResponseEntity<Object> zjInBoundConfirm(@RequestBody JSONObject whereJson) {
-        RLock lock = redissonClient.getLock("zjInBound");
-        boolean tryLock = false;
-        try {
-            tryLock = lock.tryLock(0, TimeUnit.SECONDS);
-            if (tryLock) {
-                pdmBiSubpackagerelationService.zjInBoundConfirm(whereJson);
-            } else {
-                log.info("子卷装箱入库操作正在执行被锁住。");
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        } finally {
-            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
-                lock.unlock();
-            }
-        }
+        RedissonUtils.lock(c->{
+            pdmBiSubpackagerelationService.zjInBoundConfirm(whereJson);
+        },"zjInBound",0,this,"装箱入库在操作,稍后再试");
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }
 
+    @PostMapping("/boxReturn")
+    @SaIgnore
+    @Log("装箱位木箱回库")
+    //@SaCheckPermission("@el.check(updateEntityList)")
+    public ResponseEntity<Object> boxReturn(@RequestBody JSONObject whereJson) {
+        RedissonUtils.lock(c->{
+            pdmBiSubpackagerelationService.boxReturn(whereJson);
+        },"zjInBound",0,this,"装箱送回在操作,稍后再试");
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
+    }
+
+
 
     @PostMapping("/transferBoxPackageToMes")
     @Log("传输子卷包装关系至LMS")
@@ -248,9 +251,13 @@ public class PdmBiSubpackagerelationController {
         autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-
-
-
+    @PostMapping("/downloadData")
+    @SaIgnore
+    public  void downloadData(Integer day, HttpServletResponse response) {
+        RedissonUtils.lock(a->{
+            pdmBiSubpackagerelationService.downloadData(3,(HttpServletResponse)a);
+            return null;
+        },"下载任务时间",response);
+    }
 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
index 09ca20d02..11a5fb2a0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto;
@@ -32,6 +33,11 @@ public interface PdmBiSubpackagerelationMapper extends BaseMapper<PdmBiSubpackag
 
     List<PdmBiSubpackagerelationDto> queryContainerNameBySaleOrder(@Param("sale_order_name") String sale_order_name, @Param("container_name") String container_name);
 
+    List<JSONObject> getStructInfoBySZLS();
+
     List<JSONObject> recordQuery(List<String> pcns);
 
+    @Select("select resource_name as 下卷设备,sch_base_task.update_time as 下卷结束,sch_base_task.create_time as 下卷开始 from sch_base_task left JOIN pdm_bi_slittingproductionplan on pdm_bi_slittingproductionplan.qzzno = vehicle_code and pdm_bi_slittingproductionplan.container_name is not null where create_time > #{day} and task_status = '07' and vehicle_code != '' and vehicle_code is not NULL and point_code2 IN ('TZZC30','TZZC31','TZZC32','TZZC33','TZZC34','TZZC35','TZZC36','TZZC37','TZZC38')\n")
+    List<Map<String,String>> downloadData(@Param("day") String date);
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index 5489d0793..42ae00939 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -98,7 +98,7 @@
         FROM `pdm_bi_subpackagerelation` a
         LEFT JOIN bst_ivt_packageinfoivt b ON a.container_name = b.container_name
         LEFT JOIN pdm_bi_slittingproductionplan c ON a.container_name = c.container_name
-        WHERE b.point_status = '3'
+        WHERE b.point_status in ('3','6')
         AND b.ivt_status = '3'
         AND b.is_used = '1'
         AND c.is_delete = '0'
@@ -110,6 +110,16 @@
         </if>
         ORDER BY box_group
     </select>
+    <select id="getStructInfoBySZLS" resultType="com.alibaba.fastjson.JSONObject">
+        select struct_code,storagevehicle_code from st_ivt_structattr where sect_code IN ('ZC01','KTP01','ZZ01','PD01')
+    </select>
+    <select id="recordQuery" resultType="com.alibaba.fastjson.JSONObject">
+        select sale_order_name,container_name,insert_time from pdm_bi_subpackagerelationrecord where container_name in
+          <foreach collection="pcns" item="item" open="(" close=")" separator=",">
+              #{item}
+          </foreach>
+        AND io_type = '0'
+    </select>
     <select id="recordQuery" resultType="com.alibaba.fastjson.JSONObject">
         select sale_order_name,container_name,insert_time from pdm_bi_subpackagerelationrecord where container_name in
         <foreach collection="pcns" item="item" open="(" close=")" separator=",">
@@ -118,6 +128,4 @@
         AND io_type = '0'
     </select>
 
-
-
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
index 9932e529e..2f31953a9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
@@ -8,6 +8,7 @@ import org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto;
 import org.nl.common.domain.query.PageQuery;
 import org.springframework.data.domain.Pageable;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -71,6 +72,11 @@ public interface IpdmBiSubpackagerelationService extends IService<PdmBiSubpackag
      */
     void zjInBoundConfirm(JSONObject whereJson);
 
+    /**
+     * 木箱回库
+     * @param whereJson
+     */
+    void boxReturn(JSONObject whereJson);
     /**
      * 子卷装箱
      * @param whereJson
@@ -116,6 +122,27 @@ public interface IpdmBiSubpackagerelationService extends IService<PdmBiSubpackag
 
     List<JSONObject> recordQuery(List<String> pcsn);
 
+    /**
+     * 解绑子卷包装
+     * @param code
+     */
+    Map toEndSubpackagerelation(String code);
+
+    /**
+     * 数字孪生用
+     * @return
+     */
+    List<JSONObject> getStructInfoBySZLS();
+
+    List<JSONObject> recordQuery(List<String> pcsn);
+
+    /**
+     * 导出任务相关数据
+     * @param day
+     */
+    void downloadData(Integer day, HttpServletResponse response);
+
+
 }
 
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index adfe2eb6f..93eebaa22 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -1,10 +1,12 @@
 package org.nl.b_lms.pdm.subpackagerelation.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.PageResult;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,18 +17,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
 import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
+import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService;
 import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService;
+import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
 import org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
+import org.nl.b_lms.pdm_manage.enums.SUBEnum;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
@@ -45,24 +52,35 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxMana
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.common.enums.SpecEnum;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.FileUtil;
+import org.nl.modules.logging.service.EsLogService;
+import org.nl.modules.logging.service.dto.LogQuery;
+import org.nl.modules.logging.service.dto.LogRepositoryDTO;
+import org.nl.modules.logging.service.impl.LuceneLogServiceImpl;
 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.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
+import org.nl.wms.sch.AcsUtil;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -97,6 +115,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     @Autowired
     private IPdmBiOrderbominfoService iPdmBiOrderbominfoService;
 
+    @Autowired
+    private IPdmBiContainerinboundService iPdmBiContainerinboundService;
+
     @Autowired
     private OutBoxManageService outBoxManageService;
 
@@ -111,13 +132,19 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     @Resource
     private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
 
+    @Autowired
+    private TwoOutBoxTask twoOutBoxTask;
+
+    @Autowired
+    private ISysParamService iSysParamService;
 
-    @Resource
-    private TaskQueue taskQueue;
     @Resource
     @Qualifier("threadPoolExecutor")
     private ThreadPoolExecutor pool;
 
+    @Autowired
+    private EsLogService luceneLogService;
+
     /**
      * 查询数据分页
      *
@@ -257,6 +284,16 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         Set<String> containerNameList = packagerelationList.stream()
                 .map(PdmBiSubpackagerelation::getContainer_name)
                 .collect(Collectors.toSet());
+
+        List<BstIvtPackageinfoivt> ivtList = packageinfoivtService
+                .list(new QueryWrapper<BstIvtPackageinfoivt>()
+                        .in("container_name", containerNameList));
+
+        for (BstIvtPackageinfoivt ivtPackageinfoivt : ivtList) {
+            if (!ivtPackageinfoivt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))){
+                throw new BadRequestException("当前子卷未质检"+ivtPackageinfoivt.getContainer_name());
+            }
+        }
         List<PdmBiSlittingproductionplan> planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                 .in(PdmBiSlittingproductionplan::getContainer_name, containerNameList)
                 .eq(PdmBiSlittingproductionplan::getIs_delete,IOSEnum.IS_NOTANDYES.code("否"))
@@ -293,6 +330,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                 .max(Integer::compareTo)
                 .orElse(0) + 1;
         outBox(workIdList, containerNameList, deviceCode, maxBoxGroup, whereJson, totalWeight);
+        List<Long> collect = ivtList.stream().map(a -> a.getIvt_id()).collect(Collectors.toList());
+        packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>()
+                .set("update_time", DateUtil.now())
+                .in("ivt_id",collect));
     }
 
     @Override
@@ -343,6 +384,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         }
         Set<String> collect = subList.stream().map(PdmBiSubpackagerelation::getPackage_box_sn).collect(Collectors.toSet());
         Set<String> containers = subList.stream().map(PdmBiSubpackagerelation::getContainer_name).collect(Collectors.toSet());
+        List<String> containerList = subList.stream().map(PdmBiSubpackagerelation::getContainer_name).collect(Collectors.toList());
         if (collect.size() == 0){
             throw new BadRequestException("当前子卷还未进行装箱组盘操作");
         }
@@ -353,15 +395,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             throw new BadRequestException("当前木箱"+subList.get(0).getQuanlity_in_box()+"要装箱的子卷"+split.length+"未装完");
         }
         String boxSn = subList.get(0).getPackage_box_sn();
-        //子卷到装箱区
-        agvTransfer(containers, deviceCode, boxSn);
-
-        // 查询木箱对应的托盘号
-        JSONObject jsonVeExt = WQLObject.getWQLObject("md_pb_storagevehicleext").query("pcsn = '" + boxSn + "'")
-                .uniqueResult(0);
-        if (ObjectUtil.isEmpty(jsonVeExt)) {
-            throw new BadRequestException("此木箱没有绑定托盘号!"+boxSn);
-        }
         //查询木箱所在货位
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
         JSONArray boxAttrs = attrTab.query("storagevehicle_code = '" + boxSn + "' and sect_id = '1748219897940414464'").getResultJSONArray(0);
@@ -369,31 +402,65 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             throw new BadRequestException("当前木箱"+boxSn+"库存信息查询不到,请确认");
         }
         JSONObject boxAttr  = boxAttrs.getJSONObject(0);
+        List<SchBaseTask> hasTask = taskService.list(new QueryWrapper<SchBaseTask>()
+                .select("point_code2")
+                .eq("is_delete", "0")
+                .eq("point_code1", boxAttr.getString("struct_code"))
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+        if (!CollectionUtils.isEmpty(hasTask)){
+            boolean zxq = hasTask.stream().map(a -> a.getPoint_code2()).filter(a -> a.contains("ZXQ")).findAny().isPresent();
+            if (zxq){
+                throw new BadRequestException("当前子卷正在执行装箱入库操作");
+            }else{
+                throw new BadRequestException("当前空木箱"+boxSn+"存在正在执行的任务,稍后再操作");
+            }
+        }
+        // 查询木箱对应的托盘号
+        JSONObject jsonVeExt = WQLObject.getWQLObject("md_pb_storagevehicleext").query("pcsn = '" + boxSn + "'")
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonVeExt)) {
+            throw new BadRequestException("此木箱没有绑定托盘号!"+boxSn);
+        }
+        //子卷到装箱区
+        agvTransfer(containers, deviceCode, boxSn);
         String task_group_id = null;
         if (boxAttr.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) {
             JSONObject 浅Attr = attrTab
                     .query("zdepth = '1' and row_num = '"+boxAttr.getString("row_num")+"' and col_num = '" + boxAttr.getString("col_num") + "' and layer_num = '"+boxAttr.getString("layer_num")+"'")
                     .uniqueResult(0);
-            // 判断浅货位是否有木箱
-            if (!ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))) {
-                // 判断是否被锁定
+            if (ObjectUtil.isEmpty(浅Attr)){
+                throw new BadRequestException(boxAttr.getString("struct_code")+"对应浅货位信息不正确");
+            }
+            if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))){
+                if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
+                    throw new BadRequestException("木箱货位"+boxAttr.getString("struct_code")+"的浅货位存在正在执行的任务");
+                }
+            }else {
                 if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
                     // 判断浅货位木箱和深货位木箱是否相同规格
                     task_group_id = outBoxManageService.createBoxMove(浅Attr);
-                } else {
-                    // 判断是否是空木箱出库锁
+                } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
+                    List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
+                            .eq("is_delete", "0")
+                            .eq("point_code1", 浅Attr.getString("struct_code"))
+                            .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                    if (!CollectionUtils.isEmpty(list)){
+                        throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code"));
+                    }
+                }else {
                     throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code"));
                 }
             }
         }
-        int moveTask = taskService.count(new QueryWrapper<SchBaseTask>()
-                .eq("task_type", "010704")
-                .eq("is_delete", "0")
-                .eq("point_code1", boxAttr.getString("struct_code"))
-                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
-        if (moveTask>0){
-            throw new BadRequestException("当前子卷已经装箱入库");
+        PdmBiContainerinbound pdmBiContainerinbound = new PdmBiContainerinbound();
+        pdmBiContainerinbound.setId(org.nl.common.utils.IdUtil.getStringId());
+        pdmBiContainerinbound.setContainer_name(containerName);
+        pdmBiContainerinbound.setBox(boxSn);
+        Boolean inbound = param.getBoolean("inbound");
+        if (inbound!=null){
+            pdmBiContainerinbound.setInbound(inbound);
         }
+        iPdmBiContainerinboundService.save(pdmBiContainerinbound);
         // 生成任务
         JSONObject jsonTaskParam = new JSONObject();
         jsonTaskParam.put("task_type", "010704");
@@ -405,10 +472,13 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         JSONObject request_param = new JSONObject();
         request_param.put("containerType", boxAttr.getString("storagevehicle_type"));
         jsonTaskParam.put("request_param", request_param.toString());
-        TwoOutBoxTask taskBean = new TwoOutBoxTask();
-        taskBean.createTask(jsonTaskParam);
+        // 锁定起点
+        boxAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("出库锁"));
+        attrTab.update(boxAttr);
+        twoOutBoxTask.createTask(jsonTaskParam);
+        twoOutBoxTask.immediateNotifyAcs(null);
+        PdmProductSpecServiceImpl.doRecord(SpecEnum.ZXRK,null,Boolean.TRUE,null,containerList);
 
-        taskBean.immediateNotifyAcs(null);
     }
 
     private void checkEntityList(JSONObject whereJson, List<PdmBiSubpackagerelation> packagerelationList) {
@@ -483,7 +553,18 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         updateWrapper.in("workorder_id", workIdList);
         pdmBiSubpackagerelationMapper.update(null, updateWrapper);
         //给MES传输子卷包装关系
-        transferBoxPackageToMes(false, whereJson, containerNameList, boxSn, weightTotal);
+        PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ,null,Boolean.TRUE,null,containerNameList.stream().collect(Collectors.toList()));
+        CompletableFuture.runAsync(() -> {
+            try {
+                log.error("----回传子卷包装关系----");
+                String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue();
+                if ("1".equals(isConnect2)) {
+                    transferBoxPackageToMes(false, whereJson, containerNameList, boxSn, weightTotal);
+                }
+            } catch (Exception e) {
+                log.error("子卷装箱异常，transferBoxPackageToMes给MES传输子卷包装关系异常,木箱号为：" + boxSn + ",异常信息：" + e);
+            }
+        }, pool);
     }
 
     /**
@@ -659,21 +740,24 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         //待检区点位
         List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService
                 .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
-                        .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("待检区"))
                         .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
-                        .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("合格品"))
-                        .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
-        List<BstIvtPackageinfoivt> djqPoints = djqPointList.stream()
-                .filter(r -> containerNameList.contains(r.getContainer_name()))
-                .collect(Collectors.toList());
-
+                        .in(BstIvtPackageinfoivt::getContainer_name,containerNameList));
+        if (CollectionUtils.isEmpty(djqPointList)){
+            throw new BadRequestException(containerNameList+"子卷信息不存在");
+        }
+        boolean hasNo = djqPointList.stream().anyMatch(a -> !a.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品")));
+        if (hasNo){
+            throw new BadRequestException(containerNameList+"子卷未质检合格");
+        }
+        List<BstIvtPackageinfoivt> djqPoints = djqPointList.stream().filter(a -> a.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区"))).collect(Collectors.toList());
         //任务组id
         String groupId = deviceCode.substring(deviceCode.indexOf("_") + 1, deviceCode.indexOf("_", deviceCode.indexOf("_") + 1));
         String now = DateUtil.now();
         for (int i1 = 0; i1 < djqPoints.size(); i1++) {
             BstIvtPackageinfoivt item = djqPoints.get(i1);
             //校验重复任务
-            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, item.getContainer_name()).eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"))
+            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
+                    .eq(SchBaseTask::getVehicle_code, item.getContainer_name()).eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"))
                     .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")).lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
             if (CollectionUtils.isEmpty(taskList)){
                 JSONObject jo = new JSONObject();
@@ -691,6 +775,159 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
 
     }
 
+    @Override
+    public Map toEndSubpackagerelation(String code) {
+        HashMap result = MapOf.of("status", HttpStatus.OK.value());
+        result.put("message", code+"子卷包装解除成功");
+        if (StringUtils.isEmpty(code)){
+            throw new BadRequestException("子卷编码不能为空");
+        }
+        PdmBiSubpackagerelation containerName = this.getOne(new QueryWrapper<PdmBiSubpackagerelation>().eq("container_name", code));
+        if (containerName==null){
+            throw new BadRequestException("当前子卷"+code+"还未生成子卷包装");
+        }
+        if (SUBEnum.STATUS.code("入库").equals(containerName.getStatus())
+                ||SUBEnum.STATUS.code("出库").equals(containerName.getStatus())){
+            throw new BadRequestException("当前子卷"+code+"已完成出入库不允许手动解除");
+        }
+        if (StringUtils.isNotEmpty(containerName.getPackage_box_sn())){
+            String packageBoxSn = containerName.getPackage_box_sn();
+            WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+            JSONObject attr = attrTab.query("storagevehicle_code = '" + packageBoxSn + "'").uniqueResult(0);
+            if (ObjectUtils.isNotEmpty(attr)){
+                String structCode = attr.getString("struct_code");
+                int count = taskService.count(new QueryWrapper<SchBaseTask>()
+                        .eq("task_type", "010704")
+                        .eq("is_delete", "0")
+                        .eq("point_code1", structCode)
+                        .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                if (count>0){
+                    throw new BadRequestException("当前子卷已经生成装箱入库任务,不允许直接解绑");
+                }
+                attr.put("lock_type","1");
+                attrTab.update(attr);
+            }
+        }
+        this.removeById(containerName.getWorkorder_id());
+        result.put("message", code+"子卷包装解除成功,同时确认MES装箱以解绑定");
+        PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_REMOVE,MapOf.of("子卷编号",code),Boolean.TRUE,null,code);
+        return result;
+    }
+
+    @Override
+    public List<JSONObject> getStructInfoBySZLS() {
+        return this.baseMapper.getStructInfoBySZLS();
+    }
+
+    @Override
+    public List<JSONObject> recordQuery(List<String> pcsn) {
+        return this.baseMapper.recordQuery(pcsn);
+    }
+
+    @Override
+    public void boxReturn(JSONObject whereJson) {
+        String deviceCode = whereJson.getString("device_code");
+        String box = whereJson.getString("box");
+        if (StringUtils.isEmpty(deviceCode)||StringUtils.isEmpty(box)){
+            throw new BadRequestException("参数不全");
+        }
+        PdmBiSubpackagerelation one = this.getOne(new QueryWrapper<PdmBiSubpackagerelation>()
+                .eq("container_name", whereJson.getString("container_name")));
+        if (one!=null){
+            throw new BadRequestException("包装关系存在,请先在MES和LMS解绑包装关系");
+        }
+        BstIvtBoxinfo bstIvtBoxinfo = bstIvtBoxinfoMapper.selectOne(new LambdaQueryWrapper<BstIvtBoxinfo>()
+                .eq(BstIvtBoxinfo::getBox_no, box));
+        if (bstIvtBoxinfo == null) {
+            throw new BadRequestException("请检查木箱信息不存在");
+        }
+        JSONObject acsParam = new JSONObject();
+        String height = "1";
+        String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
+        String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
+        String box_high = bstIvtBoxinfo.getBox_high();
+        if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) {
+            height = "1";
+        } else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) {
+            height = "2";
+        } else {
+            height = "3";
+        }
+        acsParam.put("device_code",deviceCode);
+        acsParam.put("sub_volume","BR"+box);
+        acsParam.put("height_level",height);
+        acsParam.put("product_area","BLK");
+       AcsUtil.notifyAcsObject("api/wms/returnBox", acsParam);
+    }
+
+    @Override
+    public void downloadData(Integer day, HttpServletResponse response) {
+        if (day>3){
+            throw new BadRequestException("只能导出前三天数据");
+        }
+        Date time = DateUtil.offsetDay(new Date(), -day);
+        LogQuery query = new LogQuery();
+        query.setMessage("forcedFeedShaft_");
+        query.setPage(1);
+        query.setSize(1000);
+        query.setStartTime(time);
+        query.setFilterSql(true);
+        query.setIsRequest(true);
+        JSONObject logPage = luceneLogService.query(query);
+        //forcedFeedShaft
+        int total = logPage.getIntValue("total");
+        List<Map<String,String>> log = new ArrayList<>();
+        if (total>0){
+            PageResult<LogRepositoryDTO> page = (PageResult)logPage.get("page");
+            for (LogRepositoryDTO dto : page) {
+                String message = dto.getMessage();
+                if (!StringUtils.isEmpty(message)){
+                    String requestTime = dto.getRequestTime();
+                    int start = message.indexOf("{");
+                    int end = message.lastIndexOf("}");
+                    if (start>0 && end>start){
+                        String substring = message.substring(start, end + 1);
+                        JSONObject object = JSONObject.parseObject(substring);
+                        String deviceCode = object.getString("device_code");
+                        log.add(MapOf.of("呼叫时间",requestTime,"设备",deviceCode));
+                    }
+                }
+            }
+        }
+        List<Map<String,String>> databases = this.baseMapper.downloadData(time.toString());
+        List<Map<String, String>> ioData = new ArrayList<>();
+        int max = Math.max(databases.size(), log.size());
+        for (int i = 0; i < max; i++) {
+            Map<String, String> item = new HashMap<>();
+            if (databases.size()>i){
+                Map<String, String> item1 = databases.get(i);
+                item.putAll(item1);
+            }else {
+                item.put("下卷设备","");
+                item.put("下卷开始","");
+                item.put("下卷结束","");
+            }
+            if (log.size()>i){
+                Map<String, String> item2 = log.get(i);
+                item.putAll(item2);
+            }else {
+                item.put("设备","");
+                item.put("呼叫时间","");
+            }
+            item.put("分割","");
+            if (item.keySet().size()==6){
+                ioData.add(item);
+            }
+        }
+        String[] strings = new String[6];
+        strings[0] = "下卷设备";
+        strings[1] ="下卷开始";
+        strings[2] ="下卷结束";
+        strings[3] = "分割";
+        strings[4] = "设备";
+        strings[5] = "呼叫时间";
+        new FileUtil().downloadExcelIO(ioData,strings,response);
+    }
     @Override
     public List<JSONObject> recordQuery(List<String> pcsn) {
         if (CollectionUtils.isEmpty(pcsn)){
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
index ccbd70f48..8bf5e2c13 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
@@ -46,7 +46,7 @@ public class BstIvtPackageinfoivtController {
      * @param page      分页参数
      */
     @GetMapping
-    @Log("查询点位库存")
+    @SaIgnore
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(bstIvtPackageinfoivtService.queryAll(whereJson, page)), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java
index b4dd5b081..57a11a602 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.java
@@ -1,5 +1,6 @@
 package org.nl.b_lms.sch.point.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -34,5 +35,6 @@ public interface BstIvtPackageinfoivtMapper extends BaseMapper<BstIvtPackageinfo
      */
     List<SchBaseTask> getTaskList(Set<String> pointCodes1, Set<String> pointCodes2, Set<String> pointCodes3, Set<String> pointCodes4);
 
-
+    List<BstIvtPackageinfoivt> selectNoTaskPoint(@Param("pointStatus") String pointStatus, @Param("ivtStatus")String ivtStatus);
+    List<BstIvtPackageinfoivt> selectNoTargetTaskPoint(@Param("pointStatus") String pointStatus, @Param("ivtStatus")String ivtStatus);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml
index b42c76402..699c3b2c9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml
@@ -80,6 +80,26 @@
         AND (task_status <![CDATA[ < ]]> '07')
         AND (is_delete = '0')
     </select>
+    <select id="selectNoTaskPoint" resultType="org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt">
+        select p.*
+        from bst_ivt_packageinfoivt p
+        where point_status = #{pointStatus}
+        AND is_used = '1'
+        AND ivt_status = #{ivtStatus}
+        AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07'
+        AND (t.point_code1 = p.point_code OR t.point_code2 = p.point_code OR t.point_code3 = p.point_code OR t.point_code4 = p.point_code)
+        AND t.is_delete = '0')
+    </select>
+
+    <select id="selectNoTargetTaskPoint" resultType="org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt">
+        select p.*
+        from bst_ivt_packageinfoivt p
+        where point_status = #{pointStatus}
+          AND is_used = '1'
+          AND ivt_status = #{ivtStatus}
+          AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07'
+           and t.point_code2 = p.point_code  AND t.is_delete = '0')
+    </select>
 
 
 </mapper>
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 54aef8fd9..caa71fa42 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
@@ -3,27 +3,23 @@
 <mapper namespace="org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper">
     <select id="queryKZPoint" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-            point.*,
-            box.*,
-            sub.sale_order_name
+            sch_base_point.*,
+			sub.sale_order_name,
+			sub.package_box_sn,
+            box.box_length,
+			box.box_width,
+			box.box_no,
+			box.box_high
         FROM
-            sch_base_point point
-            LEFT JOIN bst_ivt_boxinfo box ON point.vehicle_code = box.box_no
-            LEFT JOIN (
-                SELECT
-                    MAX(sale_order_name) AS sale_order_name,
-                    package_box_sn
-                FROM
-                    pdm_bi_subpackagerelation
-                WHERE
-                    1 = 1
-                group by package_box_sn
-            ) sub ON point.vehicle_code = sub.package_box_sn
+            sch_base_point
+            LEFT JOIN bst_ivt_boxinfo box ON sch_base_point.vehicle_code = box.box_no
+            LEFT JOIN pdm_bi_subpackagerelation sub ON sch_base_point.vehicle_code = sub.package_box_sn
         WHERE
-            point.is_used = '1'
-            AND point.is_delete = '0'
-            AND point.region_code = 'BKZ01'
-            ORDER BY out_empty_seq
+            sch_base_point.is_used = '1'
+          AND sch_base_point.is_delete = '0'
+          AND sch_base_point.region_code = 'BKZ01'
+        GROUP BY sch_base_point.point_code
+        ORDER BY out_empty_seq
     </select>
 
     <select id="queryLikeOrderRow" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
index 3b1fb1399..2c81ebfba 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
@@ -8,7 +8,6 @@ import lombok.*;
 import lombok.EqualsAndHashCode;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
-import org.nl.b_lms.sch.point.dto.BstIvtPackageinfoivtVO;
 
 /**
  * {@code @Description:} 装箱区点位库存表(BstIvtPackageinfoivt)查询参数类
@@ -17,81 +16,19 @@ import org.nl.b_lms.sch.point.dto.BstIvtPackageinfoivtVO;
  * @since 2024-02-27
  */
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class BstIvtPackageinfoivtVO extends BaseQuery<BstIvtPackageinfoivt> {
+public class BstIvtPackageinfoivtVO extends BstIvtPackageinfoivt {
     /**
-     * 库存记录标识
+     * 子卷重量
      */
-    private Long ivt_id;
+    private String weight;
     /**
-     * 点位编码
+     * 管芯重量
      */
-    private String point_code;
-    /**
-     * 点位名称
-     */
-    private String point_name;
-    /**
-     * 子卷号
-     */
-    private String container_name;
-    /**
-     * 点位类型
-     */
-    private String point_status;
-    /**
-     * 库存状态
-     */
-    private String ivt_status;
-    /**
-     * 区块
-     */
-    private String block;
-    /**
-     * 位置
-     */
-    private String point_location;
-    /**
-     * 顺序号
-     */
-    private BigDecimal sort_seq;
-    /**
-     * 是否启用
-     */
-    private String is_used;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 创建人
-     */
-    private Long create_id;
-    /**
-     * 创建人
-     */
-    private String create_name;
-    /**
-     * 创建时间
-     */
-    private String create_time;
-    /**
-     * 修改人
-     */
-    private Long update_optid;
-    /**
-     * 修改人
-     */
-    private String update_optname;
-    /**
-     * 修改时间
-     */
-    private String update_time;
-    /**
-     * 规划
-     */
-    private String plan;
+    private String paper_weight;
+
+    /** 子卷幅宽 */
+    private Integer split_breadth;
+
+    /** 子卷理论长度 */
+    private Integer split_height;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java
index 44b80f90d..6ab32e846 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java
@@ -26,7 +26,7 @@ public interface IbstIvtPackageinfoivtService extends IService<BstIvtPackageinfo
      * @param pageable  分页参数
      * @return IPage<BstIvtPackageinfoivt>
      */
-    IPage<BstIvtPackageinfoivt> queryAll(Map whereJson, PageQuery pageable);
+    IPage queryAll(Map whereJson, PageQuery pageable);
 
 
     /**
@@ -114,6 +114,10 @@ public interface IbstIvtPackageinfoivtService extends IService<BstIvtPackageinfo
     void deleteAll(Set<String> ids);
 
 
+    List<BstIvtPackageinfoivt> selectEmpPoints(String point_status,String ivt_status);
+    List<BstIvtPackageinfoivt> selectNoTargetTaskPoints(String point_status,String ivt_status);
+
+
 
 
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IstIvtShaftivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IstIvtShaftivtService.java
index acba07657..fb7ab5198 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IstIvtShaftivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IstIvtShaftivtService.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Set;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.common.domain.query.PageQuery;
 
 
@@ -52,6 +53,8 @@ public interface IstIvtShaftivtService extends IService<StIvtShaftivt> {
      */
     void deleteAll(Set<String> ids);
 
+    void handleGroupTask(SchBaseTask baseTask);
+
 
     /**
      * 获取该区域可用的子卷暂存架
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index 77a836a9e..758220be1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -15,10 +15,15 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pda.service.PrintTableTwoService;
+import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
+import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.info.service.IPdmBiContainerinfoService;
+import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl;
+import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper;
+import org.nl.b_lms.sch.point.dto.BstIvtPackageinfoivtVO;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
@@ -26,12 +31,13 @@ import org.nl.b_lms.sch.tasks.first_floor_area.auto.AutoSendVehicleToDjq;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.common.enums.SpecEnum;
 import org.nl.common.utils.MapOf;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -40,15 +46,16 @@ import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -75,12 +82,16 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     private IbstIvtPackageinfoivtService packageinfoivtService;
     @Autowired
     private AutoSendVehicleToDjq autoSendVehicleToDjq;
-
-    @Resource
+    @Autowired
     private IPdmBiContainerinfoService iPdmBiContainerinfoService;
-
-    @Resource
+    @Autowired
     private PrintTableTwoService printTableTwoService;
+    @Autowired
+    private IPdmBiSlittingproductionplanService iPdmBiSlittingproductionplanService;
+    @Autowired
+    private IpdmBiSubpackagerelationService subpackagerelationService;
+
+
 
     /**
      * 查询数据分页
@@ -89,11 +100,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
      * @param page      分页参数
      */
     @Override
-    public IPage<BstIvtPackageinfoivt> queryAll(Map whereJson, PageQuery page) {
+    public IPage     queryAll(Map whereJson, PageQuery page) {
         LambdaQueryWrapper<BstIvtPackageinfoivt> queryWrapper = new QueryWrapper<BstIvtPackageinfoivt>().lambda();
         String isUsed = MapUtil.getStr(whereJson, "is_used");
         String pointCode = MapUtil.getStr(whereJson, "point_code");
         String packageInfoArea = MapUtil.getStr(whereJson, "packageinfo_area");
+        String container_name = MapUtil.getStr(whereJson, "container_name");
         String ivtStatus = MapUtil.getStr(whereJson, "ivt_status");
         if (StringUtils.isNotEmpty(isUsed)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getIs_used, isUsed);
@@ -101,13 +113,40 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         if (StringUtils.isNotEmpty(pointCode)) {
             queryWrapper.like(BstIvtPackageinfoivt::getPoint_code, pointCode);
         }
+        if (StringUtils.isNotEmpty(container_name)) {
+            queryWrapper.eq(BstIvtPackageinfoivt::getContainer_name, container_name);
+        }
         if (StringUtils.isNotEmpty(packageInfoArea)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getPoint_status, packageInfoArea);
         }
         if (StringUtils.isNotEmpty(ivtStatus)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getIvt_status, ivtStatus);
         }
-        return bstIvtPackageinfoivtMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), queryWrapper);
+        Page selectPage = bstIvtPackageinfoivtMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), queryWrapper);
+        List<BstIvtPackageinfoivt> records = selectPage.getRecords();
+        Set<String> containers = records.stream().map(BstIvtPackageinfoivt::getContainer_name).filter(a->StringUtils.isNotEmpty(a)).collect(Collectors.toSet());
+        Map<String,PdmBiSlittingproductionplan> listMap = new HashMap();
+        if (!CollectionUtils.isEmpty(containers)){
+            List<PdmBiSlittingproductionplan> containerInfo = iPdmBiSlittingproductionplanService.list(new QueryWrapper<PdmBiSlittingproductionplan>()
+                    .in("container_name", containers)
+                    .select("container_name", "weight", "paper_weight","split_breadth","split_height"));
+            listMap = containerInfo.stream().collect(HashMap::new,(m, o) -> m.put(o.getContainer_name(),o), HashMap::putAll);
+        }
+        List<BstIvtPackageinfoivtVO> voRecords = new ArrayList<>();
+        for (BstIvtPackageinfoivt record : records) {
+            BstIvtPackageinfoivtVO vo = new BstIvtPackageinfoivtVO();
+            BeanUtils.copyProperties(record,vo);
+            PdmBiSlittingproductionplan planInfo = listMap.get(record.getContainer_name());
+            if (planInfo!=null){
+                vo.setWeight(planInfo.getWeight());
+                vo.setPaper_weight(planInfo.getPaper_weight());
+                vo.setSplit_breadth(planInfo.getSplit_breadth().intValue());
+                vo.setSplit_height(planInfo.getSplit_height().intValue());
+            }
+            voRecords.add(vo);
+        }
+        selectPage.setRecords(voRecords);
+        return selectPage;
     }
 
 
@@ -116,46 +155,36 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
      * @param actionType 1、取货分配 2、放货分配 3、取货完成
      * @author gbx
      */
-    @Transactional(rollbackFor = Exception.class)
     @SneakyThrows
     public Map<String, Object> secondaryAllocationPoint(String taskCode, String actionType) {
-        String pointCode = "";
-        String action = "";
         JSONObject result = new JSONObject();
-        RLock lock = redissonClient.getLock(taskCode);
-        boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
-        try {
-            if (tryLock) {
-                switch (actionType) {
-                    case "1":
-                    case "2":
-                        // 取货分配, 放货分配
-                        pointCode = getNewPoint(taskCode, actionType);
-                        result.put("data", pointCode);
-                        result.put("message", taskCode + "取放货分配成功，新点位为：" + pointCode);
-                        break;
-                    case "3":
-                    case "4":
-                        // 取货完成,放货完成
-                        updatePointStatus(taskCode, actionType);
-                        action = taskCode + "取放货完成！";
-                        result.put("data", action);
-                        result.put("message", taskCode + "取放货完成！");
-                        break;
-                    default:
-                        return null;
-                }
-                result.put("status", HttpStatus.OK.value());
-            } else {
-                log.info("一楼装箱区点位二次分配接口异常，正在分配中!");
-                result.put("status", HttpStatus.BAD_REQUEST.value());
-                result.put("message", "二次分配点位正在分配中，已锁住!");
+        result.put("status", HttpStatus.BAD_REQUEST.value());
+        RedissonUtils.lock(c-> {
+            try {Thread.sleep(1000);} catch (InterruptedException e) {}
+            String pointCode = "";
+            String action = "";
+            switch (actionType) {
+                case "1":
+                case "2":
+                    // 取货分配, 放货分配
+                    pointCode = getNewPoint(taskCode, actionType);
+                    result.put("data", pointCode);
+                    result.put("message", taskCode + "取放货分配成功，新点位为：" + pointCode);
+                    break;
+                case "3":
+                case "4":
+                    // 取货完成,放货完成
+                    updatePointStatus(taskCode, actionType);
+                    action = taskCode + "取放货完成！";
+                    result.put("data", action);
+                    result.put("message", taskCode + "取放货完成！");
+                    break;
+                default:
+                    return null;
             }
-        } finally {
-            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
-                lock.unlock();
-            }
-        }
+            result.put("status", HttpStatus.OK.value());
+            return null;
+        },"sendProductToFirstFloor",null);
         log.info("一楼装箱区点位二次分配" + taskCode + "---------------------------------------------" + result);
         return result;
     }
@@ -184,12 +213,17 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货分配").equals(actionType)) {
                     return baseTask.getPoint_code1();
                 }
-                //else if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货分配").equals(actionType)) {
-                //return baseTask.getPoint_code2();
-                //}
             }
         }
+        //校验是否存在行架任务
+        int count = taskService.count(new QueryWrapper<SchBaseTask>()
+                .eq("task_type", "010911")
+                .eq("is_delete", "0")
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
         //检查是否满足二次分配条件
+        if (count>0){
+            throw new BadRequestException("正在执行行架任务");
+        }
         checkTaskInfo(baseTask);
         //空载具缓存位特殊二次分配逻辑：先判断是否有执行中的行架任务或补空载具任务，如未完成，不分配点位
         if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) ||
@@ -658,6 +692,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 //增加点位库存
                 bstIvtPackageinfoivtMapper.update(null, new UpdateWrapper<BstIvtPackageinfoivt>()
                         .set("container_name", baseTask.getVehicle_code())
+                        .set("update_time", DateUtil.now())
                         .set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷"))
                         .eq("point_code", baseTask.getPoint_code2()));
                 //标记任务放货完成
@@ -738,6 +773,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         UpdateWrapper<BstIvtPackageinfoivt> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("point_code", pointCode);
         updateWrapper.set("ivt_status", "0");
+        updateWrapper.set("update_time", DateUtil.now());
         updateWrapper.set("container_name", null);
         bstIvtPackageinfoivtMapper.update(null, updateWrapper);
         log.info("一楼装箱区二次分配清空库存" + baseTask.getTask_code() + ",执行成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code());
@@ -963,11 +999,9 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     public JSONObject update(JSONObject whereJson) {
         JSONObject result = new JSONObject();
         if (StringUtils.isBlank(whereJson.getString("ivt_status"))) {
-            result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
-            result.put("message", "子卷检验结果为空");
-            return result;
+            throw new BadRequestException("子卷检验结果为空");
         }
-        //"空","0","空载具","1","有子卷","2","合格品","3","管制品","4"
+        //"空","0","空载具","1","有子卷","2","合格品","3","管制品","4",人工卷,"5"
         List<BstIvtPackageinfoivt> dtoList;
         UpdateWrapper<BstIvtPackageinfoivt> updateWrapper = new UpdateWrapper<>();
         //LMS获取MES称重后子卷信息
@@ -975,27 +1009,33 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         //子卷质检合格品和管制品
         if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isBlank(whereJson.getString("pointCode"))) {
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("空")) || whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具")) || whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("有子卷"))) {
-                result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
-                result.put("message", "质检结果只能为合格品或管制品！");
-                return result;
+               throw new BadRequestException("质检结果只能为合格品或管制品");
+            }
+            if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))) {
+                PdmBiSubpackagerelation one = subpackagerelationService.getOne(new QueryWrapper<PdmBiSubpackagerelation>()
+                        .eq("container_name", whereJson.getString("container_name")));
+                if (one!=null){
+                    throw new BadRequestException("包装关系存在,请先解绑MES及LMS包装关系");
+                }
             }
             dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name")));
             if (ObjectUtils.isEmpty(dtoList)) {
-                result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
-                result.put("message", "子卷号或点位信息有误，请核对是否存在！");
-                return result;
+                throw new BadRequestException("子卷号或点位信息有误，请核对是否存在！");
             }
             if (dtoList.size() > 1) {
                 result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
                 result.put("message", "存在多个相同子卷号或点位信息有误，请核对是否存在！");
                 return result;
             }
-            if (dtoList.get(0).getPoint_code().equals("ZXQ_135") || dtoList.get(0).getPoint_code().equals("ZXQ_136")) {
-                result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
-                result.put("message", "请选择点位信息！");
-                return result;
+            BstIvtPackageinfoivt packageinfoivt = dtoList.get(0);
+            String pointCode = packageinfoivt.getPoint_code();
+            if (pointCode.equals("ZXQ_135") || pointCode.equals("ZXQ_136")) {
+                throw new BadRequestException("管制点设置子卷状态时需要选择点位");
             }
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
+                if (packageinfoivt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))){
+                    throw new BadRequestException("当前子卷已设置为管制品");
+                }
                 //获取子卷最新信息
                 jo.put("container_name", whereJson.getString("container_name"));
                 lmsToMesService.getInspectionResult(jo);
@@ -1028,7 +1068,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 }
 
             }
-            updateWrapper.set("container_name", dtoList.get(0).getContainer_name());
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.ZJ,MapOf.of("质检结果",whereJson.getString("ivt_status")),Boolean.TRUE,null, packageinfoivt.getContainer_name());
+            updateWrapper.set("container_name", packageinfoivt.getContainer_name());
             updateWrapper.set("ivt_status", whereJson.getString("ivt_status"));
         }
         //复称
@@ -1051,15 +1092,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         //取放空载具
         else if (StringUtils.isNotBlank(whereJson.getString("pointCode")) && StringUtils.isBlank(whereJson.getString("container_name"))) {
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品")) || whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))) {
-                result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
-                result.put("message", "该点位只能设置为合格品，空载具或空点位，如需设置合格品，需要先扫描子卷号");
-                return result;
+                throw new BadRequestException("人工管制点只能设置空载具或空点位");
             }
             String pointCode = whereJson.getString("pointCode");
             if (StringUtils.isEmpty(pointCode)){
                 throw new BadRequestException("人工管制点不能为空");
             }
-
             HashMap of = MapOf.of("1", "ZXQ_135", "2", "ZXQ_136");
             // "ZXQ_135" : "ZXQ_136";
             JSONObject task = new JSONObject();
@@ -1069,10 +1107,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     .eq("point_code1", of.get(pointCode))
                     .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
             if (count>0){
-                throw new BadRequestException("当前人工管制点已经存在任务,请勿重复下发");
+                throw new BadRequestException("当前人工管制点存在任务,稍后操作");
+            }
+            if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))){
+                autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
             }
-            autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
-
             dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1") ? "ZXQ_135" : "ZXQ_136"));
             updateWrapper.set("container_name", null);
             updateWrapper.set("ivt_status", whereJson.getString("ivt_status"));
@@ -1081,7 +1120,15 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             result.put("message", "请输入子卷号或管制点位信息！");
             return result;
         }
-        updateWrapper.eq("point_code", dtoList.get(0).getPoint_code());
+        String pointCode = dtoList.get(0).getPoint_code();
+        if (dtoList.get(0).getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"))){
+            throw new BadRequestException("满轴缓存位无法设置子卷状态");
+        }
+        List<SchBaseTask> schBaseTasks = taskService.checkHaveTask(pointCode);
+        if (!CollectionUtils.isEmpty(schBaseTasks)){
+            throw new BadRequestException("当前点位"+dtoList.get(0).getPoint_name()+"正在执行搬运任务"+schBaseTasks.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(",")));
+        }
+        updateWrapper.eq("point_code", pointCode);
         updateWrapper.set("update_optid", Long.valueOf(SecurityUtils.getCurrentUserId()));
         updateWrapper.set("update_optname", SecurityUtils.getCurrentNickName());
         updateWrapper.set("update_time", DateUtil.now());
@@ -1168,6 +1215,20 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         return dto;
     }
 
+    @Override
+    public List<BstIvtPackageinfoivt> selectEmpPoints(String point_status, String ivt_status) {
+        if (StringUtils.isEmpty(point_status)||StringUtils.isEmpty(ivt_status)){
+            throw new BadRequestException("点位类型或状态不能为空");
+        }
+        return this.baseMapper.selectNoTaskPoint(point_status, ivt_status);
+    }
 
+    @Override
+    public List<BstIvtPackageinfoivt> selectNoTargetTaskPoints(String point_status, String ivt_status) {
+        if (StringUtils.isEmpty(point_status)||StringUtils.isEmpty(ivt_status)){
+            throw new BadRequestException("点位类型或状态不能为空");
+        }
+        return this.baseMapper.selectNoTargetTaskPoint(point_status, ivt_status);
+    }
 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/StIvtShaftivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/StIvtShaftivtServiceImpl.java
index 6fc7a23f1..ac98d45b6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/StIvtShaftivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/StIvtShaftivtServiceImpl.java
@@ -1,13 +1,24 @@
 package org.nl.b_lms.sch.point.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.dao.StIvtShaftivt;
 import org.nl.b_lms.sch.point.dao.mapper.StIvtShaftivtMapper;
 import org.nl.b_lms.sch.point.service.IstIvtShaftivtService;
 import cn.hutool.core.date.DateUtil;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.SendShaftToCacheTask;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
+import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
@@ -30,6 +41,10 @@ public class StIvtShaftivtServiceImpl extends ServiceImpl<StIvtShaftivtMapper, S
 
     @Resource
     private StIvtShaftivtMapper stIvtShaftivtMapper;
+    @Autowired
+    private IschBaseTaskService taskService;
+    @Autowired
+    private SendShaftToCacheTask sendShaftToCacheTask;
 
 
     /**
@@ -116,6 +131,21 @@ public class StIvtShaftivtServiceImpl extends ServiceImpl<StIvtShaftivtMapper, S
         return entity;
     }
 
+    @Override
+    public void handleGroupTask(SchBaseTask baseTask) {
+        if (StringUtils.isNotBlank(baseTask.getTask_group_id())) {
+            //存在关联的未完成的任务组任务
+            SchBaseTask groupTask = taskService.getOne(new LambdaQueryWrapper<SchBaseTask>()
+                    .eq(SchBaseTask::getTask_group_id, baseTask.getTask_group_id())
+                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_SEND.code("否"))
+                    .ne(SchBaseTask::getTask_id, baseTask.getTask_id())
+                    .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
+            if (groupTask != null) {
+                sendShaftToCacheTask.immediateNotifyAcs(groupTask.getTask_id());
+            }
+        }
+    }
+
 
 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
index fbd3a20b4..e87b80f1d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
@@ -74,6 +74,8 @@ public interface IschBaseTaskService extends IService<SchBaseTask> {
      */
     List<SchBaseTask> getTaskByPlanQzzNoAndDevice(String resourceName);
 
+
+
     /**
      *校验相同任务类型
      */
@@ -111,6 +113,9 @@ public interface IschBaseTaskService extends IService<SchBaseTask> {
      */
     List<SchBaseTask> checkHaveStartTask(String pointCode);
 
+    List<SchBaseTask> checkHaveTrussTask(List<String> codes);
+
+
     /**
      * 同区域、位置 的载具任务 010401
      * @param productArea 区域
@@ -118,6 +123,7 @@ public interface IschBaseTaskService extends IService<SchBaseTask> {
      * @return
      */
     List<SchBaseTask> getNbjEmptyTask(String productArea, String pointLocation);
+
 }
 
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index d5e1de695..332c57e00 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -186,6 +186,20 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         return schBaseTaskMapper.checkHaveStartTask(pointCode);
     }
 
+    @Override
+    public List<SchBaseTask> checkHaveTrussTask(List<String> codes) {
+        LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
+        lam.lt(SchBaseTask::getTask_status, "07")
+                .eq(SchBaseTask::getIs_delete, "0")
+                .and(la2 -> la2.in(SchBaseTask::getPoint_code1, codes)
+                        .or()
+                        .in(SchBaseTask::getPoint_code2, codes)
+                        .or()
+                        .in(SchBaseTask::getPoint_code3, codes)
+                        .or()
+                        .in(SchBaseTask::getPoint_code4, codes));
+        return this.list(lam);
+    }
     @Override
     public List<SchBaseTask> getNbjEmptyTask(String productArea, String pointLocation) {
         return schBaseTaskMapper.getNbjEmptyTask(productArea, pointLocation);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java
index 36ef1c82f..b90de07d7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java
@@ -12,6 +12,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空托盘出库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoBoxExcepTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java
index d58df1392..06bd7a4ce 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java
@@ -12,6 +12,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -21,6 +22,7 @@ import java.util.List;
  * 二期异常出库任务（木箱：浅货位阻挡）
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoExcepionalMoveTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java
index 1dd21b64a..65ea580b4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java
@@ -13,6 +13,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -24,6 +25,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空木箱入库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoInBoxTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
index 1edcc950e..252b350e9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
@@ -13,6 +13,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -25,6 +26,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期入木箱行架任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoInBoxTrussTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java
index ed7eef04f..d60532111 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java
@@ -12,6 +12,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空托盘入库异常任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoInEmpExcepTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
index fe18dc7bb..ef2e7f9a2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
@@ -17,6 +17,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -28,6 +29,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空托盘入库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoInEmpTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
index d708fd964..f9930c5a0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
@@ -40,6 +40,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期入库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoInTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
index 87e611ff3..e328b8783 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
@@ -136,6 +136,7 @@ public class TwoLashTask extends AbstractAcsTask {
                     .task_type(json.getString("acs_task_type"))
                     .start_device_code(json.getString("point_code1"))
                     .next_device_code(json.getString("point_code2"))
+                    .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_code2(json.getString("vehicle_code"))
                     .route_plan_code(getRoutePlanCode(json.getString("point_code1")))
                     .priority(json.getString("priority"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
index 48f777417..79774630f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
@@ -2,6 +2,7 @@ package org.nl.b_lms.sch.tasks;
 
 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;
@@ -12,6 +13,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -23,6 +25,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空木箱移库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoMoveBoxTask extends AbstractAcsTask {
 
     /**
@@ -96,10 +99,17 @@ public class TwoMoveBoxTask extends AbstractAcsTask {
             JSONObject jsonAttrStar = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
             jsonAttrStar.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttrStar.put("storagevehicle_code","");
-            attrTab.update(jsonAttrStar);
 
-            // 更新终点
+
             JSONObject jsonAttrEnd = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
+            //如果是木箱出库锁的话：移库锁保持
+            attrTab.update(jsonAttrStar);
+            if (IOSEnum.LOCK_TYPE.code("木箱出库锁").equals(jsonAttrStar.getString("lock_type"))){
+                jsonAttrEnd.put("lock_type",IOSEnum.LOCK_TYPE.code("木箱出库锁"));
+            }else {
+                jsonAttrEnd.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
+            }
+            // 更新终点
             jsonAttrEnd.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttrEnd.put("storagevehicle_code",taskObj.getString("vehicle_code"));
             attrTab.update(jsonAttrEnd);
@@ -163,7 +173,12 @@ public class TwoMoveBoxTask extends AbstractAcsTask {
         if (StrUtil.isBlank(form.getString("vehicle_code"))) {
             throw new BadRequestException("木箱号不能为空!");
         }
-
+        String vehicle_code = form.getString("vehicle_code");
+        String  point_code1 = form.getString("start_device_code");
+        JSONObject task1 = isSingleTask(point_code1);
+        if ( ObjectUtil.isNotEmpty(task1)) {
+            throw new BadRequestException("载具:"+vehicle_code+"所在点位：" + point_code1 + "存在未完成的任务:"+task1.getString("task_code"));
+        }
         JSONObject json = new JSONObject();
         json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
@@ -178,7 +193,7 @@ public class TwoMoveBoxTask extends AbstractAcsTask {
         json.put("create_id", SecurityUtils.getCurrentUserId());
         json.put("create_name", SecurityUtils.getCurrentUsername());
         json.put("create_time", DateUtil.now());
-        json.put("priority", "1");
+        json.put("priority", "0");
         json.put("acs_task_type", "7");
 
         WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
@@ -197,4 +212,24 @@ public class TwoMoveBoxTask extends AbstractAcsTask {
         JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
         this.updateTaskStatus(taskObj, IOSEnum.ACS_RESULT.code("取消"));
     }
+
+
+    public JSONObject isSingleTask(String point_code) {
+        JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task2 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code2 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+
+        if(ObjectUtil.isNotEmpty(task1)){
+            return task1;
+        }else  if(ObjectUtil.isNotEmpty(task2)){
+            return task2;
+        }else  if(ObjectUtil.isNotEmpty(task3)){
+            return task3;
+        }else  if(ObjectUtil.isNotEmpty(task4)){
+            return task4;
+        }
+
+        return null;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java
new file mode 100644
index 000000000..e3f7a88da
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxExcepTask.java
@@ -0,0 +1,223 @@
+package org.nl.b_lms.sch.tasks;
+
+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 org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
+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.sch.AcsTaskDto;
+import org.nl.wms.sch.manage.AbstractAcsTask;
+import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
+
+/**
+ * 二期空木箱出库任务类（异常口）
+ * Created by Lxy on 2024/1/19.
+ */
+@Service
+public class TwoOutBoxExcepTask extends AbstractAcsTask {
+
+    /**
+     * 处理类
+     */
+    private final String THIS_CLASS = TwoOutBoxExcepTask.class.getName();
+
+    @Override
+    public List<AcsTaskDto> addTask() {
+        /*
+         * 下发给ACS时需要特殊处理
+         */
+        // 任务表
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        JSONArray arr = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' AND point_code2 = 'CK2001' order by create_time").getResultJSONArray(0);
+
+        ArrayList<AcsTaskDto> resultList = new ArrayList<>();
+
+        for (int i = 0; i < arr.size(); i++) {
+            JSONObject json = arr.getJSONObject(i);
+            char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
+            AcsTaskDto dto = AcsTaskDto.builder()
+                    .ext_task_id(json.getString("task_id"))
+                    .task_code(json.getString("task_code"))
+                    .route_plan_code(getRoutePlanCode(json.getString("point_code1")))
+                    .task_type(json.getString("acs_task_type"))
+                    .start_device_code(json.getString("point_code1"))
+                    .next_device_code(json.getString("point_code2"))
+                    .vehicle_code(json.getString("vehicle_code2"))
+                    .vehicle_code2(json.getString("vehicle_code"))
+                    .interaction_json(json.getJSONObject("request_param"))
+                    .priority(json.getString("priority"))
+                    .class_type(json.getString("task_type"))
+                    .dtl_type(String.valueOf(dtl_type))
+                    .product_area(IOSEnum.PRODUCT_AREA.code("BLK"))
+                    .remark(json.getString("remark"))
+                    .build();
+            resultList.add(dto);
+
+            // 更新任务为下发
+            JSONObject paramMap = new JSONObject();
+            paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
+            taskTab.update(paramMap, "task_id ='" + json.getString("task_id") + "'");
+        }
+        return resultList;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateTaskStatus(JSONObject taskObj, String status) {
+        // 仓位表
+        WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+        // 任务表
+        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
+        // 载具信息表
+        WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
+
+        JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0);
+
+        // 更新任务的参数
+        JSONObject map = new JSONObject();
+
+        /*
+         * 1-执行中, 2-完成 ,0-acs取消
+         */
+        // 执行中
+        if (status.equals(TaskStatusEnum.EXECUTING.getCode())) {
+
+            map.put("task_status", TaskStatusEnum.EXECUTING.getCode());
+        }
+
+        // 完成
+        if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
+            map.put("task_status", TaskStatusEnum.FINISHED.getCode());
+            // 更新仓位
+            JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+            jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
+            jsonAttr.put("storagevehicle_code", "");
+            attrTab.update(jsonAttr);
+
+            // 更新载具信息表
+            JSONObject param = new JSONObject();
+            param.put("pcsn", "");
+            extTab.update(param,"pcsn = '"+jsonTask.getString("vehicle_code") +"'");
+
+        }
+        // 取消
+        if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            if (taskObj.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.ISSUE.getCode())) {
+                throw new BadRequestException("任务已执行不能取消");
+            }
+            // 更新任务表删除字段
+            map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
+            // 解锁仓位
+            JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+            jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
+            attrTab.update(jsonAttr);
+        }
+        map.put("update_optid", SecurityUtils.getCurrentUserId());
+        map.put("update_optname", SecurityUtils.getCurrentNickName());
+        map.put("update_time", DateUtil.now());
+        WQLObject.getWQLObject("SCH_BASE_Task").update(map, "task_id = '" + taskObj.getString("task_id") + "'");
+    }
+
+
+    @Override
+    public void findStartPoint() {
+
+    }
+
+    @Override
+    public void findNextPoint() {
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String createTask(JSONObject form) {
+
+        if (StrUtil.isBlank(form.getString("task_type"))) {
+            throw new BadRequestException("业务类型不能为空!");
+        }
+
+        if (StrUtil.isBlank(form.getString("start_device_code"))) {
+            throw new BadRequestException("起点不能为空!");
+        }
+
+        if (StrUtil.isBlank(form.getString("next_device_code"))) {
+            throw new BadRequestException("终点不能为空!");
+        }
+
+        if (StrUtil.isBlank(form.getString("vehicle_code"))) {
+            throw new BadRequestException("木箱号不能为空!");
+        }
+        String vehicle_code = form.getString("vehicle_code");
+        String  point_code1 = form.getString("start_device_code");
+        JSONObject task1 = isSingleTask(point_code1);
+        if ( ObjectUtil.isNotEmpty(task1)) {
+            throw new BadRequestException("载具:"+vehicle_code+"所在点位：" + point_code1 + "存在未完成的任务:"+task1.getString("task_code"));
+        }
+        JSONObject json = new JSONObject();
+        json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
+        json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
+        json.put("task_type", form.getString("task_type"));
+        json.put("vehicle_code", form.getString("vehicle_code"));
+        json.put("vehicle_code2", form.getString("vehicle_code2"));
+        json.put("vehicle_type", form.getString("vehicle_type"));
+        json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
+        json.put("task_group_id", form.getLongValue("task_group_id"));
+        json.put("point_code1", form.getString("start_device_code"));
+        json.put("point_code2", form.getString("next_device_code"));
+        json.put("request_param", form.getString("request_param"));
+        json.put("handle_class", this.getClass().getName());
+        json.put("create_id", SecurityUtils.getCurrentUserId());
+        json.put("create_name", SecurityUtils.getCurrentUsername());
+        json.put("create_time", DateUtil.now());
+        json.put("priority", form.getString("priority"));
+        json.put("acs_task_type", "7");
+
+        WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
+        return json.getString("task_id");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void forceFinish(String task_id) {
+        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+    }
+
+    @Override
+    public void cancel(String task_id) {
+        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        this.updateTaskStatus(taskObj, IOSEnum.ACS_RESULT.code("取消"));
+    }
+
+    public JSONObject isSingleTask(String point_code) {
+        JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task2 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code2 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+
+        if(ObjectUtil.isNotEmpty(task1)){
+            return task1;
+        }else  if(ObjectUtil.isNotEmpty(task2)){
+            return task2;
+        }else  if(ObjectUtil.isNotEmpty(task3)){
+            return task3;
+        }else  if(ObjectUtil.isNotEmpty(task4)){
+            return task4;
+        }
+
+        return null;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
index fb257da7e..4227edede 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
@@ -7,15 +7,21 @@ import cn.hutool.core.util.StrUtil;
 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.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -23,11 +29,14 @@ import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 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.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static org.nl.common.enums.PackageInfoIvtEnum.IVT_STATUS;
 import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
@@ -36,6 +45,8 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空木箱出库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
+@Slf4j
 public class TwoOutBoxTask extends AbstractAcsTask {
 
     /**
@@ -46,40 +57,62 @@ public class TwoOutBoxTask extends AbstractAcsTask {
     @Autowired
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
+    @Autowired
+    private  OutBoxManageService outBoxManageService;
+
+    @Autowired
+    private IschBaseTaskService ischBaseTaskService;
+
     @Override
     public List<AcsTaskDto> addTask() {
         /*
          * 下发给ACS时需要特殊处理
          */
-        // 任务表
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        // 装箱点位库存表
-        WQLObject packTab = WQLObject.getWQLObject("bst_ivt_packageinfoivt");
-
-        JSONArray arr = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' order by create_time").getResultJSONArray(0);
-
         // 判断当前有多少个正在执行中的任务
-        int num = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status IN ('05','06') and is_delete ='0'")
+        int num = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status IN ('05','06') and is_delete ='0'")
                 .getResultJSONArray(0).size();
-
-        // 查询装箱对接位是否有木箱
-        JSONObject jsonPack = packTab.query("point_code = '" + PackageInfoIvtEnum.PACK_POINT.code("装箱对接位01") + "' AND is_used = '1'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonPack.getString("container_name"))) {
-            num += 1;
-        }
-
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         // 如果缓存了4个箱子则不下发任务
-        if (num >= 4) {
+        if (num >= 2) {
             return resultList;
         }
 
+        JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' order by create_time").getResultJSONArray(0);
         for (int i = 0; i < arr.size(); i++) {
-            if (num >= 4) {
+            if (num >= 2) {
                 break;
             }
             JSONObject json = arr.getJSONObject(i);
+            WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+            JSONObject attr = attrTab.query("struct_code = '" + json.getString("point_code1") + "'").uniqueResult(0);
 
+            if (attr.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) {
+                JSONObject 浅Attr = attrTab
+                        .query("zdepth = '1' and row_num = '"+attr.getString("row_num")+"' and col_num = '" + attr.getString("col_num") + "' and layer_num = '"+attr.getString("layer_num")+"'")
+                        .uniqueResult(0);
+                if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))){
+                    if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
+                        continue;
+                    }
+                }else {
+                    if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
+                        // 判断浅货位木箱和深货位木箱是否相同规格
+                        outBoxManageService.createBoxMove(浅Attr);
+                    } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
+                        List<SchBaseTask> list = ischBaseTaskService.list(new QueryWrapper<SchBaseTask>()
+                                .eq("is_delete", "0")
+                                .eq("point_code1", 浅Attr.getString("struct_code"))
+                                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                        if (!CollectionUtils.isEmpty(list)){
+                            continue;
+                        }else {
+                            outBoxManageService.createBoxMove(浅Attr);
+                        }
+                    }else {
+                        continue;
+                    }
+                }
+            }
             char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
             AcsTaskDto dto = AcsTaskDto.builder()
                     .ext_task_id(json.getString("task_id"))
@@ -98,7 +131,6 @@ public class TwoOutBoxTask extends AbstractAcsTask {
                     .remark(json.getString("remark"))
                     .build();
             resultList.add(dto);
-
             num += 1;
         }
         return resultList;
@@ -107,33 +139,32 @@ public class TwoOutBoxTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
-
         // 仓位表
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
-
         // 仓位表
         WQLObject packageinfoivt = WQLObject.getWQLObject("bst_ivt_packageinfoivt");
-
         // 任务表
         WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
-
         JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0);
-
         // 更新任务的参数
         JSONObject map = new JSONObject();
-
         /*
          * 1-执行中, 2-完成 ,0-acs取消
          */
         // 执行中
         if (status.equals(TaskStatusEnum.EXECUTING.getCode())) {
-
             map.put("task_status", TaskStatusEnum.EXECUTING.getCode());
+        }else if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
+        }else {
+            map.put("task_status", TaskStatusEnum.FINISHED.getCode());
         }
-
+        map.put("update_optid", SecurityUtils.getCurrentUserId());
+        map.put("update_optname", SecurityUtils.getCurrentNickName());
+        map.put("update_time", DateUtil.now());
+        WQLObject.getWQLObject("SCH_BASE_Task").update(map, "task_id = '" + taskObj.getString("task_id") + "'");
         // 完成
         if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
-            map.put("task_status", TaskStatusEnum.FINISHED.getCode());
             // 更新仓位
             JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
             jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
@@ -144,11 +175,11 @@ public class TwoOutBoxTask extends AbstractAcsTask {
             packageInfo.put("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具"));
             packageInfo.put("container_name",jsonTask.getString("vehicle_code"));
             packageinfoivt.update(packageInfo);
-            //更新木箱信息
-            //            packageinfoivtService.update(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
-            //                    .eq(BstIvtPackageinfoivt::getPoint_code, jsonTask.getString("point_code2"))
-            //                    .set(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空载具"))
-            //                    .set(BstIvtPackageinfoivt::getContainer_name, jsonTask.getString("vehicle_code")));
+            RedissonUtils.lock(c->{
+                if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
+                    immediateNotifyAcs(null);
+                }
+            },"zjInBound",20,this);
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
@@ -162,15 +193,6 @@ public class TwoOutBoxTask extends AbstractAcsTask {
             jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
             attrTab.update(jsonAttr);
         }
-        map.put("update_optid", SecurityUtils.getCurrentUserId());
-        map.put("update_optname", SecurityUtils.getCurrentNickName());
-        map.put("update_time", DateUtil.now());
-        WQLObject.getWQLObject("SCH_BASE_Task").update(map, "task_id = '" + taskObj.getString("task_id") + "'");
-
-        // 如果是完成则在下发一次
-        if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
-            immediateNotifyAcs(null);
-        }
     }
 
 
@@ -203,7 +225,15 @@ public class TwoOutBoxTask extends AbstractAcsTask {
         if (StrUtil.isBlank(form.getString("vehicle_code"))) {
             throw new BadRequestException("木箱号不能为空!");
         }
-
+        if (StrUtil.isBlank(form.getString("vehicle_code"))) {
+            throw new BadRequestException("木箱号不能为空!");
+        }
+        String vehicle_code = form.getString("vehicle_code");
+        String  point_code1 = form.getString("start_device_code");
+        JSONObject task1 = isSingleTask(point_code1);
+        if ( ObjectUtil.isNotEmpty(task1)) {
+            throw new BadRequestException("载具:"+vehicle_code+"所在点位：" + point_code1 + "存在未完成的任务:"+task1.getString("task_code"));
+        }
         JSONObject json = new JSONObject();
         json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
@@ -239,4 +269,23 @@ public class TwoOutBoxTask extends AbstractAcsTask {
         JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
         this.updateTaskStatus(taskObj, IOSEnum.ACS_RESULT.code("取消"));
     }
+
+    public JSONObject isSingleTask(String point_code) {
+        JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task2 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code2 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+
+        if(ObjectUtil.isNotEmpty(task1)){
+            return task1;
+        }else  if(ObjectUtil.isNotEmpty(task2)){
+            return task2;
+        }else  if(ObjectUtil.isNotEmpty(task3)){
+            return task3;
+        }else  if(ObjectUtil.isNotEmpty(task4)){
+            return task4;
+        }
+
+        return null;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java
index 1c5f2ec2e..69804d842 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java
@@ -12,6 +12,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期空托盘出库任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoOutEmpTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java
index 5061b75c2..1370ee266 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java
@@ -14,6 +14,7 @@ import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -25,6 +26,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * 二期出库异常任务类
  * Created by Lxy on 2024/1/19.
  */
+@Service
 public class TwoOutExceptionalTask extends AbstractAcsTask {
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
index cde67aa04..1d8549ba1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.LashManageServiceImpl;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -20,6 +21,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -193,40 +195,33 @@ public class TwoOutHeapTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
-
         String task_id = taskObj.getString("task_id");
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "' and task_status < '07'").uniqueResult(0);
-
         if (ObjectUtil.isNotEmpty(jsonTask)) {
             if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
                 // 任务为执行之后就不允许取消
                 if (jsonTask.getIntValue("task_status") > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
                     throw new BadRequestException("任务:" + jsonTask.getString("task_code") + "已执行，不可取消");
                 }
-
-                // 更新删除字段
-                jsonTask.put("is_delete", "1");
-                jsonTask.put("update_time", DateUtil.now());
-                taskTab.update(jsonTask);
+                JSONObject param = new JSONObject();
+                param.put("is_delete", "1");
+                param.put("update_time", DateUtil.now());
+                taskTab.update(param,"task_id = '" + task_id+ "'");
             }
-
             if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
-                // 更新任务状态为执行中
-                jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
-                jsonTask.put("update_time", DateUtil.now());
-                taskTab.update(jsonTask);
-
+                JSONObject param = new JSONObject();
+                param.put("task_status", TaskStatusEnum.EXECUTING.getCode());
+                param.put("update_time", DateUtil.now());
+                taskTab.update(param,"task_id = '" + task_id+ "'");
             }
-
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
                 // 更新任务完成
-                jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
-                jsonTask.put("update_time", DateUtil.now());
-                taskTab.update(jsonTask);
-
+                JSONObject param = new JSONObject();
+                param.put("task_status", TaskStatusEnum.FINISHED.getCode());
+                param.put("update_time", DateUtil.now());
+                taskTab.update(param,"task_id = '" + task_id+ "'");
                 // 如果是异常出库口则不需要下发行架任务
                 if (jsonTask.getString("point_code2").equals(IOSEnum.EXCEP_OUT.code("异常出库口"))) {
-                    // 解绑托盘对应关系
                     WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
                     JSONObject ext_jo = veExtTab.query("pcsn = '" + jsonTask.getString("vehicle_code") + "'").uniqueResult(0);
                     if (ObjectUtil.isNotEmpty(ext_jo)) {
@@ -239,11 +234,8 @@ public class TwoOutHeapTask extends AbstractAcsTask {
                     jsonParam.put("device_code", jsonTask.getString("point_code2"));
                     jsonParam.put("vehicle_code", jsonTask.getString("vehicle_code"));
                     jsonParam.put("task_group_id", jsonTask.getString("task_group_id"));
-
                     LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
                     bean1.createLashTask(jsonParam);
-                    // 再次下发：找相同任务组的下发
-                    sendTaskAcs(jsonTask.getString("task_group_id"));
                 }
             }
         }
@@ -307,30 +299,21 @@ public class TwoOutHeapTask extends AbstractAcsTask {
         this.updateTaskStatus(taskObj, IOSEnum.IS_NOTANDYES.code("否"));
     }
 
-    public void sendTaskAcs(String groupTaskId) {
-        /*
-         * 下发给ACS时需要特殊处理
-         */
-        //任务表
+    @Transactional
+    public void sendTaskAcs(String groupTaskId,boolean retry) {
         WQLObject wo_Task = WQLObject.getWQLObject("sch_base_task");
-
-        List<JSONObject>  taskArrAll = wo_Task
-                .query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and task_group_id = '" + groupTaskId + "'" + " and is_delete ='0' ORDER BY create_time")
+        List<JSONObject>  taskArrAll  = wo_Task
+                .query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' ORDER BY create_time")
                 .getResultJSONArray(0).toJavaList(JSONObject.class);
-
-        if (ObjectUtil.isEmpty(taskArrAll)) {
-            taskArrAll = wo_Task
-                    .query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' ORDER BY create_time")
-                    .getResultJSONArray(0).toJavaList(JSONObject.class);
-        }
-
         // 是否下发多个AGV输送出库任务
-        String is_send_many = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_send_many").getValue();
+        if (CollectionUtils.isEmpty(taskArrAll)){
+            return;
+        }
+        List<JSONObject> taskArr;
         // 是否异常出库口任务
         String TWO_EXCEP = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("TWO_EXCEP").getValue();
-
-        List<JSONObject> taskArr;
         if (TWO_EXCEP.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            String is_send_many = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_send_many").getValue();
             if (is_send_many.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
                 // 只允许每个行架点位有一条任务
                 taskArr = sendTask(taskArrAll);
@@ -344,7 +327,6 @@ public class TwoOutHeapTask extends AbstractAcsTask {
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         for (int i = 0; i < taskArr.size(); i++) {
             JSONObject json = taskArr.get(i);
-
             char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
             AcsTaskDto dto = AcsTaskDto.builder()
                     .ext_task_id(json.getString("task_id"))
@@ -361,19 +343,12 @@ public class TwoOutHeapTask extends AbstractAcsTask {
                     .product_area(IOSEnum.PRODUCT_AREA.code("BLK"))
                     .remark(json.getString("remark"))
                     .build();
-
             if (json.getString("vehicle_code2").contains("A")) {
                 dto.setRoute_plan_code("two");
             } else {
                 dto.setRoute_plan_code("normal");
             }
             resultList.add(dto);
-
-            // 更新任务为下发
-            JSONObject paramMap = new JSONObject();
-            paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
-            wo_Task.update(paramMap, "task_id ='" + json.getString("task_id") + "'");
-
             // 调用下发
             if (ObjectUtil.isNotEmpty(resultList)) {
                 JSONArray arr = JSONArray.parseArray(JSON.toJSONString(resultList));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
index cccfa64d9..3ad577019 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
@@ -6,9 +6,11 @@ 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.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvOutServiceImpl;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.LashManageServiceImpl;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
@@ -29,6 +31,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
  * Created by Lxy on 2021/12/22.
  */
 @Service
+@Slf4j
 public class TwoOutTask extends AbstractAcsTask {
     private final String THIS_CLASS = TwoOutTask.class.getName();
 
@@ -73,6 +76,7 @@ public class TwoOutTask extends AbstractAcsTask {
 
         // 判断长度
         if (likeArr.size() >= 2) {
+            log.warn("twoOutTasklikeArr>2");
             return null;
         }
 
@@ -115,11 +119,6 @@ public class TwoOutTask extends AbstractAcsTask {
                     .remark(json.getString("remark"))
                     .build();
             resultList.add(dto);
-
-            // 更新任务为下发
-            JSONObject paramMap = new JSONObject();
-            paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
-            wo_Task.update(paramMap, "task_id ='" + json.getString("task_id") + "'");
         }
         return resultList;
     }
@@ -164,44 +163,33 @@ public class TwoOutTask extends AbstractAcsTask {
         WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
         WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配表
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表
-
         String task_id = taskObj.getString("task_id");
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "' and task_status < '07'").uniqueResult(0);
-
-        if (ObjectUtil.isNotEmpty(jsonTask)) {
-            if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-                // 任务为执行之后就不允许取消
-                if (jsonTask.getIntValue("task_status") > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                    throw new BadRequestException("任务:" + jsonTask.getString("task_code") + "已执行，不可取消");
-                }
-
-                // 更新删除字段
-                jsonTask.put("is_delete", "1");
-                jsonTask.put("update_time", DateUtil.now());
-                taskTab.update(jsonTask);
-
-                // 更新分配明细为：未生成
-                JSONObject map = new JSONObject();
-                map.put("work_status", IOSEnum.WORK_STATUS.code("未生成"));
-                map.put("point_id", "");
-                map.put("task_id", "");
-
-                disTab.update(map, "task_id = '" + task_id + "'");
+        if (ObjectUtil.isEmpty(jsonTask)){
+            return;
+        }
+        if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            if (jsonTask.getIntValue("task_status") > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
+                throw new BadRequestException("任务:" + jsonTask.getString("task_code") + "已执行，不可取消");
             }
-
-            if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
-                // 更新任务状态为执行中
-                jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
-                jsonTask.put("update_time", DateUtil.now());
-                taskTab.update(jsonTask);
-
-            }
-
-            if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-                // 调用标识完成
+            jsonTask.put("is_delete", "1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
+            JSONObject map = new JSONObject();
+            map.put("work_status", IOSEnum.WORK_STATUS.code("未生成"));
+            map.put("point_id", "");
+            map.put("task_id", "");
+            disTab.update(map, "task_id = '" + task_id + "'");
+        }
+        if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
+            jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
+        }
+        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
+            RedissonUtils.lock(c -> {
                 StIvtIostorinvOutServiceImpl bean = SpringContextHolder.getBean(StIvtIostorinvOutServiceImpl.class);
                 bean.finishTask(jsonTask);
-
                 // 判断是否有异常货位的需要更新
                 JSONObject jsonExt = attrTab.query("inv_code = '" + jsonTask.getString("vehicle_code") + "' AND lock_type = '"+IOSEnum.LOCK_TYPE.code("出库异常锁")+"'").uniqueResult(0);
                 if (ObjectUtil.isNotEmpty(jsonExt)) {
@@ -209,27 +197,28 @@ public class TwoOutTask extends AbstractAcsTask {
                     jsonExt.put("inv_code", "");
                     attrTab.update(jsonExt);
                 }
-
-                // 判断此任务组是否全部完成
-                JSONArray resultJSONArray = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' and handle_class = '"+THIS_CLASS+"'")
-                        .getResultJSONArray(0);
-
-                // 下发堆垛机至行架任务（2个行架位）
                 JSONObject jsonParam = new JSONObject();
                 jsonParam.put("device_code",jsonTask.getString("point_code2"));
                 jsonParam.put("vehicle_code",jsonTask.getString("vehicle_code"));
                 jsonParam.put("task_group_id",jsonTask.getString("task_group_id"));
                 jsonParam.put("vehicle_type",jsonTask.getJSONObject("request_param").getString("containerType"));
-
                 LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
                 bean1.createHeapTask(jsonParam);
-
+                // 判断此任务组是否全部完成
+                JSONArray resultJSONArray = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' and handle_class = '"+THIS_CLASS+"'")
+                        .getResultJSONArray(0);
                 if (ObjectUtil.isEmpty(resultJSONArray)) {
-                    this.immediateNotifyAcs(null);
+                    try {
+                        this.immediateNotifyAcs(null);
+                    }catch (Exception ex){
+                        log.warn("载具出库批量下发异常",ex.getMessage());
+                        if (!ex.getMessage().equals("存在相同的任务号")){
+                            throw new BadRequestException(ex.getMessage());
+                        }
+                    }
                 }
-            }
+            }, "cratergv", 30, this);
         }
-
     }
 
     @Override
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/auto/AutoRgvSendTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/auto/AutoRgvSendTask.java
new file mode 100644
index 000000000..5ccdb4cd6
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/auto/AutoRgvSendTask.java
@@ -0,0 +1,27 @@
+package org.nl.b_lms.sch.tasks.auto;
+
+import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.tasks.TwoOutHeapTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.auto.Prun;
+import org.nl.common.utils.RedissonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class AutoRgvSendTask extends Prun {
+
+    @Autowired
+    private TwoOutHeapTask twoOutHeapTask;
+    @Override
+    public void run() {
+        try {
+            RedissonUtils.lock(c -> {
+                log.info("start_sendTaskAcs task......");
+                twoOutHeapTask.sendTaskAcs(null,true);
+                    },"resendrgv", 30, this);
+        }catch (Exception ex){
+            log.error(ex.getMessage());
+        }
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
index 1bc87ccb1..7c7ce2c56 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
@@ -89,20 +89,21 @@ public class DjqTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             //1.校验agv任务取货完成信号
             if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
                 if (!schBaseTask.getRequest_param().equals("98") && !schBaseTask.getRequest_param().equals("99")) {
@@ -120,7 +121,7 @@ public class DjqTask extends AbstractAcsTask {
             //如果起点库存未清空，则清空
             if (ivtPoint.getContainer_name() != null && schBaseTask.getVehicle_code() != null) {
                 if (ivtPoint.getContainer_name().equals(schBaseTask.getVehicle_code())) {
-                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 }
             }
             //3.更新终点库存记录
@@ -129,18 +130,23 @@ public class DjqTask extends AbstractAcsTask {
                 if (schBaseTask.getRequest_param().equals("98")) {
                     //管制区送空载具任务
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("空载具");
-                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 } else if (schBaseTask.getRequest_param().equals("99")) {
                     //管制品重新质检
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品");
-                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 } else {
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("有子卷");
                 }
             } else {
                 ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("有子卷");
             }
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", ivtStatus).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
+            packageinfoivtService.update(null,
+                    new UpdateWrapper<BstIvtPackageinfoivt>()
+                            .set("ivt_status", ivtStatus)
+                            .set("update_time", now)
+                            .set("container_name", schBaseTask.getVehicle_code())
+                            .eq("point_code", schBaseTask.getPoint_code2()));
             //4.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //5.更新并清除预分配位
@@ -181,6 +187,7 @@ public class DjqTask extends AbstractAcsTask {
 
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java
index 1c2c253b6..ec0b144bc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java
@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 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 com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
@@ -85,46 +86,27 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + DateUtil.now() + "被调用---------------------------------------------");
+                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
                 //1.改变起点点位状态
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 //2.更新库存记录
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
                 //3.更改任务状态为完成
                 updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
-                //4.更新并清除预分配位
-                exchangeTaskPoint(schBaseTask);
-                updateWrapper.set(SchBaseTask::getPoint_code4, "");
-                //5.判断是否存在任务组任务
-                packageinfoivtService.handleGroupTask(schBaseTask);
-                //6.待检区或管制区搬运空载具到空载具缓存位完毕，判断是否存在确定终点的空载具缓存位->输送线任务,存在就下发任务
-                //            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
-                //                    //确定终点未下发
-                //                    .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_END.getCode())
-                //                    .eq(SchBaseTask::getPoint_code2, "NBJ1002")
-                //                    .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")).eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
-                //            );
-                //            if (ObjectUtils.isNotEmpty(taskList)) {
-                //                SchBaseTask task = taskList.get(0);
-                //                task.setPoint_code1(schBaseTask.getPoint_code2());
-                //                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
-                //                taskService.update(task);
-                //                //任务下发
-                //                ssxDjwTask.immediateNotifyAcs(task.getTask_id().toString());
-                //            }
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
@@ -159,6 +141,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
@@ -177,6 +160,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
         if (StrUtil.isBlank(pointCode2)) {
             throw new BadRequestException("下一点不能为空");
         }
+        String pointCode3 = form.getString("point_code3");
         //是否立即下发
         boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send"));
         SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder()
@@ -185,7 +169,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
                 .vehicle_code2(form.getString("vehicle_code2"))
                 .point_code1(pointCode1)
                 .point_code2(pointCode2)
-                .point_code3(form.getString("point_code3"))
+                .point_code3(pointCode3)
                 .point_code4(form.getString("point_code4"))
                 .task_group_id(form.getString("task_group_id"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
index bca51e491..dbe3886ef 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
@@ -81,24 +81,25 @@ public class GzqTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS,TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
                 //1.改变起点点位状态
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 //2.更新库存记录
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("管制品")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("管制品")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
                 //3.更改任务状态为完成
                 updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
                 //4.判断是否存在任务组任务
@@ -130,6 +131,7 @@ public class GzqTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java
index 90b24fa54..160cfca9e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java
@@ -87,13 +87,14 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
@@ -102,9 +103,9 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
                 log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
                 //1.改变起点点位状态
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 //2.更新库存记录
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
                 //3.更改任务状态为完成
                 updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
                 //4.更新并清除预分配位
@@ -142,6 +143,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
index 59635c86b..7040b7395 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
@@ -71,8 +71,6 @@ public class MzhcwTask extends AbstractAcsTask {
     @Resource
     private DjqToKzjhcwTask djqToKzjhcwTask;
 
-    @Resource
-    private SsxDjwTask ssxDjwTask;
 
 
     @Override
@@ -109,13 +107,14 @@ public class MzhcwTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         // 执行中
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
@@ -124,63 +123,34 @@ public class MzhcwTask extends AbstractAcsTask {
         }
         // 完成
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + DateUtil.now() + "被调用---------------------------------------------");
+                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
                 //1.更改任务状态为完成
                 updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
                 //2.校验桁架任务取放货完成信号
                 if (StringUtils.isNotBlank(schBaseTask.getCar_no())) {
                     //桁架放货完成信号未发送
                     if (!schBaseTask.getCar_no().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货完成"))) {
-                        packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
+                        packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
                         log.info(schBaseTask.getTask_code() + "检查检查->输送线点位-满轴缓存位，桁架放货完成信号未发送！已在手动点击完成时增加满轴位:" + schBaseTask.getPoint_code2() + "的库存，子卷号为："+schBaseTask.getVehicle_code());
                     }
                 } else {
                     //桁架放货完成信号未发送
-                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
+                    packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
                     log.info(schBaseTask.getTask_code() + "检查检查->输送线点位-满轴缓存位，桁架放货完成信号未发送！已在手动点击完成时增加满轴位:" + schBaseTask.getPoint_code2() + "的库存，子卷号为："+schBaseTask.getVehicle_code());
                 }
                 if (schBaseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"))) {
                     if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
                         //桁架取货完成信号未发送
                         if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
-                            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code3()));
+                            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code3()));
                             log.info(schBaseTask.getTask_code() + "检查检查->四个点任务，桁架取货完成信号未发送！已在手动点击完成时清除空载具位:" + schBaseTask.getPoint_code3() + "的库存");
                         }
                     } else {
                         //桁架取货完成信号未发送
-                        packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code3()));
+                        packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code3()));
                         log.info(schBaseTask.getTask_code() + "检查检查->四个点任务，桁架取货完成信号未发送！已在手动点击完成时清除空载具位:" + schBaseTask.getPoint_code3() + "的库存");
                     }
                 }
-                //3.更新库存记录
-                // packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
-                //4.任务一、待检区AGV搬运任务，查询子卷信息，去分切计划表查找定级数据，桁架任务完成根据子卷定级创建AGV任务将满轴搬运至质检区或管制区
-                //createTaskToDjq(schBaseTask);
-                //5.创建空载具到输送线任务，完成后需要创建空载具缓存位->输送线任务
-                // if (schBaseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"))) {
-                //四个点任务，改变pointCode3点位状态
-                // packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code3()));
-                //校验任务是否存在
-                //                List<String> taskTypes = new ArrayList<>(Collections.singletonList(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")));
-                //                List<SchBaseTask> existTask = taskService.getExistTasks(taskTypes);
-                //                if (ObjectUtils.isEmpty(existTask)) {
-                //                    List<BstIvtPackageinfoivt> kzjPointList = packageinfoivtService
-                //                            .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
-                //                                    .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
-                //                                    .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"))
-                //                                    .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空载具"))
-                //                                    .orderByDesc(BstIvtPackageinfoivt::getSort_seq));
-                //                    JSONObject toSsxTask = new JSONObject();
-                //                    toSsxTask.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
-                //                    toSsxTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"));
-                //                    toSsxTask.put("vehicle_code", schBaseTask.getVehicle_code());
-                //                    //判断空载具缓存位是否有空载具库存,有就叫桁架去任一位置搬空载具,如果暂时没有空载具,定时任务会不断判断是否有空载具
-                //                    toSsxTask.put("task_status", TaskStatusEnum.SURE_END.getCode());
-                //                    //终点为输送线点位
-                //                    toSsxTask.put("point_code2", schBaseTask.getPoint_code1());
-                //                    ssxDjwTask.createTask(toSsxTask);
-                //                }
-                // }
             }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java
index 43a04d0be..6d0ec80b0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java
@@ -79,13 +79,14 @@ public class SendDjqKzjTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
@@ -93,11 +94,11 @@ public class SendDjqKzjTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             //1.改变起点点位状态
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
             //2.更新库存记录
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //4.判断是否存在任务组任务
@@ -117,6 +118,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java
index 38b952f66..7d1dc9601 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java
@@ -79,24 +79,25 @@ public class SendGzqKzjTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             //1.改变起点点位状态
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
             //2.更新库存记录
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //4.判断是否存在任务组任务
@@ -116,6 +117,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
index 98c41664c..7fbba725d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
@@ -78,24 +78,25 @@ public class ShiftingTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             //1.改变起点点位状态
             // packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
             //2.更新终点库存记录,点位状态存到material_code终
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", schBaseTask.getMaterial_code()).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", schBaseTask.getMaterial_code()).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //4.判断是否存在任务组任务
@@ -115,6 +116,7 @@ public class ShiftingTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
index 79f711aff..5eb163a79 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
@@ -83,32 +83,33 @@ public class SsxDjwTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             //1.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //2.校验桁架任务取货完成信号
             if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
                 //桁架取货完成信号未发送
                 if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
-                    packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                    packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                     log.info(schBaseTask.getTask_code() + "检查检查->空载具缓存位-输送线，桁架取货完成信号未发送！已在手动点击完成时清除空载具位:"+schBaseTask.getPoint_code1()+"的库存");
                 }
             } else {
                 //桁架取货完成信号未发送
-                packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 log.info(schBaseTask.getTask_code() + "检查检查->空载具缓存位-输送线，桁架取货完成信号未发送！已在手动点击完成时清除空载具位:"+schBaseTask.getPoint_code1()+"的库存");
             }
             //3.改变起点点位状态
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
index 4a7548935..3eb7e997a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
@@ -108,20 +108,21 @@ public class ZxDjwTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             List<PdmBiSlittingproductionplan> containerInfo = productionPlanService.list(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
                     .eq(PdmBiSlittingproductionplan::getContainer_name, schBaseTask.getVehicle_code()).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
             if (containerInfo == null) {
@@ -132,7 +133,7 @@ public class ZxDjwTask extends AbstractAcsTask {
             //1.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //2.改变起点点位状态
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
             //3.判断是否最后一个子卷：相同木箱号的子卷包装关系如果生成状态：0,且个数等于1且子卷号等于当前载具号，就是最后一个子卷
             List<PdmBiSubpackagerelation> packagerelationList = subpackageRelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, schBaseTask.getVehicle_code2()).eq(PdmBiSubpackagerelation::getStatus, "0"));
             if (packagerelationList.size() == 1 && packagerelationList.get(0).getContainer_name().equals(schBaseTask.getVehicle_code())) {
@@ -144,7 +145,7 @@ public class ZxDjwTask extends AbstractAcsTask {
                 bstIvtBoxinfo.setIs_packing(IOSEnum.IS_NOTANDYES.code("是"));
                 bstIvtBoxinfoMapper.updateById(bstIvtBoxinfo);
                 //5.最后一个子卷，清除装箱位木箱信息
-                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code2()));
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code2()));
                 //装箱位所在区域
                 String block =  packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code,schBaseTask.getPoint_code2())).get(0).getBlock();
                 //6.创建装箱区->待检区或管制区补空任务
@@ -194,6 +195,7 @@ public class ZxDjwTask extends AbstractAcsTask {
 
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
index 90fd7e2d5..5681d5c4f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
@@ -20,6 +20,7 @@ import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.dto.SchBaseTaskVO;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
 import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
@@ -107,20 +108,21 @@ public class ZxqTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
+        String now = DateUtil.now();
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
          if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
-                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+                .set(SchBaseTask::getUpdate_time, now);
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
             if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + now + "被调用---------------------------------------------");
             //            PdmBiSlittingproductionplan containerInfo = productionPlanService.getOne(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
             //                    .eq(PdmBiSlittingproductionplan::getContainer_name, schBaseTask.getVehicle_code()));
             //            if (containerInfo == null) {
@@ -130,9 +132,9 @@ public class ZxqTask extends AbstractAcsTask {
             //            }
             //1.改变起点点位状态
             //提交检查，后续需要acs反馈取货完成信号，在二次分配中清除点位库存
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
             //2.更新库存记录
-            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("合格品")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
+            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("update_time", now).set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("合格品")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
             //4.判断是否存在任务组任务
@@ -178,17 +180,9 @@ public class ZxqTask extends AbstractAcsTask {
                     throw new BadRequestException("该子卷暂无分切计划信息");
                 }
                 //获取纸管长度
-                String containerLength = productionPlanList.get(0).getPaper_tube_or_FRP().equals("1") ? productionPlanList.get(0).getPaper_tube_description() : productionPlanList.get(0).getFRP_description();
-                int maxNum = 0;
-                for (String part : containerLength.split("\\|")) {
-                    String numStr = part.replaceAll("\\D+", "");
-                    if (!numStr.isEmpty()) {
-                        int num = Integer.parseInt(numStr);
-                        if (num > maxNum) {
-                            maxNum = num;
-                        }
-                    }
-                }
+                Integer maxNum = SlitterTaskUtil.getPaperLengthInt(productionPlanList.get(0));
+                String paperSize = SlitterTaskUtil.getPaperSize(productionPlanList.get(0));
+
                 //扩展参数
                 JSONObject param = new JSONObject();
                 //获取木箱信息,未包装的木箱
@@ -216,25 +210,28 @@ public class ZxqTask extends AbstractAcsTask {
                 param.put("containerType", bstIvtBoxinfo.getVehicle_type());
                 //查询是否为最后一个子卷，相同木箱号且状态为生成
                 List<PdmBiSubpackagerelation> packagerelationList = subpackageRelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, schBaseTask.getVehicle_code2()).eq(PdmBiSubpackagerelation::getStatus, "0"));
-                if (packagerelationList.size() == 1 && packagerelationList.get(0).getContainer_name().equals(schBaseTask.getVehicle_code())) {
+                PdmBiSubpackagerelation oneSub = packagerelationList.get(0);
+                String containerName = oneSub.getContainer_name();
+                if (packagerelationList.size() == 1 && containerName.equals(schBaseTask.getVehicle_code())) {
                     //最后子卷
                     param.put("lastOne", "1");
                 } else {
                     param.put("lastOne", "0");
                 }
+
                 //木箱放入子卷数量
                 param.put("boxNo", pdmBiSubpackagerelation.getQuanlity_in_box());
                 //子卷号
                 param.put("barcode", schBaseTask.getVehicle_code());
                 //子卷长度
                 param.put("len", maxNum);
+                param.put("frpModel", paperSize);
                 jo.put("request_param", param.toString());
                 zxDjwTask.createTask(jo);
             }
         }
     }
 
-
     /**
      * 返回实体
      */
@@ -288,6 +285,7 @@ public class ZxqTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java
index ad6614893..13b82b838 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java
@@ -22,6 +22,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -71,9 +72,13 @@ public class AutoSendDjqToGzq extends Prun{
             if (tryLock) {
                 //待检区有管制品且过滤未完成任务
                 List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("管制品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
-                if (ObjectUtils.isEmpty(djqPackageinfoivtList)) {
+                List<BstIvtPackageinfoivt> djqPackageinfoivtList2 = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("管制品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
+                if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
                     return;
                 }
+                if (!CollectionUtils.isEmpty(djqPackageinfoivtList2)){
+                    djqPackageinfoivtList.addAll(djqPackageinfoivtList2);
+                }
                 //管制区有空位且过滤未完成任务
                 List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
                 //todo 新增NG卷放置临时管制区135136，只取空不补空
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
index f404ef633..93204dd36 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
@@ -57,7 +57,7 @@ public class AutoSendGzqToDjq extends Prun{
     @SneakyThrows
     public void sendGzqToDjq() {
         log.info(THIS_CLASS+"-管制区->待检区定时任务开始执行扫描。");
-        RLock lock = redissonClient.getLock(THIS_CLASS);
+        RLock lock = redissonClient.getLock("todjq");
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java
index 67d4d230e..930e7512a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java
@@ -62,7 +62,7 @@ public class AutoSendMzToDjq {
     @SneakyThrows
     public void sendMzqToDjq() {
         log.info(THIS_CLASS+"-满轴->待检区定时任务开始执行扫描。");
-        RLock lock = redissonClient.getLock(THIS_CLASS);
+        RLock lock = redissonClient.getLock("todjq");
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
@@ -72,80 +72,26 @@ public class AutoSendMzToDjq {
                     return;
                 }
                 JSONObject task = new JSONObject();
-                String pointCode2 = null;
                 //满轴有子卷且过滤未完成任务
-                List<BstIvtPackageinfoivt> mzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务取货"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
+
+                List<BstIvtPackageinfoivt> mzqPackageinfoivtList = packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"));
                 if (ObjectUtils.isEmpty(mzqPackageinfoivtList)) {
                     return;
                 }
                 //待检区有库位为空位且过滤未完成任务
-                List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
-                if (ObjectUtils.isEmpty(djqPackageinfoivtList)) {
-                    log.info("满轴->待检区agv自动搬运任务暂无可用空位,子卷号为：" + mzqPackageinfoivtList.get(0).getContainer_name());
-                    throw new BadRequestException("满轴->待检区agv自动搬运任务暂无可用空位,子卷号为：" + mzqPackageinfoivtList.get(0).getContainer_name());
+                List<BstIvtPackageinfoivt> selectEmpPoints = packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"));
+                if (ObjectUtils.isEmpty(selectEmpPoints)) {
+                    log.error(THIS_CLASS+"满轴->待检区agv自动搬运任务暂无可用空位,子卷号为：" + mzqPackageinfoivtList.get(0).getContainer_name());
+                    return;
                 }
-                // 获取浅库位为空的库位和深库位为空的库位
-                Map<Boolean, List<BstIvtPackageinfoivt>> ivtMap = djqPackageinfoivtList.stream()
-                        .collect(Collectors.partitioningBy(r -> r.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位"))));
-                List<BstIvtPackageinfoivt> shallowIvtList = ivtMap.get(true);
-                List<BstIvtPackageinfoivt> deepIvtList = ivtMap.get(false);
                 task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取货二次分配"));
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
                 task.put("vehicle_code", mzqPackageinfoivtList.get(0).getContainer_name());
                 task.put("point_code1", packageinfoivtService.getWaitPoint(mzqPackageinfoivtList.get(0).getBlock(), mzqPackageinfoivtList.get(0).getWait_point_type()));
-                task.put("point_code3", mzqPackageinfoivtList.get(0).getPoint_code());
                 //如果浅库位和深库位都有空位，且为一组，优先深库位
-                if (ObjectUtils.isNotEmpty(shallowIvtList) && ObjectUtils.isNotEmpty(deepIvtList)) {
-                    // 筛选出浅库位为空且对应的深库位也为空的库位的point_code
-                    pointCode2 = shallowIvtList.stream()
-                            .filter(shallowIvt -> deepIvtList.stream()
-                                    .anyMatch(deepIvt -> shallowIvt.getCol_num().equals(deepIvt.getCol_num())))
-                            .findFirst()
-                            .flatMap(shallowIvt -> deepIvtList.stream()
-                                    .filter(deepIvt -> shallowIvt.getCol_num().equals(deepIvt.getCol_num()))
-                                    .findFirst()
-                                    .map(BstIvtPackageinfoivt::getPoint_code))
-                            .orElse(null);
-                    if (pointCode2 == null) {
-                        //如果不同一组，则直接浅库位
-                        pointCode2 = shallowIvtList.get(0).getPoint_code();
-                    }
-                }
-                //如果只有浅库位有空位，则直接取浅库位的编号为终点
-                else if (ObjectUtils.isNotEmpty(shallowIvtList)) {
-                    pointCode2 = shallowIvtList.get(0).getPoint_code();
-                }
-                //如果只有深库位有空位，需要发起浅库位->深库位的移库任务
-                else if (ObjectUtils.isNotEmpty(deepIvtList)) {
-                    //取出深库位的编号为任务终点
-                    String deepPointCode = deepIvtList.get(0).getPoint_code();
-                    //查询对应浅库位的编号为任务起点
-                    List<BstIvtPackageinfoivt> groupIvtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getCol_num, deepIvtList.get(0).getCol_num())).stream().filter(r -> r.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位"))).collect(Collectors.toList());
-                    if (ObjectUtils.isEmpty(groupIvtList)) {
-                        log.info(deepIvtList.get(0).getPoint_code() + "找不到对应的浅货位，请检查点位库存信息！");
-                        throw new BadRequestException(deepIvtList.get(0).getPoint_code() + "找不到对应的浅货位，请检查点位库存信息！");
-                    }
-                    pointCode2 = groupIvtList.get(0).getPoint_code();
-                    //主任务只确定终点
-                    task.put("task_status", TaskStatusEnum.SURE_END.getCode());
-                    task.put("point_code2", pointCode2);
-                    String taskId = djqTask.createTask(task);
-                    //移库任务
-                    JSONObject task1 = new JSONObject();
-                    task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
-                    task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
-                    task1.put("vehicle_code", groupIvtList.get(0).getContainer_name());
-                    task1.put("point_code1", pointCode2);
-                    task1.put("point_code2", deepPointCode);
-                    task1.put("task_group_id", taskId);
-                    task1.put("material_code", groupIvtList.get(0).getIvt_status());
-                    shiftingTask.createTask(task1);
-                    return;
-                }
-                if (pointCode2 != null) {
-                    task.put("point_code2", pointCode2);
-                    djqTask.createTask(task);
-                }
+                task.put("point_code2", selectEmpPoints.get(0).getPoint_code());
+                task.put("point_code3", mzqPackageinfoivtList.get(0).getPoint_code());
+                djqTask.createTask(task);
             } else {
                 log.info("满轴->待检区agv自动搬运任务正在创建被锁住。");
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
index 681b7e588..80c383d43 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
@@ -64,16 +64,16 @@ public class AutoSendVehicleToDjq extends Prun{
     @SneakyThrows
     public void sendVehicleToDjqOrGzq(String isCalling, String block) {
         log.info(THIS_CLASS + "-装箱区->待检区或管制区补空任务开始执行扫描。");
-        RLock lock = redissonClient.getLock(THIS_CLASS);
+        RLock lock = redissonClient.getLock("todjq");
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
                 if (isCalling.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-                    //存在未完成的木箱出库任务
+                    //存在正在执行的行架任务
                     List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
                             .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
                             .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
-                            .eq(SchBaseTask::getTask_type, "010704"));
+                            .eq(SchBaseTask::getTask_type, "010909"));
                     if (ObjectUtils.isNotEmpty(taskList)) {
                         return;
                     }
@@ -89,13 +89,6 @@ public class AutoSendVehicleToDjq extends Prun{
                         zxqIvtList = zxqIvtList.stream().filter(r -> r.getBlock().equals(block)).collect(Collectors.toList());
                     }
                 }
-                //                if ( Integer.parseInt(zxqIvtList.get(0).getSort_seq().toString()) % 2 != 0) {
-                //                    //优先去管制区
-                //                    pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
-                //                } else {
-                //                    pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
-                //                }
-                //todo 新增NG卷放置临时管制区135136，优先去补管制区
                 JSONObject task = new JSONObject();
                 task.put("point_code1", zxqIvtList.get(0).getPoint_code());
                 getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java
index 3c1a4f8d7..0bf2ccfaf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java
@@ -23,6 +23,9 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -32,7 +35,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 @RequiredArgsConstructor
-public class AutoSendVehicleToKzj {
+public class AutoSendVehicleToKzj extends Prun{
 
     private final String THIS_CLASS = AutoSendVehicleToKzj.class.getName();
     @Resource
@@ -70,43 +73,25 @@ public class AutoSendVehicleToKzj {
         RLock lock = redissonClient.getLock(THIS_CLASS);
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
-            if (tryLock) {
-                JSONObject task = new JSONObject();
-                String pointCode2;
-                //todo 只允许2个补空任务,后期需要根据区域动态获取任务数量
-                List<String> taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"), PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")));
-                List<SchBaseTask> existTask = taskService.getExistTasks(taskTypes);
-                if (existTask.size() > 1) {
-                    return;
-                }
-                List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("空载具放货"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
-                //空载具缓存位预分配点
-                if (ObjectUtils.isNotEmpty(kzjIvtList)) {
-                    pointCode2 = kzjIvtList.get(0).getPoint_code();
-                    if (StringUtils.isBlank(pointCode2)) {
-                        return;
-                    }
-                } else {
-                    return;
-                }
-                //存在补空的缓存位数量
-                List<BstIvtPackageinfoivt> packageinfoivtList = packageinfoivtService.getBstIvtPackageinfoivts(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), null,false);
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
-                task.put("point_code4", pointCode2);
-                task.put("point_code2", packageinfoivtService.getWaitPoint(kzjIvtList.get(0).getBlock(), kzjIvtList.get(0).getWait_point_type()));
-                if (packageinfoivtList.size() == 1) {
-                    getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
-                } else {
-                    if (existTask.size() % 2 != 0) {
-                        getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
-                    } else {
-                        //优先去待检区
-                        getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
-                    }
-                }
-            } else {
+            if (!tryLock) {
                 log.info("待检区或管制区->空载具缓存位补空任务正在创建被锁住。");
+                return;
             }
+                List<String> taskTypes = new ArrayList(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")));
+                List<SchBaseTask> existTask = this.taskService.getExistTasks(taskTypes);
+                if (existTask.size() <= 1) {
+                    List<BstIvtPackageinfoivt> empPoints = this.packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"));
+                    List<BstIvtPackageinfoivt> vehiclePoints = this.packageinfoivtService.selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"));
+                    if (!CollectionUtils.isEmpty(empPoints) && !CollectionUtils.isEmpty(vehiclePoints) && existTask.size() < empPoints.size()) {
+                        JSONObject task = new JSONObject();
+                        task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
+                        task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
+                        task.put("point_code1", vehiclePoints.get(0).getPoint_code());
+                        task.put("point_code2", this.packageinfoivtService.getWaitPoint(empPoints.get(0).getBlock(), empPoints.get(0).getWait_point_type()));
+                        task.put("point_code3", empPoints.get(0).getPoint_code());
+                        this.djqToKzjhcwTask.createTask(task);
+                    }
+                }
         } finally {
             if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                 lock.unlock();
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
index cb30e5e87..63260e281 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
@@ -3,6 +3,7 @@ package org.nl.b_lms.sch.tasks.first_floor_area.auto;
 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 com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
@@ -21,6 +22,7 @@ import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.first_floor_area.ZxDjwTask;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
 import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
@@ -55,6 +57,8 @@ public class AutoSendZxToDjw extends Prun{
     private IschBaseTaskService taskService;
     @Resource
     private ZxDjwTask zxDjwTask;
+    @Autowired
+    private ISysParamService iSysParamService;
 
     @Resource
     private LmsToMesServiceImpl lmsToMesServiceImpl;
@@ -96,14 +100,22 @@ public class AutoSendZxToDjw extends Prun{
         if (ObjectUtils.isEmpty(zxwPackageinfoivtList)) {
             return;
         }
+        int count = taskService.count(new QueryWrapper<SchBaseTask>()
+                .eq("task_type", PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"))
+                .eq("is_delete", "0")
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+        if (count>0){
+            return;
+        }
+
         for (BstIvtPackageinfoivt bstIvtPackageinfoivt : zxwPackageinfoivtList) {
             //装箱位上的木箱号
             String boxNo = bstIvtPackageinfoivt.getContainer_name();
             //获取木箱信息,未包装的木箱
             BstIvtBoxinfo bstIvtBoxinfo = bstIvtBoxinfoMapper.selectOne(new LambdaQueryWrapper<BstIvtBoxinfo>().eq(BstIvtBoxinfo::getBox_no, boxNo).ne(BstIvtBoxinfo::getIs_packing, "1"));
             if (bstIvtBoxinfo == null) {
-                log.info("请检查木箱号:" + boxNo + "是否存在或者状态为已装箱!");
-                throw new BadRequestException("请检查木箱号:" + boxNo + "是否存在或者状态为已装箱!");
+                log.warn("请检查木箱号:" + boxNo + "是否存在或者状态为已装箱!");
+                return;
             }
             //检查木箱信息
             checkBoxParams(boxNo, bstIvtBoxinfo);
@@ -113,8 +125,8 @@ public class AutoSendZxToDjw extends Prun{
                             .eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo)
                             .eq(PdmBiSubpackagerelation::getStatus, "0"));
             if (ObjectUtils.isEmpty(relationList)) {
-                log.info("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!");
-                throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!");
+                log.warn("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!");
+                return;
             }
             //装箱区有子卷且没有正在进行的装箱任务
             List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), "", "", "");
@@ -158,6 +170,7 @@ public class AutoSendZxToDjw extends Prun{
                             } else {
                                 param.put("lastOne", IOSEnum.IS_NOTANDYES.code("否"));
                             }
+                            String paperSize = SlitterTaskUtil.getPaperSize(productionPlanList.get(0));
                             //获取木箱高度等级
                             param.put("heightLevel", getHeightLevel(bstIvtBoxinfo));
                             //获取子卷长度
@@ -169,14 +182,10 @@ public class AutoSendZxToDjw extends Prun{
                             //木箱需放入子卷数量
                             param.put("boxNo", relationList.get(0).getQuanlity_in_box());
                             //子卷号
+                            param.put("frpModel", paperSize);
                             param.put("barcode", containerName);
                             jo.put("request_param", param.toString());
                             zxDjwTask.createTask(jo);
-                            //                        try {
-                            //                            transferBoxPackageToMes(relationList, bstIvtBoxinfo);
-                            //                        } catch (Exception ex) {
-                            //                            log.error("子卷装箱异常,传输子卷包装关系至MES接口捕获异常信息：" + ex);
-                            //                        }
                         }
                     }
                 } else {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java
new file mode 100644
index 000000000..ae2048170
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java
@@ -0,0 +1,230 @@
+package org.nl.b_lms.sch.tasks.slitter;
+
+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.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
+import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
+import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.TaskUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.sch.AcsTaskDto;
+import org.nl.wms.sch.AcsUtil;
+import org.nl.wms.sch.manage.AbstractAcsTask;
+import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.nl.wms.sch.tasks.InHotTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @Author: tq
+ * @Description: 空轴退回的AGV任务
+ * @Date: 2025/4/25
+ */
+@Slf4j
+@Service
+public class ReturnShaftAgvTask extends AbstractAcsTask {
+    private final String THIS_CLASS = ReturnShaftAgvTask.class.getName();
+    @Autowired
+    private IschBaseTaskService taskService;
+    @Autowired
+    private IBstIvtCutpointivtService bcutpointivtService;
+    @Autowired
+    private IBstIvtShafttubeivtService shafttubeivtService;
+    @Autowired
+    private SendShaftToCacheTask sendShaftToCacheTask;
+
+    @Override
+    public List<AcsTaskDto> addTask() {
+        /*
+         * 下发给ACS时需要特殊处理
+         */
+        List<SchBaseTask> taskList = taskService.getIssueTasks(THIS_CLASS);
+
+        ArrayList<AcsTaskDto> resultList = new ArrayList<>();
+        String agv_system_type = "2";
+        for (SchBaseTask task : taskList) {
+            String requestParam = task.getRequest_param();
+            JSONObject requestParamObj = JSONObject.parseObject(requestParam);
+            AcsTaskDto dto = AcsTaskDto.builder()
+                    .ext_task_id(task.getTask_id())
+                    .task_code(task.getTask_code())
+                    .task_type(task.getAcs_task_type())
+                    .start_device_code(task.getPoint_code1())
+                    .next_device_code(task.getPoint_code2())
+                    .start_device_code2(task.getPoint_code3())
+                    .next_device_code2(task.getPoint_code4())
+                    .vehicle_code(task.getVehicle_code())
+                    .agv_system_type(agv_system_type)
+                    .priority(task.getPriority())
+                    .remark(task.getRemark())
+                    .product_area(task.getProduct_area())
+                    .build();
+            resultList.add(dto);
+        }
+        return resultList;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateTaskStatus(JSONObject taskObj, String status) {
+        SchBaseTask task = taskService.getById(taskObj.getString("task_id"));
+        if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
+            // 更新任务状态为执行中
+            task.setTask_status(TaskStatusEnum.EXECUTING.getCode());
+        }
+        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
+            if (TaskStatusEnum.FINISHED.getCode().equals(task.getTask_status())) {
+                throw new BadRequestException("任务[" + task.getTask_code() + "]已经完成！");
+            }
+            task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+            JSONObject requestParam = JSONObject.parseObject(task.getRequest_param());
+            // 互换资源
+            // update: 在acs请求取货完成就已经清空点位信息
+            String endPoint = task.getPoint_code2();
+            BstIvtCutpointivt endPointObj = bcutpointivtService.getPintByAgvCode(endPoint, false);
+            TaskUtils.pointMaintenanceInventory(task, endPointObj, "4");
+            bcutpointivtService.updateById(endPointObj);
+
+            BstIvtShafttubeivt putWaitPoint = shafttubeivtService.getOne(new LambdaQueryWrapper<BstIvtShafttubeivt>()
+                    .eq(BstIvtShafttubeivt::getPoint_location, endPointObj.getPoint_location())
+                    .eq(BstIvtShafttubeivt::getPoint_type, "8"));
+            if (ObjectUtil.isEmpty(putWaitPoint)) {
+                throw new BadRequestException("未找到可存放气涨轴规格「" + endPoint + "」的等待点位");
+            }
+            log.info("点位信息：{}", endPointObj);
+
+            // 创建行架任务
+            String task_group_id = org.nl.common.utils.IdUtil.getStringId();
+            String task1 = null;
+            String task2 = null;
+            if (ObjectUtil.isNotEmpty(endPointObj.getQzz_no1())) {
+                String qzzSize = endPointObj.getQzz_no1();
+                String qzz = qzzSize.substring(qzzSize.length() - 3);
+                String[] split = qzz.split("-");
+                String size = split[0];
+                String qzz_generation = split[1];
+                List<BstIvtShafttubeivt> shafttubeivts = checkIsHaveEmptyPoint(size, qzz_generation);
+                if (shafttubeivts.size() == 0) {
+                    throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
+                }
+                JSONObject param = new JSONObject();
+                param.put("point_code1", endPointObj.getTruss_point_code1());
+                param.put("point_code2", putWaitPoint.getPoint_code());
+                // hint: 当前分切计划的气涨轴尺寸
+                param.put("qzz_size", qzzSize);
+                param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
+                param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位"));
+                param.put("is_bushing", "0");
+                param.put("task_group_id", task_group_id);
+                task1 = sendShaftToCacheTask.createTask(param);
+            }
+            if (ObjectUtil.isNotEmpty(endPointObj.getQzz_no2())) {
+                String qzzSize = endPointObj.getQzz_no2();
+                String qzz = qzzSize.substring(qzzSize.length() - 3);
+                String[] split = qzz.split("-");
+                String size = split[0];
+                String qzz_generation = split[1];
+                List<BstIvtShafttubeivt> shafttubeivts = checkIsHaveEmptyPoint(size, qzz_generation);
+                if (shafttubeivts.size() == 0) {
+                    throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
+                }
+                JSONObject param = new JSONObject();
+                param.put("point_code1", endPointObj.getTruss_point_code2());
+                param.put("point_code2", putWaitPoint.getPoint_code());
+                // hint: 当前分切计划的气涨轴尺寸
+                param.put("qzz_size", qzzSize);
+                param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位"));
+                param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
+                param.put("is_bushing", "0");
+                param.put("task_group_id", task_group_id);
+                task2 = sendShaftToCacheTask.createTask(param);
+            }
+            sendShaftToCacheTask.immediateNotifyAcs(ObjectUtil.isNotEmpty(task1) ? task1 : task2);
+        }
+        // 取消
+        if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+        }
+        task.setUpdate_time(DateUtil.now());
+        taskService.updateById(task);
+    }
+
+    private List<BstIvtShafttubeivt> checkIsHaveEmptyPoint(String size, String qzz_generation) {
+        // 获取空位
+        List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskEmptyShaftCache(size, qzz_generation, "0");
+        return shafttubeivts;
+    }
+
+
+    @Override
+    public String createTask(JSONObject form) {
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String currentUsername = SecurityUtils.getCurrentUsername();
+
+        SchBaseTask task = new SchBaseTask();
+        task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
+        task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+        task.setPoint_code1(form.getString("point_code1"));
+        task.setPoint_code2(form.getString("point_code2"));
+        task.setVehicle_code(form.getString("vehicle_code1"));
+        task.setVehicle_code2(form.getString("vehicle_code2"));
+        task.setAcs_task_type("3");
+        task.setIs_delete("0");
+        task.setRequest_param(form.toJSONString());
+        task.setTask_type(form.getString("task_type"));
+        task.setProduct_area(form.getString("product_area"));
+        task.setRequest_param(JSONObject.toJSONString(form));
+        task.setCreate_id(currentUserId);
+        task.setCreate_name(currentUsername);
+        task.setCreate_time(DateUtil.now());
+        task.setHandle_class(THIS_CLASS);
+        //根据类型获取对应的任务优先级
+        JSONObject priority_jo = WQL.getWO("PDA_COOLIN").addParam("flag", "3").addParam("task_type", task.getTask_type()).process().uniqueResult(0);
+        if (ObjectUtil.isEmpty(priority_jo)) {
+            task.setPriority("1");
+        } else {
+            task.setPriority(priority_jo.getString("value"));
+        }
+        taskService.save(task);
+        this.immediateNotifyAcs(null);
+        return task.getTask_id();
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void forceFinish(String task_id) {
+        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+    }
+
+
+    @Override
+    public void cancel(String task_id) {
+        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        this.updateTaskStatus(taskObj, "0");
+    }
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java
new file mode 100644
index 000000000..81f78f740
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java
@@ -0,0 +1,248 @@
+package org.nl.b_lms.sch.tasks.slitter;
+
+
+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.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
+import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
+import org.nl.b_lms.sch.point.service.IstIvtShaftivtService;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.TaskUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.sch.AcsTaskDto;
+import org.nl.wms.sch.AcsUtil;
+import org.nl.wms.sch.manage.AbstractAcsTask;
+import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: tq
+ * @Description: 桁架从套轴对接位送气涨轴库
+ * @Date: 2025/4/25
+ */
+@Slf4j
+@Service
+public class SendShaftToCacheTask extends AbstractAcsTask {
+    private final String THIS_CLASS = SendShaftToCacheTask.class.getName();
+    @Autowired
+    private IschBaseTaskService taskService;
+    @Autowired
+    private IBstIvtShafttubeivtService shafttubeivtService;
+    @Autowired
+    private IBstIvtCutpointivtService bcutpointivtService;
+    @Autowired
+    private IstIvtShaftivtService shaftivtService;
+    @Autowired
+    AcsUtil acsUtil;
+
+    @Override
+    public List<AcsTaskDto> addTask() {
+        /*
+         * 下发给ACS时需要特殊处理
+         */
+        List<SchBaseTask> taskList = taskService.getIssueTasks(THIS_CLASS);
+
+        ArrayList<AcsTaskDto> resultList = new ArrayList<>();
+        String agv_system_type = "2";
+        for (SchBaseTask task : taskList) {
+            AcsTaskDto dto = AcsTaskDto.builder()
+                    .ext_task_id(task.getTask_id())
+                    .task_code(task.getTask_code())
+                    .task_type(task.getAcs_task_type())
+                    .start_device_code(task.getPoint_code1())
+                    .next_device_code(task.getPoint_code2())
+                    .start_device_code2(task.getPoint_code3())
+                    .next_device_code2(task.getPoint_code4())
+                    .vehicle_code(task.getVehicle_code())
+                    .agv_system_type(agv_system_type)
+                    .priority(task.getPriority())
+                    .remark(task.getRemark())
+                    .product_area(task.getProduct_area())
+                    .build();
+            resultList.add(dto);
+        }
+        return resultList;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateTaskStatus(JSONObject taskObj, String status) {
+        SchBaseTask task = taskService.getById(taskObj.getString("task_id"));
+        if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
+            // 更新任务状态为执行中
+            task.setTask_status(TaskStatusEnum.EXECUTING.getCode());
+        }
+
+        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
+            // 更改任务状态为完成
+            task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+            String startPoint = task.getPoint_code1();
+            String prefix = startPoint.substring(0, startPoint.length() - 2);
+            String endPoint = task.getPoint_code2();
+            BstIvtCutpointivt startPointObj = bcutpointivtService.getPintByAgvCode(prefix, false);
+            BstIvtShafttubeivt endPointObj = shafttubeivtService.getByPointCode(endPoint, false);
+            // 起点清空
+            if (startPoint.contains("A")) {
+                startPointObj.setQzz_no1("");
+            }
+            if (startPoint.contains("B")) {
+                startPointObj.setQzz_no2("");
+            }
+            TaskUtils.pointMaintenance(task, startPointObj);
+            bcutpointivtService.updateById(startPointObj);
+
+            endPointObj.setHave_qzz("1");
+            TaskUtils.updateOptMessageByBShaftPoint(endPointObj);
+            shafttubeivtService.updateById(endPointObj);
+            BstIvtCutpointivt startPointParam = bcutpointivtService.getPintByAgvCode(prefix, false);
+            if (ObjectUtil.isEmpty(startPointParam.getQzz_no1()) && ObjectUtil.isEmpty(startPointParam.getQzz_no2())) {
+                startPointParam.setPoint_status("1");
+                bcutpointivtService.updateById(startPointParam);
+            }
+            shaftivtService.handleGroupTask(task);
+        }
+        // 取消
+        if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+        }
+        TaskUtils.updateOptMessageByTask(task);
+        taskService.updateById(task);
+    }
+
+
+    @Override
+    public String createTask(JSONObject form) {
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String currentUsername = SecurityUtils.getCurrentUsername();
+
+        String point_code1 = form.getString("point_code1");
+        JSONObject task1 = isSingleTask(point_code1);
+        if (ObjectUtil.isNotEmpty(task1)) {
+            throw new BadRequestException("所在点位：" + point_code1 + "存在未完成的任务:" + task1.getString("task_code"));
+        }
+        SchBaseTask task = new SchBaseTask();
+        task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
+        task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+        task.setPoint_code1(form.getString("point_code1"));
+        task.setPoint_code2(form.getString("point_code2"));
+        task.setVehicle_code(form.getString("qzz_size"));
+        task.setTask_type("010815");
+        task.setAcs_task_type("6");
+        task.setTask_group_id(form.getString("task_group_id"));
+        task.setIs_delete("0");
+        task.setRequest_param(form.toJSONString());
+        task.setTask_type(form.getString("task_type"));
+        task.setProduct_area(form.getString("product_area"));
+        task.setCreate_id(currentUserId);
+        task.setCreate_name(currentUsername);
+        task.setCreate_time(DateUtil.now());
+        task.setHandle_class(THIS_CLASS);
+        //根据类型获取对应的任务优先级
+        JSONObject priority_jo = WQL.getWO("PDA_COOLIN").addParam("flag", "3").addParam("task_type", task.getTask_type()).process().uniqueResult(0);
+        if (ObjectUtil.isEmpty(priority_jo)) {
+            task.setPriority("1");
+        } else {
+            task.setPriority(priority_jo.getString("value"));
+        }
+        taskService.save(task);
+//        this.immediateNotifyAcs(null);
+        return task.getTask_id();
+    }
+
+    @Override
+    public void forceFinish(String task_id) {
+        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+    }
+
+
+    @Override
+    public void cancel(String task_id) {
+        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        this.updateTaskStatus(taskObj, "0");
+    }
+
+    @Override
+    public JSONObject immediateNotifyAcs(String task_id) {
+        try {
+            Thread.sleep(1000);
+        } catch (Exception ex) {
+
+        }
+
+        List<SchBaseTask> taskList = new ArrayList<>();
+        SchBaseTask baseTask = taskService.getById(task_id);
+        taskList.add(baseTask);
+        ArrayList<AcsTaskDto> resultList = new ArrayList<>();
+        String agv_system_type = "2";
+        for (SchBaseTask task : taskList) {
+            String requestParam = task.getRequest_param();
+            JSONObject requestParamObj = JSONObject.parseObject(requestParam);
+            AcsTaskDto dto = AcsTaskDto.builder()
+                    .ext_task_id(task.getTask_id())
+                    .task_code(task.getTask_code())
+                    .task_type(task.getAcs_task_type())
+                    .start_device_code(task.getPoint_code1())
+                    .next_device_code(task.getPoint_code2())
+                    .start_device_code2(task.getPoint_code3())
+                    .next_device_code2(task.getPoint_code4())
+                    .vehicle_code(task.getVehicle_code())
+                    .agv_system_type(agv_system_type)
+                    .priority(task.getPriority())
+                    .remark(task.getRemark())
+                    .product_area(task.getProduct_area())
+                    .build();
+            resultList.add(dto);
+        }
+//        List<AcsTaskDto> taskList = this.schedule();
+        if (ObjectUtil.isNotEmpty(resultList)) {
+            JSONArray arr = JSONArray.parseArray(JSON.toJSONString(resultList));
+            if (acsUtil == null) {
+                return AcsUtil.notifyAcs("api/wms/task", arr);
+            } else {
+                return acsUtil.notifyAcs3("api/wms/task", arr);
+            }
+        }
+        return null;
+
+    }
+
+    public JSONObject isSingleTask(String point_code) {
+        JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task2 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code2 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+
+        if (ObjectUtil.isNotEmpty(task1)) {
+            return task1;
+        } else if (ObjectUtil.isNotEmpty(task2)) {
+            return task2;
+        } else if (ObjectUtil.isNotEmpty(task3)) {
+            return task3;
+        } else if (ObjectUtil.isNotEmpty(task4)) {
+            return task4;
+        }
+
+        return null;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java
index aa91ef545..9eeed4658 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java
@@ -4,6 +4,7 @@ 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.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,6 +17,8 @@ import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.TaskUtils;
@@ -95,6 +98,9 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
 
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
             task.setTask_status(TaskStatusEnum.FINISHED.getCode());
+            JSONObject requestParam = JSONObject.parseObject(task.getRequest_param());
+            //子卷号
+            JSONArray containers = requestParam.getJSONArray("containers");
             String pointCode1 = task.getPoint_code1();
             String pointCode2 = task.getPoint_code2();
             StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, false);
@@ -104,24 +110,76 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
                 point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false);
             }
             // 点位数据更新
-            String tmpUpQzzNo = point1.getUp_qzzno();
-            String tmpDownQzzNo = point1.getDown_qzzno();
             point1.setUp_qzzno(point2.getQzz_no1());
             point1.setDown_qzzno(point2.getQzz_no2());
             log.info("起点数据：{}", point1);
             log.info("终点数据：{}", point2);
             // 更新分切计划
-            // 下来的分切计划状态：06 -> 09
-            PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
-            p.setStatus("09");
-            p.setEnd_time(DateUtil.now());
-            TaskUtils.updateOptMessageBySlitterPlan(p);
-            List<String> downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo)
-                    .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
-            log.info("即将下卷的上下轴的气胀轴编码数据：{}", downQzzNos);
-            slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
-                    .in(PdmBiSlittingproductionplan::getQzzno, downQzzNos));
+            // 下来的分切计划状态：06 -> 09, 设置重量
+            List<String> downCons = containers.toJavaList(String.class);
+            log.info("即将下卷的上下轴的子卷号数据1：{}", downCons);
+            List<PdmBiSlittingproductionplan> downPlans = slittingproductionplanService.getByContainerNames(downCons);
+            log.info("即将下卷的上下轴的子卷号数据2：{}", downPlans);
+            SlitterTaskUtil.setPaperWeightStr(point1.getRemark(), downPlans);
+            log.info("即将下卷的上下轴的子卷号数据3：{}", downPlans);
+            List<PdmBiSlittingproductionplan> needUpdates = new ArrayList<>();
+            // 绑定气胀轴编码（可能没有气胀轴编码）
+            List<PdmBiSlittingproductionplan> deviceUpPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_UP.equals(p.getUp_or_down())).collect(Collectors.toList());
+            List<PdmBiSlittingproductionplan> deviceDownPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_DOWN.equals(p.getUp_or_down())).collect(Collectors.toList());
+            if (deviceUpPlans.size() > 0) {
+                PdmBiSlittingproductionplan upDemoPlan = deviceUpPlans.get(0);
+                String resourceName = upDemoPlan.getResource_name();
+                String qzzNO = resourceName.substring(0, 2)
+                        + resourceName.substring(resourceName.length() - 2)
+                        + upDemoPlan.getSplit_group()
+                        + TaskUtils.getDateTime("yyMMddHHmmss") + "-"
+                        + upDemoPlan.getUp_or_down();
+                for (PdmBiSlittingproductionplan deviceUpPlan : deviceUpPlans) {
+                    deviceUpPlan.setQzzno(qzzNO);
+                    deviceUpPlan.setStatus("09");
+                    deviceUpPlan.setEnd_time(DateUtil.now());
+                    TaskUtils.updateOptMessageBySlitterPlan(deviceUpPlan);
+                    needUpdates.add(deviceUpPlan);
+                }
+            }
+            if (deviceDownPlans.size() > 0) {
+                PdmBiSlittingproductionplan downDemoPlan = deviceDownPlans.get(0);
+                String resourceName = downDemoPlan.getResource_name();
+                String qzzNO = resourceName.substring(0, 2)
+                        + resourceName.substring(resourceName.length() - 2)
+                        + downDemoPlan.getSplit_group()
+                        + TaskUtils.getDateTime("yyMMddHHmmss") + "-"
+                        + downDemoPlan.getUp_or_down();
+                for (PdmBiSlittingproductionplan deviceDownPlan : deviceDownPlans) {
+                    deviceDownPlan.setQzzno(qzzNO);
+                    deviceDownPlan.setStatus("09");
+                    deviceDownPlan.setEnd_time(DateUtil.now());
+                    TaskUtils.updateOptMessageBySlitterPlan(deviceDownPlan);
+                    needUpdates.add(deviceDownPlan);
+                }
+            }
+
+//            downPlans.forEach(downPlan -> {
+//                downPlan.setStatus("09");
+//                downPlan.setEnd_time(DateUtil.now());
+//                TaskUtils.updateOptMessageBySlitterPlan(downPlan);
+//            });
+            log.info("即将下卷的上下轴的子卷号数据4-需要更新的新数组：{}", needUpdates);
+//            slittingproductionplanService.updateBatchById(downPlans);
+            for (int i = 0; i < needUpdates.size(); i++) {
+                boolean flag = slittingproductionplanService.updateById(needUpdates.get(i));
+                log.info(flag+"即将下卷的上下轴的子卷号数据5：{}", needUpdates);
+            }
+            // 获取气胀轴编码
+            // 筛选上下轴各一条
+            PdmBiSlittingproductionplan upPlan = downPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null);
+            PdmBiSlittingproductionplan downPlan = downPlans.stream().filter(p -> "2".equals(p.getUp_or_down())).findFirst().orElse(null);
+            String tmpUpQzzNo = upPlan != null ? upPlan.getQzzno() : "";
+            String tmpDownQzzNo = downPlan != null ? downPlan.getQzzno() : "";
+            // 设置完了就清空
+            point1.setRemark("");
             // 上去的分切计划状态：04 -> 05
+            PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
             p.setStatus("05");
             p.setEnd_time("");
             List<String> upQzzNos = Stream.of(point2.getQzz_no1(), point2.getQzz_no2())
@@ -129,25 +187,31 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
             log.info("即将上卷的气胀轴编码数据：{}", upQzzNos);
             if (upQzzNos.size() > 0) {
                 List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByQzzNos(upQzzNos);
-                PdmBiSlittingproductionplan pp = plans.get(0);
-                if (pp.getContainer_name().contains("虚拟")) {
-                    // 如果是虚拟卷，需要执行删除标记，并且清空数据
-                    // 将分切计划删除，设备禁用
-                    plans.forEach(p1 -> {
-                        p1.setIs_delete("1");
-                        p1.setQzzno("");
-                        p1.setUpdate_time(DateUtil.now());
-                        p1.setUpdate_optname(SecurityUtils.getCurrentNickName());
-                        p1.setUpdate_optid(SecurityUtils.getCurrentUserId());
-                    });
-                    slittingproductionplanService.updateBatchById(plans);
-                    // 设备禁用
-                    point1.setIs_used("0");
-                    point1.setUp_qzzno("");
-                    point1.setDown_qzzno("");
-                } else {
-                    slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
-                            .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos));
+                if (plans.size() > 0) {
+                    PdmBiSlittingproductionplan pp = plans.get(0);
+                    // 需要把重量记录到分切机上
+                    point1.setRemark(SlitterTaskUtil.getPaperWeightStr(plans));
+                    if (pp.getContainer_name().contains("虚拟")) {
+                        // 如果是虚拟卷，需要执行删除标记，并且清空数据
+                        // 将分切计划删除，设备禁用
+                        plans.forEach(p1 -> {
+                            p1.setIs_delete("1");
+                            p1.setQzzno("");
+                            p1.setUpdate_time(DateUtil.now());
+                            p1.setUpdate_optname(SecurityUtils.getCurrentNickName());
+                            p1.setUpdate_optid(SecurityUtils.getCurrentUserId());
+                        });
+//                        slittingproductionplanService.updateBatchById(plans);
+                        for (int i = 0; i < plans.size(); i++) {
+                            slittingproductionplanService.updateById(plans.get(i));
+                        }
+                        // 设备禁用
+                        point1.setUp_qzzno("");
+                        point1.setDown_qzzno("");
+                    } else {
+                        slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+                                .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos));
+                    }
                 }
             }
             point1.setUpdate_optid(3L);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java
index c8dcfd939..29539c2fe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java
@@ -111,6 +111,12 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
             }
             TaskUtils.updateOptMessageByBCutPoint(startPointObj);
             bcutpointivtService.updateById(startPointObj);
+            // 终点设置有轴
+            LambdaUpdateWrapper<BstIvtShafttubeivt> shaftLamUpdate = new LambdaUpdateWrapper<>();
+            shaftLamUpdate.set(BstIvtShafttubeivt::getHave_qzz, SlitterConstant.SLITTER_YES)
+                    .set(BstIvtShafttubeivt::getUpdate_time, DateUtil.now())
+                    .eq(BstIvtShafttubeivt::getPoint_code, task.getPoint_code2());
+            shafttubeivtService.update(shaftLamUpdate);
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java
index c7574f010..193fabd35 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallShaftCacheTask.java
@@ -83,10 +83,16 @@ public class TrussCallShaftCacheTask extends AbstractAcsTask {
             String endPoint = task.getPoint_code2();
             BstIvtShafttubeivt startPointObj = shafttubeivtService.getByPointCode(startPoint, false);
             BstIvtShafttubeivt endPointObj = shafttubeivtService.getByPointCode(endPoint, false);
-            // 起点清空
-            startPointObj.setHave_qzz("0");
-            TaskUtils.updateOptMessageByBShaftPoint(startPointObj);
-            shafttubeivtService.updateById(startPointObj);
+            // 起点清空,如果是入密集库的行架任务，起点不清空
+            if(!startPointObj.getPoint_code().contains("B_CBJ")){
+                startPointObj.setHave_qzz("0");
+                startPointObj.setTube_name1("");
+                startPointObj.setPlan("");
+                TaskUtils.updateOptMessageByBShaftPoint(startPointObj);
+                shafttubeivtService.updateById(startPointObj);
+            }
+
+
             endPointObj.setHave_qzz("1");
             TaskUtils.updateOptMessageByBShaftPoint(endPointObj);
             shafttubeivtService.updateById(endPointObj);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java
index 4226e685a..a8b0c3e37 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/UpShaftTrussTask.java
@@ -15,6 +15,7 @@ import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.TaskUtils;
@@ -112,6 +113,7 @@ public class UpShaftTrussTask extends AbstractAcsTask {
                     .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
             List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByQzzNos(collect);
             PdmBiSlittingproductionplan pp = plans.get(0);
+            String weightStr = SlitterTaskUtil.getPaperWeightStr(plans);
             if (pp.getContainer_name().contains("虚拟")) {
                 // 如果是虚拟卷，需要执行删除标记，并且清空数据
                 // 将分切计划删除，设备禁用
@@ -124,7 +126,6 @@ public class UpShaftTrussTask extends AbstractAcsTask {
                 });
                 slittingproductionplanService.updateBatchById(plans);
                 // 设备禁用
-                point2.setIs_used("0");
                 point2.setUp_qzzno("");
                 point2.setDown_qzzno("");
             } else {
@@ -134,6 +135,7 @@ public class UpShaftTrussTask extends AbstractAcsTask {
                 slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                         .in(PdmBiSlittingproductionplan::getQzzno, collect));
             }
+            point2.setRemark(weightStr);
             cutpointivtService.updateById(point2);
             point1.setQzz_no1("");
             point1.setQzz_no2("");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index 00e027f41..0a6db0fc3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -1,13 +1,17 @@
 package org.nl.b_lms.sch.tasks.slitter.auto;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto;
 import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
@@ -18,17 +22,21 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproducti
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.first_floor_area.auto.Prun;
 import org.nl.b_lms.sch.tasks.slitter.StockAreaCallTubeTask;
 import org.nl.b_lms.sch.tasks.slitter.StockAreaSendVehicleTask;
 import org.nl.b_lms.sch.tasks.slitter.TrussCallAirShaftTask;
 import org.nl.b_lms.sch.tasks.slitter.TrussCallShaftCacheTask;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
 import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.common.enums.NoticeTypeEnum;
 import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.RedisUtils;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
@@ -37,7 +45,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -53,7 +64,7 @@ import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.doSavePaperInf
  */
 @Slf4j
 @Component
-public class AutoCallAirShaftTask {
+public class AutoCallAirShaftTask extends Prun {
 
     @Autowired
     private IBstIvtShafttubeivtService bstIvtShafttubeivtService;
@@ -81,10 +92,16 @@ public class AutoCallAirShaftTask {
     private IschBaseTaskService taskService;
     @Autowired
     private ISysParamService paramService;
+    @Autowired
+    private RedisUtils redisUtils;
+    @Autowired
+    private IMdPbPapervehicleService papervehicleService;
 
     public final static String PARAM_CODE_PLAN_AREA = "PARAM_CODE_PLAN_AREA";
     public final static String IS_ONLY_PULLING = "IS_ONLY_PULLING";
     public final static String TZ_DAY = "TZ_DAY";
+    public final static String USE_XN = "USE_XN";
+    public String stepStr = "";
 
     /**
      * hint: 目前只是考虑了上区域
@@ -95,173 +112,356 @@ public class AutoCallAirShaftTask {
      * 套拔轴缓存位满了、没有分切计划，则触发自动创建套拔轴任务
      * update: 24/04/28 内包间只是区分气胀轴大小（即代数），不需要区分锂电/标箔
      */
-    @Transactional(rollbackFor = Exception.class)
     public void run() {
         log.info("自动呼叫套轴开始执行...");
         // 判断配置参数是否只做拔轴
         Param isOnlyPulling = paramService.findByCode(IS_ONLY_PULLING);
         Param tzDay = paramService.findByCode(TZ_DAY);
         Param paramObj = paramService.findByCode(PARAM_CODE_PLAN_AREA);
+        Param useXn = paramService.findByCode(USE_XN);
         // 1、获取空的插拔轴位(无任务)
         List<BstIvtShafttubeivt> emptyPoints = bstIvtShafttubeivtService.getAllShaftPointsByConditions("2",
                 "0", "0");
-        emptyPoints.forEach(empty -> {
-            // 标箔：1，锂电：2 改：大小：4代5代
-            String specification = empty.getQzz_generation();
-            String location = empty.getPoint_location();
-            if (ObjectUtil.isNotEmpty(isOnlyPulling) && SlitterConstant.SLITTER_YES.equals(isOnlyPulling.getValue())) {
-                // 只做拔轴
-                makePullShaft(empty, specification);
-                return;
+//        emptyPoints.forEach(empty -> doCallShaft(empty, isOnlyPulling, tzDay, paramObj));
+        for (BstIvtShafttubeivt empty : emptyPoints) {
+            stepStr = "";
+            doCallShaft(empty, isOnlyPulling, tzDay, paramObj, useXn);
+            redisUtils.set("INFO" + empty.getPoint_code(), stepStr);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void doCallShaft(BstIvtShafttubeivt empty, Param isOnlyPulling, Param tzDay, Param paramObj, Param useXn) {
+        // 标箔：1，锂电：2 改：大小：4代5代
+        String specification = empty.getQzz_generation();
+        String location = empty.getPoint_location();
+        stepStr += "1";
+        if (ObjectUtil.isNotEmpty(isOnlyPulling) && SlitterConstant.SLITTER_YES.equals(isOnlyPulling.getValue())) {
+            // 只做拔轴
+            makePullShaft(empty, specification);
+            return;
+        }
+        stepStr += ",2";
+        Integer integer = Integer.valueOf(ObjectUtil.isEmpty(tzDay.getValue()) ? "0" : tzDay.getValue());
+        // 2、获取分切计划数据 校验代数  todo： 顺序可能需要考虑
+        List<SlitterPlanDistinctDto> planAll;
+        if (ObjectUtil.isNotEmpty(useXn) && "1".equals(useXn.getValue())) {
+            planAll = slittingproductionplanService.getAllCutPlan2(integer);
+        } else {
+            planAll = slittingproductionplanService.getAllCutPlan(integer);
+        }
+        // 排序
+       /* List<SlitterPlanDistinctDto> planAll = planAllNoSort.stream()
+                .sorted(Comparator.comparing(
+                        dto -> LocalDateTime.parse(dto.getStart_time(), TIME_FORMATTER)
+                ))
+                .collect(Collectors.toList());*/
+        // 过滤
+        String value = paramObj.getValue();
+        List<String> prefixList = Arrays.asList(value.split("[，,]"));
+        List<SlitterPlanDistinctDto> plans = planAll.stream()
+                .filter(p -> prefixList.stream()
+                        .anyMatch(prefix -> p.getResource_name().startsWith(prefix)) &&
+                        checkComputationPoint(p, empty) && checkHasTask(p))
+                .collect(Collectors.toList());
+        if (plans.size() == 0) {
+            // 如果不需要套轴，就只做拔轴
+            makePullShaft(empty, specification);
+            return;
+        }
+        // 过滤相比当前时间大于1小时
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime cutoffTime = LocalDateTime.now().minusHours(1);
+        List<SlitterPlanDistinctDto> filteredList = planAll.stream()
+                .filter(p -> {
+                    try {
+                        LocalDateTime startTime = LocalDateTime.parse(p.getStart_time(), formatter);
+                        return startTime.isBefore(cutoffTime);
+                    } catch (Exception e) {
+                        return false;
+                    }
+                })
+                .collect(Collectors.toList());
+        List<PdmBiSlittingproductionplan> filterCheckPlans = null;
+        if (filteredList.size() > 0) {
+            log.info("过滤时间之后的数据：{}", filteredList);
+            // 获取当前三个位置的所有管芯信息
+            List<MdPbPapervehicle> papers = papervehicleService.getAllTubesByPoint(location);
+            if (CollectionUtil.isNotEmpty(papers)) {
+                List<String> tubeCodes = papers.stream()
+                        .map(MdPbPapervehicle::getMaterial_code)
+                        .distinct()
+                        .collect(Collectors.toList());
+                // 获取所有dto中的分切计划信息
+                List<String> parents = filteredList.stream()
+                        .map(SlitterPlanDistinctDto::getParent_container_name)
+                        .distinct()
+                        .collect(Collectors.toList());
+                List<PdmBiSlittingproductionplan> checkPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+                        .in(PdmBiSlittingproductionplan::getParent_container_name, parents)
+                        .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
+                        .eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES));
+                filterCheckPlans = checkPlans.stream()
+                        .filter(p -> tubeCodes.contains("1".equals(p.getPaper_tube_or_FRP()) ? p.getPaper_tube_material() : p.getFRP_material()))
+                        .collect(Collectors.toList());
             }
-            Integer integer = Integer.valueOf(ObjectUtil.isEmpty(tzDay.getValue()) ? "0" : tzDay.getValue());
-            // 2、获取分切计划数据 校验代数  todo： 顺序可能需要考虑
-            List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan(integer);
-            String value = paramObj.getValue();
-            List<String> prefixList = Arrays.asList(value.split("[，,]"));
-            List<SlitterPlanDistinctDto> plans = planAll.stream()
-                    .filter(p -> prefixList.stream()
-                            .anyMatch(prefix -> p.getResource_name().startsWith(prefix)) &&
-                            checkComputationPoint(p, empty) && checkHasTask(p))
+        }
+        log.info("获取过滤后的分切计划数据：{}", JSON.toJSONString(plans));
+        // 查看套轴对接位是否满了
+        // todo: 这里需要注意不要去校验071的任务，不然提前释放货位没意义。
+        List<BstIvtCutpointivt> emptyShaftPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
+                "1", location, "0");
+        stepStr += ",6";
+        // 如果满了就只做拔轴  预留一个货位?，防止套轴直接站满
+        if (emptyShaftPoint.size() < 1) {
+            log.info("暂存位没有空位！正在检测是否存在半个点位！");
+            // 校验是否存在半个位置，且有分切计划
+            // 获取只有一个位置的点位
+            stepStr += ",7";
+            List<BstIvtCutpointivt> halfPlacePoint = bcutpointivtService.getAllHalfPlacePoints("1",
+                    "1", location);
+            List<String> qzzs = halfPlacePoint.stream()
+                    .map(p -> ObjectUtil.isNotEmpty(p.getQzz_no1()) ? p.getQzz_no1() : p.getQzz_no2())
                     .collect(Collectors.toList());
-            if (plans.size() == 0) {
+            if (qzzs.size() == 0) {
+                log.info("没有半个点位，或者对应的另一半分切计划没有找到！");
                 // 如果不需要套轴，就只做拔轴
                 makePullShaft(empty, specification);
                 return;
             }
-            log.info("获取过滤后的分切计划数据：{}", JSON.toJSONString(plans));
-            // 查看套轴对接位是否满了
-            // todo: 这里需要注意不要去校验071的任务，不然提前释放货位没意义。
-            List<BstIvtCutpointivt> emptyShaftPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
-                    "1", location, "0");
-            // 如果满了就只做拔轴  预留一个货位?，防止套轴直接站满
-            if (emptyShaftPoint.size() == 0) {
-                log.info("暂存位没有空位！正在检测是否存在半个点位！");
-                // 校验是否存在半个位置，且有分切计划
-                // 获取只有一个位置的点位
-                List<BstIvtCutpointivt> halfPlacePoint = bcutpointivtService.getAllHalfPlacePoints("1",
-                        "1", location);
-                List<String> qzzs = halfPlacePoint.stream()
-                        .map(p -> ObjectUtil.isNotEmpty(p.getQzz_no1()) ? p.getQzz_no1() : p.getQzz_no2())
-                        .collect(Collectors.toList());
-                if (qzzs.size() == 0) {
-                    log.info("没有半个点位，或者对应的另一半分切计划没有找到！");
-                    // 如果不需要套轴，就只做拔轴
-                    makePullShaft(empty, specification);
-                    return;
-                }
-                // 从寻查找分切计划，并放在plans, 没有考虑区域问题， 里面会考虑代数
-                plans = slittingproductionplanService.getAllHalfPlan(qzzs);
-                if (plans.size() == 0) {
-                    log.info("没有找到对应的另一半分切计划没有找到");
-                    // 如果不需要套轴，就只做拔轴
-                    makePullShaft(empty, specification);
-                    return;
-                }
-                log.info("找到对应的另一半的计划 - {}", plans);
-            }
-            // 获取一个分切计划的Dto。如果是6寸，可以直接使用、如果是3寸，需要判断当前位置是否满足
-            // todo: 需要校验分切设备是在对应的区域中
-            SlitterPlanDistinctDto planDto = plans.stream()
-                    .filter(planD -> "6".equals(planD.getQzz_size()) ||
-                            ("3".equals(planD.getQzz_size()) && specification.equals(planD.getQzz_generation())))
-                    .findFirst()
-                    .orElse(null);
-            if (planDto == null) {
-                log.warn("过滤3/6寸和代数输出结果为空，跳过此次套轴。此时点位对应代数：{}", specification);
+            stepStr += ",12";
+            // 从寻查找分切计划，并放在plans, 没有考虑区域问题， 里面会考虑代数
+            List<PdmBiSlittingproductionplan> tzOKPlans = slittingproductionplanService.getByQzzNos(qzzs, "01");
+            if (ObjectUtil.isEmpty(tzOKPlans)) {
+                stepStr += ",13";
+                log.info("计划找不到");
                 return;
             }
-            log.info("此时获取的分切计划dto: {}", planDto);
-            // 获取分切计划dto中对应的需要套轴的分切计划 最多两个计划
-            List<PdmBiSlittingproductionplan> needPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+            PdmBiSlittingproductionplan oneTzOkPlan = tzOKPlans.get(0);
+            if (oneTzOkPlan.getOrder_type().equals("1")) {
+                plans = slittingproductionplanService.getAllHalfPlan(qzzs);
+            } else {
+                // 改切
+                plans = slittingproductionplanService.getAllHalfPlanRestruct(qzzs);
+            }
+            if (plans.size() == 0) {
+                log.info("没有找到对应的另一半分切计划没有找到");
+                // 如果不需要套轴，就只做拔轴
+                makePullShaft(empty, specification);
+                return;
+            }
+            log.info("找到对应的另一半的计划 - {}", plans);
+        }
+        stepStr += ",14";
+        // 获取一个分切计划的Dto。如果是6寸，可以直接使用、如果是3寸，需要判断当前位置是否满足
+        // todo: 需要校验分切设备是在对应的区域中
+        SlitterPlanDistinctDto planDto = plans.stream()
+                .filter(planD -> ("6".equals(planD.getQzz_size()) ||
+                        ("3".equals(planD.getQzz_size()) && specification.equals(planD.getQzz_generation()))) &&
+                        havaEmptyShaft(planD, empty))
+                .findFirst()
+                .orElse(null);
+        if (planDto == null) {
+            log.warn("过滤3/6寸和代数输出结果为空，跳过此次套轴，直接拔轴。此时点位对应代数：{}", specification);
+            // 如果不需要套轴，就只做拔轴
+            makePullShaft(empty, specification);
+            return;
+        }
+        log.info("此时获取的分切计划dto: {}", planDto);
+        // 获取分切计划dto中对应的需要套轴的分切计划 最多两个计划
+        List<PdmBiSlittingproductionplan> needPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+                .eq(PdmBiSlittingproductionplan::getResource_name, planDto.getResource_name())
+                .eq(PdmBiSlittingproductionplan::getParent_container_name, planDto.getParent_container_name())
+                .eq(PdmBiSlittingproductionplan::getUp_or_down, planDto.getUp_or_down())
+                .eq(PdmBiSlittingproductionplan::getSplit_group, planDto.getSplit_group())
+                .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
+                .eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES));
+        if (needPlans.size() == 0) {
+            // 可能是改切，所以换成restruct_container_name来使用
+            needPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                     .eq(PdmBiSlittingproductionplan::getResource_name, planDto.getResource_name())
-                    .eq(PdmBiSlittingproductionplan::getParent_container_name, planDto.getParent_container_name())
+                    .eq(PdmBiSlittingproductionplan::getRestruct_container_name, planDto.getParent_container_name())
                     .eq(PdmBiSlittingproductionplan::getUp_or_down, planDto.getUp_or_down())
                     .eq(PdmBiSlittingproductionplan::getSplit_group, planDto.getSplit_group())
                     .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
                     .eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES));
-            if (needPlans.size() == 0) {
-                // 可能是改切，所以换成restruct_container_name来使用
-                needPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
-                        .eq(PdmBiSlittingproductionplan::getResource_name, planDto.getResource_name())
-                        .eq(PdmBiSlittingproductionplan::getRestruct_container_name, planDto.getParent_container_name())
-                        .eq(PdmBiSlittingproductionplan::getUp_or_down, planDto.getUp_or_down())
-                        .eq(PdmBiSlittingproductionplan::getSplit_group, planDto.getSplit_group())
-                        .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
-                        .eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES));
-            }
-            log.info("通过dto获取的分切计划：{}", needPlans);
-            // 获取其中一条
-            PdmBiSlittingproductionplan needPlan = needPlans.get(0);
-            String qzzSize = needPlan.getQzz_size();
-            // 从套轴对接位获取相同气涨轴大小
-            // update: 不需要(同标箔或者锂电分开)
-            // todo: 需要校验区域0/1
-            List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification);
-            if (qzzPoint.size() == 0) {
-                // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
-                saveCutPlanMessage(empty, needPlans, qzzSize);
-                // 调用ACS滚条气涨轴下来
-                toAcsOutShaft(qzzSize, location, empty);
-                toCallAgvMovePaperTube(needPlans, location, empty);
+        }
+        // 如果过滤出来的需要套轴的信息，则直接获取
+        if (CollectionUtil.isNotEmpty(filterCheckPlans)) {
+            needPlans = filterCheckPlans;
+        }
+        log.info("通过dto获取的分切计划：{}", needPlans);
+        // 获取其中一条
+        PdmBiSlittingproductionplan needPlan = needPlans.get(0);
+        String qzzSize = needPlan.getQzz_size();
+
+        String qzz_generation = needPlan.getQzz_generation();
+        // 从套轴对接位获取相同气涨轴大小
+        // update: 不需要(同标箔或者锂电分开)
+        // todo: 需要校验区域0/1
+        stepStr += ",15";
+        List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification);
+        log.info("查找到满足到对应尺寸的点位-{}", qzzPoint);
+        if (qzzPoint.size() == 0) {
+            stepStr += ",16";
+            //若套轴暂存位没有相同规格的气胀轴，直接去气胀轴库找即可
+            // 调用ACS滚条气涨轴下来
+            if (!toAcsOutShaft(qzzSize,location, empty)) {
+                log.error("呼叫出轴失败-穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
                 return;
             }
-            // 查找一条没任务的点位
-            BstIvtCutpointivt startPoint = qzzPoint.get(0);
-            if (ObjectUtil.isEmpty(startPoint)) {
-                // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
-                saveCutPlanMessage(empty, needPlans, qzzSize);
-                // 如果不存在，则发起信号滚气涨轴
-                // 调用ACS滚条气涨轴下来
-                toAcsOutShaft(qzzSize, location, empty);
-                toCallAgvMovePaperTube(needPlans, location, empty);
-                return;
-            }
-            // 创建任务
-            JSONObject param = new JSONObject();
-            param.put("point_code1", ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
-                    ? startPoint.getTruss_point_code1() : startPoint.getTruss_point_code2());
-            param.put("point_code2", empty.getPoint_code());
-            param.put("vehicle_code", ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
-                    ? startPoint.getQzz_no1() : startPoint.getQzz_no2());
-            // 气胀轴号
-            param.put("qzz_no", ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
-                    ? startPoint.getQzz_no1() : startPoint.getQzz_no2());
-            param.put("needPlan", planDto);
-            // 是否拔轴
-            param.put("is_pulling", SlitterConstant.SLITTER_YES);
-            param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位"));
-            param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
-            param.put("qzz_size", needPlan.getQzz_size());
-            // 所需的纸管规格
-            SlitterTaskUtil.putNeedPaperSpec(param, needPlans);
-            // 当前纸管的规格信息
-            String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
-                    ? startPoint.getQzz_no1() : startPoint.getQzz_no2();
-            if (oldQzzNo == null) {
-                throw new BadRequestException("当前气胀轴的编码为空！");
-            }
+            toCallAgvMovePaperTube(needPlans, location, empty);
             // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
             saveCutPlanMessage(empty, needPlans, qzzSize);
-            // 设置是否套轴：1：正常套轴，2：待定（到后面还会申请套轴）
-            setIsSleeveShaft(param);
-            // 最多两条
-            List<PdmBiSlittingproductionplan> oldPlans = slittingproductionplanService.getByQzzNo(oldQzzNo);
-            SlitterTaskUtil.putCurrentPaperSpec(param, oldPlans);
-            // 套管数量
-            param.put("casingCount", needPlans.size());
-            // 拔管数量
-            param.put("pullCount", oldPlans.size());
-            param.put("containers", oldPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
-            trussCallAirShaftTask.createTask(param);
-            toCallAgvMovePaperTube(needPlans, location, empty);
-            // 将分切计划is_paper_ok 1(纸管已经准备好) -> 2(已经套轴)
-            needPlans.forEach(p -> {
-                p.setIs_paper_ok("2");
-                TaskUtils.updateOptMessageBySlitterPlan(p);
-            });
-            slittingproductionplanService.updateBatchById(needPlans);
+            stepStr += ",97";
+            return;
+        }
+        // 查找一条没任务的点位
+        BstIvtCutpointivt startPoint = qzzPoint.get(0);
+        // 当前纸管的规格信息
+        String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
+                ? startPoint.getQzz_no1() : startPoint.getQzz_no2();
+        stepStr += ",33";
+        if (oldQzzNo == null) {
+            log.error("当前气胀轴的编码为空！");
+            stepStr += ",96";
+            return;
+        }
+        String startPointCode = ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
+                ? startPoint.getTruss_point_code1() : startPoint.getTruss_point_code2();
+        if (startPointCode == null) {
+            log.error("当前点位的编码为空！");
+            stepStr += ",96";
+            return;
+        }
+        stepStr += ",34";
+        // 如果A6寸 B3寸，则需要过滤到精确点位
+        if (ObjectUtil.isNotEmpty(startPoint.getQzz_no1()) && ObjectUtil.isNotEmpty(startPoint.getQzz_no2())) {
+            // 获取需要的数据
+            List<PdmBiSlittingproductionplan> aPlans = slittingproductionplanService.getByQzzNoByStatus(startPoint.getQzz_no1(), null);
+            List<PdmBiSlittingproductionplan> bPlans = slittingproductionplanService.getByQzzNoByStatus(startPoint.getQzz_no2(), null);
+            log.info("筛选得到的计划值：{}，{}", aPlans, bPlans);
+            if (aPlans.size() > 0) {
+                PdmBiSlittingproductionplan aPlan = aPlans.get(0);
+                if (needPlan.getQzz_size().equals(aPlan.getQzz_size())) {
+                    oldQzzNo = aPlan.getQzzno();
+                    startPointCode = startPoint.getTruss_point_code1();
+                } else {
+                    if (bPlans.size() > 0) {
+                        PdmBiSlittingproductionplan bPlan = bPlans.get(0);
+                        if (needPlan.getQzz_size().equals(bPlan.getQzz_size())) {
+                            oldQzzNo = bPlan.getQzzno();
+                            startPointCode = startPoint.getTruss_point_code2();
+                        }
+                    }
+                }
+            }
+        }
+        stepStr += ",35";
+        // 创建任务
+        JSONObject param = new JSONObject();
+        param.put("point_code1", startPointCode);
+        param.put("point_code2", empty.getPoint_code());
+        param.put("vehicle_code", oldQzzNo);
+        // 气胀轴号
+        param.put("qzz_no", oldQzzNo);
+        param.put("needPlan", planDto);
+        // 是否拔轴
+        param.put("is_pulling", SlitterConstant.SLITTER_YES);
+        param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位"));
+        param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
+        param.put("qzz_size", needPlan.getQzz_size());
+        // 所需的纸管规格
+        SlitterTaskUtil.putNeedPaperSpec(param, needPlans);
+        // 设置是否套轴：1：正常套轴，2：待定（到后面还会申请套轴）
+        setIsSleeveShaft(param);
+        // 最多两条
+        List<PdmBiSlittingproductionplan> oldPlans = slittingproductionplanService.getByQzzNo(oldQzzNo);
+        if (oldPlans.size() == 0) {
+            stepStr += ",96";
+            log.warn("当前气胀轴编码{}，找不到对应的计划", oldQzzNo);
+            // 把点位禁用
+            startPoint.setIs_used("0");
+            startPoint.setRemark("气胀轴" + oldQzzNo + "的计划不存在，无效点位自动禁用。");
+            startPoint.setUpdate_time(DateUtil.now());
+            bcutpointivtService.updateById(startPoint);
+            return;
+        }
+        // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
+        saveCutPlanMessage(empty, needPlans, qzzSize);
+        SlitterTaskUtil.putCurrentPaperSpec(param, oldPlans);
+        // 套管数量
+        param.put("casingCount", needPlans.size());
+        // 拔管数量
+        param.put("pullCount", oldPlans.size());
+        param.put("containers", oldPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
+        toCallAgvMovePaperTube(needPlans, location, empty);
+        stepStr += ",36";
+        trussCallAirShaftTask.createTask(param);
+        stepStr += ",37";
+        // 将分切计划is_paper_ok 1(纸管已经准备好) -> 2(已经套轴)
+        needPlans.forEach(p -> {
+            p.setIs_paper_ok("2");
+            TaskUtils.updateOptMessageBySlitterPlan(p);
         });
+        slittingproductionplanService.updateBatchById(needPlans);
+        stepStr += ",97";
+    }
+
+    /**
+     * 判断是不是有空位置
+     * @param planD
+     * @return
+     */
+    public boolean havaEmptyShaft(SlitterPlanDistinctDto planD, BstIvtShafttubeivt empty) {
+        String qzzSize = planD.getQzz_size();
+        String qzzGeneration = planD.getQzz_generation();
+        String location = empty.getPoint_location();
+        // 需要区分上下
+        List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize ,empty.getPoint_code(), location);
+        if (shafttubeivts.size() == 0) {
+            log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
+            return false;
+        }
+        // 气涨轴库
+        BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
+        // 判断气胀轴是否有轴
+        JSONArray device_rows = new JSONArray();
+        JSONObject device_obj = new JSONObject();
+        device_rows.add(device_obj);
+        device_obj.put("device_code", shafttubeivt.getPoint_code());
+        // todo: 暂时都是B1
+        device_obj.put("product_area", "B1");
+        JSONObject pointStatus = wmsToAcsService.getPointStatus(device_rows);
+        if (ObjectUtil.isEmpty(pointStatus) || ObjectUtil.isEmpty(pointStatus.getJSONArray("data"))) {
+            log.error("获取气胀轴库信息失败");
+            return false;
+        }
+        boolean judgment1 = true;
+        boolean judgment2 = true;
+        JSONObject data2 = pointStatus.getJSONArray("data").getJSONObject(0);
+        if (data2.getInteger("qty") == 0) {
+            log.warn("气胀轴库【" + shafttubeivt.getPoint_code() + "】没有气胀轴。");
+            judgment1 = false;
+        }
+        // 获取气涨轴缓存没有任务的点位
+        List<BstIvtShafttubeivt> qzzCache = bstIvtShafttubeivtService.getNotTaskShaftCache(qzzSize,
+                shafttubeivt.getQzz_generation(), location);
+        if (qzzCache.size() == 0) {
+            log.warn("未找到气胀轴密集库气涨轴规格「" + qzzSize + "」的暂存位");
+            judgment2 = false;
+        }
+        // 从套轴对接位获取相同气涨轴大小
+        // update: 不需要(同标箔或者锂电分开)
+        // todo: 需要校验区域0/1
+        stepStr += ",15";
+        List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, qzzGeneration);
+        log.info("查找可以拔轴的点位数：{}", qzzPoint.size());
+        if (!judgment1 && !judgment2 && qzzPoint.size() == 0) {
+            log.warn("都没有气胀轴");
+            return false;
+        }
+        return true;
     }
 
     /**
@@ -291,7 +491,8 @@ public class AutoCallAirShaftTask {
      * @param needPlans 所需要套轴的分切计划
      * @param location  位置
      */
-    public void toCallAgvMovePaperTube(List<PdmBiSlittingproductionplan> needPlans, String location, BstIvtShafttubeivt empty) {
+    public Boolean toCallAgvMovePaperTube(List<PdmBiSlittingproductionplan> needPlans, String location, BstIvtShafttubeivt empty) {
+        stepStr += ",17";
         // 最多两根
         List<String> tubes = needPlans.stream().map(plan -> {
             if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
@@ -300,28 +501,65 @@ public class AutoCallAirShaftTask {
                 return plan.getFRP_material();
             }
         }).collect(Collectors.toList());
+        // 判断另一台穿拔轴机的管芯
+        BstIvtShafttubeivt one = bstIvtShafttubeivtService.getOne(new LambdaQueryWrapper<BstIvtShafttubeivt>()
+                .ne(BstIvtShafttubeivt::getPoint_code, empty.getPoint_code())
+                .eq(BstIvtShafttubeivt::getPoint_location, empty.getPoint_location())
+                .eq(BstIvtShafttubeivt::getPoint_type, empty.getPoint_type())
+                .eq(BstIvtShafttubeivt::getIs_used, "1"));
+        log.info("同位置的另一台穿拔轴机构：{}", one);
+        stepStr += ",18";
+        // 另一台所需要的数量
+        int otherDeviceTubeSize = 0;
+        // 缺省的数量
+        int needQuantity = 0;
         // 判断当前区域location对应的备货区是否含有相同的纸管  校验了不在搬运中
-        // type=1, 关联对象material_code=纸管, qty > 0
-        List<BstIvtStockingivt> useList = stockingivtService.getPaperTubePoint("1", tubes.get(0), location, tubes.size());
+        // type=1（桁架底下的托盘）, 关联对象material_code=纸管, qty > 0
+        List<BstIvtStockingivt> useList = stockingivtService.getPaperTubePoint("1", tubes.get(0), location, 0);
         if (useList.size() > 0) {
+            // 求和，三个托盘中需要的管芯的数量。
+            int sum = useList.stream().mapToInt(BstIvtStockingivt::getQty).sum();
+            if (ObjectUtil.isNotEmpty(one)) {
+                if (one.getTube_code1().equals(tubes.get(0))) {
+                    otherDeviceTubeSize = (int) Stream.of(one.getTube_code1(), one.getTube_code2()).filter(ObjectUtil::isNotEmpty).count();
+                }
+            }
             // 说明三个位置中有包含此纸管的数据。
-            return;
+            if (sum >= tubes.size() + otherDeviceTubeSize) {
+                stepStr += ",19";
+                return true;
+            }
+            // 如果不够，就计算还缺多少个
+            int needTemp = tubes.size() + otherDeviceTubeSize - sum;
+            // 兜底
+            needQuantity = needTemp > 0 ? needTemp : 1;
         }
-        // 查找type=0的位置中是否存在  校验了不在搬运中
-        List<BstIvtStockingivt> stockingivtList = stockingivtService.getPaperTubePoint("0", tubes.get(0), location, tubes.size());
-        if (stockingivtList.size() == 0) {
+        stepStr += ",20";
+        // 查找type=0的位置(待命的托盘)中是否存在(需要判断的是单独一个托盘)  校验了不在搬运中
+        List<BhTubePointDto> stockingivtList = stockingivtService.getNeedPaperTubePoint("0", tubes.get(0), location);
+        // 找一个点位: 目的需要的点位
+        // 筛选单独托盘有超过所需数
+        BhTubePointDto needPoint = null;
+        for (BhTubePointDto bhTubePointDto : stockingivtList) {
+            if (bhTubePointDto.getQty() >= needQuantity) {
+                needPoint = bhTubePointDto;
+                break;
+            }
+        }
+        if (needPoint == null) {
+            stepStr += ",21";
             // 不存在则站内通知
             noticeService.createNotice("备货区找不到[" + tubes.get(0) + "]的纸管信息",
                     "点位[" + empty.getPoint_name() + "]无法从备货区找到纸管信息",
                     NoticeTypeEnum.EXCEPTION.getCode());
-            return;
+            return false;
         }
-        // 找一个点位: 目的需要的点位
-        BstIvtStockingivt needPoint = stockingivtList.get(0);
         // 找到就创建AGV搬运任务
-        // 筛选3个位置中数量最少的搬走
-        BstIvtStockingivt needMovePoint = stockingivtService.getCanMovePointOne(location, "1");
+        // 筛选3个位置中数量最少的搬走, 如果是空位，直接搬运过来
+        List<BhTubeMovePointDto> needMovePointList = stockingivtService.getCanMovePointList(location, "1");
         // 空位就直接创建搬过来的任务
+        BhTubeMovePointDto needMovePoint = needMovePointList.size() > 0 ? needMovePointList.get(0) : null;
+        stepStr += ",22";
         if (ObjectUtil.isEmpty(needMovePoint) || "0".equals(needMovePoint.getIvt_status())) {
             // 直接搬过来即可
             JSONObject param = new JSONObject();
@@ -335,15 +573,18 @@ public class AutoCallAirShaftTask {
                     .eq(MdPbPapervehicle::getVehicle_code, needPoint.getVehicle_code()));
             doSavePaperInfos(paperList, param);
             stockAreaCallTubeTask.createTask(param);
-            return;
+            stepStr += ",23";
+            return true;
         }
+        stepStr += ",24";
         // 查找一个没有任务的空位
         List<BstIvtStockingivt> list = stockingivtService.getEmptyPointNotTask(location, "0");
         if (list.size() == 0) {
+            stepStr += ",25";
             noticeService.createNotice("备货区找不到空位置搬运",
                     "点位[" + empty.getPoint_name() + "]无法从备货区找到空位",
                     NoticeTypeEnum.EXCEPTION.getCode());
-            return;
+            return false;
         }
         BstIvtStockingivt endPoint = list.get(0);
         // 创建任务 -> HINT: 在此任务完成之后会调用搬回来的任务，因此任务中要记录需要搬运的点位放在任务请求参数中。
@@ -356,6 +597,8 @@ public class AutoCallAirShaftTask {
         param.put("task_type", SlitterEnum.TASK_TYPE.code("备货区送载具"));
         param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
         stockAreaSendVehicleTask.createTask(param);
+        stepStr += ",26";
+        return true;
     }
 
 
@@ -366,23 +609,74 @@ public class AutoCallAirShaftTask {
      * @param location 位置：上半部分还是下半部分
      * @param empty    套拔轴点位
      */
-    private void toAcsOutShaft(String qzzSize, String location, BstIvtShafttubeivt empty) {
+    private Boolean toAcsOutShaft(String qzzSize,  String location, BstIvtShafttubeivt empty) {
+        stepStr += ",27";
         // 需要区分上下
-        List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, empty.getPoint_code(), location);
+        List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize ,empty.getPoint_code(), location);
+        stepStr += ",28";
         if (shafttubeivts.size() == 0) {
-            throw new BadRequestException("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
+            log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
+            stepStr += ",98";
+            return false;
         }
+        // 气涨轴库
         BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
+        stepStr += ",29";
+        // 判断气胀轴是否有轴
+        JSONArray device_rows = new JSONArray();
+        JSONObject device_obj = new JSONObject();
+        device_rows.add(device_obj);
+        device_obj.put("device_code", shafttubeivt.getPoint_code());
+        // todo: 暂时都是B1
+        device_obj.put("product_area", "B1");
+        JSONObject pointStatus = wmsToAcsService.getPointStatus(device_rows);
+        if (ObjectUtil.isEmpty(pointStatus) || ObjectUtil.isEmpty(pointStatus.getJSONArray("data"))) {
+            stepStr += ",98";
+            log.error("获取气胀轴库信息失败");
+            return false;
+        }
+        boolean judgment1 = true;
+        boolean judgment2 = true;
+        // 获取气涨轴缓存没有任务的点位
+        List<BstIvtShafttubeivt> qzzCache = bstIvtShafttubeivtService.getNotTaskShaftCache2(qzzSize,
+                shafttubeivt.getQzz_generation(), location);
+        if (qzzCache.size() == 0) {
+            log.warn("未找到气胀轴密集库气涨轴规格「" + qzzSize + "」的暂存位");
+            judgment2 = false;
+        }
+        JSONObject data2 = pointStatus.getJSONArray("data").getJSONObject(0);
+        if (data2.getInteger("qty") == 0) {
+            log.warn("气胀轴库【" + shafttubeivt.getPoint_code() + "】没有气胀轴。");
+            judgment1 = false;
+            // 预扣除
+            if (judgment2) {
+                BstIvtShafttubeivt waitUsedPoint = qzzCache.get(0);
+                waitUsedPoint.setPlan("1");
+                waitUsedPoint.setTube_name1("预分配给" + empty.getPoint_code());
+                waitUsedPoint.setUpdate_time(DateUtil.now());
+                bstIvtShafttubeivtService.updateById(waitUsedPoint);
+            }
+        }
+        stepStr += ",30";
+        if (!judgment1 && !judgment2) {
+            log.warn("没有气胀轴，不给ACS写出轴信息");
+            stepStr += ",98";
+            return false;
+        }
+        // 判断气胀轴密集库是否有数据
         JSONArray acsParam = new JSONArray();
+        // 出轴的信号
         JSONObject acsQzz = new JSONObject();
         acsQzz.put("device_code", shafttubeivt.getPoint_code());
         acsQzz.put("code", "to_command");
         acsQzz.put("value", "1");
         acsQzz.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
         acsParam.add(acsQzz);
+        stepStr += ",31";
         log.info("开始给ACS写信号出气胀轴 - {}", acsQzz);
         JSONObject action = wmsToAcsService.action(acsParam);
         log.info("下发给ACS写信号出气涨轴返回参数：{}", action);
+        return true;
     }
 
     /**
@@ -417,6 +711,7 @@ public class AutoCallAirShaftTask {
      * @param qzzSize   气涨轴尺寸
      */
     private void saveCutPlanMessage(BstIvtShafttubeivt empty, List<PdmBiSlittingproductionplan> needPlans, String qzzSize) {
+        stepStr += ",32";
         log.info("正在保存套轴信息 - {} , 尺寸 - {} 到点位 - {}", needPlans, qzzSize, empty);
         empty.setHave_qzz(SlitterConstant.SLITTER_YES);
         empty.setQzz_size(qzzSize);
@@ -463,33 +758,50 @@ public class AutoCallAirShaftTask {
      * @param specification 代数（4、5）
      */
     private void makePullShaft(BstIvtShafttubeivt empty, String specification) {
+        stepStr += ",3";
+        stepStr += ",8";
         log.info("不需要套轴，只做拔轴！");
         //查询套轴缓存位哦:point_type=1
-        List<BstIvtCutpointivt> notTaskPoints = bcutpointivtService.getAreaNotTaskPointByLocationAreaAndStatus(empty.getPoint_location());
+        List<CutpointAirShhaftDto> notTaskPoints = bcutpointivtService.getAreaNotTaskPointByTcQzzPoint(empty.getPoint_location());
+        //所有TC暂存位有卷的：Truss_point_code1，Truss_point_code2有任务的
+        //根据point_code排序
         if (notTaskPoints.size() == 0) {
+            stepStr += ",99";
             return;
         }
+        stepStr += ",9";
         // 筛选一个满足的位置：3寸：看代数4/5；6寸直接
         //判断气胀轴代
-        BstIvtCutpointivt cutpointivt = notTaskPoints.stream()
+        CutpointAirShhaftDto cutpointivt = notTaskPoints.stream()
+                .sorted(Comparator.comparingLong(CutpointAirShhaftDto::getIvt_id))
                 .filter(cut -> "6".equals(cut.getQzz_size()) ||
                         ("3".equals(cut.getQzz_size()) && specification.equals(cut.getQzz_generation())))
                 .findFirst()
                 .orElse(null);
         if (cutpointivt == null) {
+            stepStr += ",99";
             return;
         }
-        String pointCode1 = ObjectUtil.isNotEmpty(cutpointivt.getQzz_no1()) ? cutpointivt.getTruss_point_code1() : cutpointivt.getTruss_point_code2();
-        String qzzNo = ObjectUtil.isNotEmpty(cutpointivt.getQzz_no1()) ? cutpointivt.getQzz_no1() : cutpointivt.getQzz_no2();
+        stepStr += ",10";
+        String pointCode1 = cutpointivt.getQzz_point();
+        String qzzNo = cutpointivt.getQzz_no();
         // 获取对应的分切计划
         List<PdmBiSlittingproductionplan> list = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                 .eq(PdmBiSlittingproductionplan::getQzzno, qzzNo)
                 .eq(PdmBiSlittingproductionplan::getIs_delete, "0"));
         if (list.size() == 0) {
+            stepStr += ",99";
             log.warn("气涨轴[{}]对应的分切计划不存在!", qzzNo);
-            throw new BadRequestException("气涨轴[" + qzzNo + "]对应的分切计划不存在!");
+            bcutpointivtService.update(new UpdateWrapper<BstIvtCutpointivt>()
+                    .eq("ivt_id",cutpointivt.getIvt_id())
+                    .set("is_used","0")
+                    .set("remark","气胀轴" + qzzNo + "的计划不存在，无效点位自动禁用")
+                    .set("update_time",DateUtil.now()));
+
+            return;
         }
         PdmBiSlittingproductionplan plan = list.get(0);
+        // todo: 考虑是否有空位（如果气涨轴库和气胀轴暂存架都没有空位，则退出）【暂时不考虑】
         List<String> collect = list.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList());
         JSONObject param = new JSONObject();
         param.put("point_code1", pointCode1);
@@ -510,6 +822,7 @@ public class AutoCallAirShaftTask {
         param.put("is_bushing", SlitterConstant.SLITTER_NO);
         param.put("is_pulling", SlitterConstant.SLITTER_YES);
         trussCallAirShaftTask.createTask(param);
+        stepStr += ",11";
     }
 
     /**
@@ -525,6 +838,7 @@ public class AutoCallAirShaftTask {
             return true;
         }
         log.info("存在任务，不允许套轴{}", dto);
+        stepStr += ",5";
         return false;
     }
 
@@ -552,11 +866,13 @@ public class AutoCallAirShaftTask {
                 if ("1".equals(byContainerName.getOrder_type())) {
                     // 判断母卷
                     if (byContainerName.getParent_container_name().equals(dto.getParent_container_name())) {
+                        stepStr += ",4";
                         return false;
                     }
                 } else {
                     // 判断改切
                     if (byContainerName.getRestruct_container_name().equals(dto.getParent_container_name())) {
+                        stepStr += ",4";
                         return false;
                     }
                 }
@@ -569,6 +885,7 @@ public class AutoCallAirShaftTask {
             }
         }
         log.info("检查有同母卷不允许套轴：{}", dto);
+        stepStr += ",4";
         // 有就返回true
         return false;
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
index 93ba2e16a..0717f1832 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
@@ -102,11 +102,13 @@ public class AutoSendAirShaftAgvTask {
                 // 单条可能还有一条未套轴
                 List<PdmBiSlittingproductionplan> list = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                         .eq(PdmBiSlittingproductionplan::getParent_container_name, demoPlan.getParent_container_name())
+                        .eq(PdmBiSlittingproductionplan::getRestruct_container_name, demoPlan.getRestruct_container_name())
                         .eq(PdmBiSlittingproductionplan::getResource_name, demoPlan.getResource_name())
                         .eq(PdmBiSlittingproductionplan::getSplit_group, demoPlan.getSplit_group())
                         .ne(PdmBiSlittingproductionplan::getUp_or_down, demoPlan.getUp_or_down())
                         .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO));
                 if (list.size() > 0) {
+                    log.info("还有不同轴，所以不继续");
                     // 还有不同轴，所以不继续
                     continue;
                 }
@@ -120,7 +122,7 @@ public class AutoSendAirShaftAgvTask {
                             SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()),
                             area));
             if (emptyPoint.size() == 0) {
-                log.warn("找不到对应的位置！");
+                log.warn("当前分切机找不到空闲的对接位置！");
                 continue;
             }
             // 创建任务
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java
deleted file mode 100644
index a3f04e207..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendShaftCacheAgvTask.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.nl.b_lms.sch.tasks.slitter.auto;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.b_lms.sch.tasks.slitter.SlitterDownAgvTask;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2024/2/1
- */
-@Deprecated
-@Slf4j
-@Component
-public class AutoSendShaftCacheAgvTask {
-
-}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java
index c89e46167..cbe8a6c6d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterConstant.java
@@ -60,4 +60,7 @@ public interface SlitterConstant {
      */
     String SLITTER_TYPE_FRP = "2";
 
+    String TO_SHAFT_INFO_98 = "0";
+    String TO_SHAFT_INFO_97 = "2";
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java
index 1ca942f2b..ed852f5c2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java
@@ -22,7 +22,7 @@ public enum SlitterEnum {
     TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803"
             , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807"
             , "备货区送纸管", "010808", "分切机下料桁架任务", "010809", "分切机下料AGV到内包间", "010810", "套轴异常处理AGV任务", "010811"
-    , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813", "拔轴完毕出轴", "010814"));
+    , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813", "拔轴完毕出轴", "010814", "穿拔轴缓存<>气胀轴缓存位", "010815"));
     private Map<String, String> code;
 
     public String code(String desc) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
index 79388ff40..063b53431 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
 import org.nl.common.utils.TaskUtils;
+import org.nl.modules.common.utils.RedisUtils;
 import org.nl.modules.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -32,53 +33,18 @@ import java.util.stream.Stream;
 public class SlitterController {
     @Autowired
     private SlitterService slitterService;
-
-    @PostMapping("/test1")
-    @Log("1111")
-    public ResponseEntity<Object> create(@RequestBody JSONObject entity){
-        if ("1".equals(entity.getString("type"))) {
-            return new ResponseEntity<>(slitterService.acsRequestShaftLoadTube(entity), HttpStatus.OK);
-        } else if ("2".equals(entity.getString("type"))) {
-            return new ResponseEntity<>(slitterService.acsFinishLoadShaft(entity), HttpStatus.OK);
-        } else if ("3".equals(entity.getString("type"))) {
-            return new ResponseEntity<>(slitterService.acsFinishShaftPluckTube(entity), HttpStatus.OK);
-        } else if ("5".equals(entity.getString("type"))) {
-            return new ResponseEntity<>(slitterService.acsSendShaftToCache(entity), HttpStatus.OK);
-        }
-        return new ResponseEntity<>(slitterService.acsRequestShaftLoadTube(entity), HttpStatus.OK);
-    }
-    @PostMapping("/test2")
-    @Log("1111")
-    public ResponseEntity<Object> create2(@RequestBody JSONObject entity){
-        return new ResponseEntity<>(slitterService.acsFinishLoadShaft(entity), HttpStatus.OK);
-    }
-    @PostMapping("/test3")
-    @Log("1111")
-    public ResponseEntity<Object> create3(@RequestBody JSONObject entity){
-        List<String> collect = Stream.of("B1182312040201A1").collect(Collectors.toList());
-        entity.put("container", collect);
-        return new ResponseEntity<>(slitterService.mesSlittingMachineSendMaterial(entity), HttpStatus.CREATED);
-    }
-    @PostMapping("/test4")
-    @Log("1111")
-    public ResponseEntity<Object> create4(@RequestBody JSONObject entity){
-        return new ResponseEntity<>(slitterService.acsFinishShaftPluckTube(entity), HttpStatus.CREATED);
-    }
-    @PostMapping("/test5")
-    @Log("1111")
-    @SaIgnore
-    public ResponseEntity<Object> create5(@RequestBody JSONObject entity){
-        return new ResponseEntity<>(slitterService.mesGetWeighingOfWasteFoil(entity), HttpStatus.CREATED);
-    }
-    @PostMapping("/test6")
-    @Log("1111")
-    public ResponseEntity<Object> create6(@RequestBody JSONObject entity){
-        return new ResponseEntity<>(slitterService.mesGetFinishWeighingOfWasteFoil(entity), HttpStatus.CREATED);
-    }
+    @Autowired
+    private RedisUtils redisUtils;
     @PostMapping("/calPaperNum")
     @Log("扣除纸管库存")
     @SaIgnore
     public ResponseEntity<Object> calPaperNum(@RequestBody JSONObject entity){
         return new ResponseEntity<>(slitterService.acsToReduceTube(entity), HttpStatus.CREATED);
     }
+    @PostMapping("/tzInfo")
+    @Log("套轴BCP透明链路")
+    @SaIgnore
+    public ResponseEntity<Object> tzInfo(@RequestBody JSONObject entity){
+        return new ResponseEntity<>(redisUtils.get("INFO" + entity.getString("device_code")), HttpStatus.CREATED);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java
index 7f0cd1953..7f3030ba6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java
@@ -2,6 +2,7 @@ package org.nl.b_lms.sch.tasks.slitter.mapper;
 
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -50,4 +51,15 @@ public interface SlitterMapper {
     List<BstIvtCutpointivt> getReadyShaftPoint(String extCode);
 
     List<BstIvtCutpointivt> getAreaFullVolumeByArea(List<String> areas);
+
+    /**
+     * 内包间获取分切机下料位没任务的点位，过滤071任务
+     * @param area
+     * @param sortSeq
+     * @param location
+     * @return
+     */
+    List<BstIvtCutpointivt> nbjGetEmptyCutPointNotTask(String area, BigDecimal sortSeq, String location);
+
+    List<CallPlanViewVO> showManualView();
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
index 7f8d7e2f5..4be038550 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
@@ -100,4 +100,86 @@
                        ))
         ORDER BY bct.point_type DESC
     </select>
+    <select id="nbjGetEmptyCutPointNotTask"
+            resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
+        SELECT
+            bcp.*
+        FROM
+            `bst_ivt_cutpointivt` bcp
+        WHERE bcp.point_type = '3' AND bcp.point_status = '1' AND bcp.is_used = '1'
+          AND bcp.product_area = #{area}
+          AND bcp.point_location = #{location}
+        AND 0 = (
+        SELECT
+        COUNT(*)
+        FROM
+        sch_base_task t
+        WHERE
+        t.task_status <![CDATA[ < ]]> '07'
+        AND t.is_delete = '0'
+        AND (
+        t.point_code2 = bcp.point_code
+        OR t.point_code2 = bcp.truss_point_code1
+        OR t.point_code4 = bcp.truss_point_code1
+        OR t.point_code2 = bcp.truss_point_code2
+        OR t.point_code4 = bcp.truss_point_code2
+        )
+        )
+        AND 0 = (
+        SELECT
+            COUNT(*)
+        FROM
+            sch_base_task t
+        WHERE t.task_status = '071'
+            AND t.is_delete = '0'
+            AND t.point_code2 = bcp.point_code
+        )
+        AND 0 = ABS(bcp.sort_seq - #{sortSeq})
+    </select>
+    <select id="showManualView" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO">
+        SELECT p.workorder_id,
+               p.resource_name,
+               CASE
+                   WHEN LENGTH(p.parent_container_name) > 0 THEN
+                       p.parent_container_name
+                   ELSE p.restruct_container_name
+                   END                                                                    AS parent_container_name,
+               p.split_group,
+               p.up_or_down,
+               p.qzz_size,
+               p.qzz_generation,
+               p.is_paper_ok,
+               MIN(p.start_time)                                                          AS start_time,
+               IF(p.paper_tube_or_FRP = '1', p.paper_tube_description, p.FRP_description) AS tube,
+               MIN(p.`status`)                                                            AS `status`
+        FROM `pdm_bi_slittingproductionplan` p
+        WHERE p.`status` <![CDATA[ < ]]> '09'
+          AND p.is_delete = '0'
+          AND IFNULL(p.up_or_down, '') <![CDATA[ <> ]]> ''
+          AND IFNULL(p.left_or_right, '') <![CDATA[ <> ]]> ''
+          AND DATE (p.start_time) >= DATE_SUB(CURDATE()
+            , INTERVAL 1 DAY)
+          AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name)
+          AND p.parent_container_name LIKE '%虚拟-B%'
+        GROUP BY
+            p.workorder_id,
+            p.resource_name,
+            p.parent_container_name,
+            p.restruct_container_name,
+            p.split_group,
+            p.up_or_down,
+            p.qzz_size,
+            p.is_paper_ok,
+            p.manufacture_sort,
+            p.start_time,
+            p.qzz_generation,
+            p.paper_tube_or_FRP,
+            p.paper_tube_description,
+            p.FRP_description
+        ORDER BY
+            `status`,
+            qzz_size,
+            manufacture_sort desc,
+            start_time
+    </select>
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/BhTubeMovePointDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/BhTubeMovePointDto.java
new file mode 100644
index 000000000..00aea2cd7
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/BhTubeMovePointDto.java
@@ -0,0 +1,24 @@
+package org.nl.b_lms.sch.tasks.slitter.mapper.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/3/19
+ */
+@Data
+public class BhTubeMovePointDto {
+    /**
+     * 点位
+     */
+    private String point_code;
+    /**
+     * 托盘号
+     */
+    private String vehicle_code;
+    private String ivt_status;
+    /**
+     * 数量
+     */
+    private Integer qty;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/BhTubePointDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/BhTubePointDto.java
new file mode 100644
index 000000000..6c63ba254
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/BhTubePointDto.java
@@ -0,0 +1,24 @@
+package org.nl.b_lms.sch.tasks.slitter.mapper.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/3/18
+ */
+@Data
+public class BhTubePointDto {
+
+    /**
+     * 点位
+     */
+    private String point_code;
+    /**
+     * 托盘号
+     */
+    private String vehicle_code;
+    /**
+     * 数量
+     */
+    private Integer qty;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
new file mode 100644
index 000000000..7f88b3938
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
@@ -0,0 +1,48 @@
+package org.nl.b_lms.sch.tasks.slitter.mapper.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/3/11
+ */
+@Data
+public class CallPlanViewVO implements Serializable {
+    /**
+     * uuid
+     */
+    private String workorder_id;
+    /**
+     * 分切设备
+     */
+    private String resource_name;
+    /**
+     * 母卷
+     */
+    private String parent_container_name;
+    /**
+     * 分切组
+     */
+    private String split_group;
+    /**
+     * 上轴/下轴
+     */
+    private String up_or_down;
+    /**
+     * 数量
+     */
+    private String status;
+    /**
+     * 气胀轴尺寸
+     */
+    private String qzz_size;
+    private String tube;
+    /**
+     * 气胀轴代数
+     */
+    private String qzz_generation;
+    private String start_time;
+    private String is_paper_ok;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/GxQtyDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/GxQtyDto.java
new file mode 100644
index 000000000..b29a2f7ee
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/GxQtyDto.java
@@ -0,0 +1,14 @@
+package org.nl.b_lms.sch.tasks.slitter.mapper.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/4/29
+ */
+@Data
+public class GxQtyDto {
+    private String point_code;
+    private String point_type;
+    private Integer qty;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java
index 4d112329c..231444f07 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java
@@ -33,8 +33,17 @@ public class SlitterPlanDistinctDto {
      * 气胀轴尺寸
      */
     private String qzz_size;
+    /**
+     * 生产顺序
+     */
+    private String manufacture_sort;
     /**
      * 气胀轴代数
      */
     private String qzz_generation;
+
+    /**
+     * 开始时间
+     */
+    private String start_time;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
index 1cb543bde..f67edcdf1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
@@ -3,6 +3,7 @@ package org.nl.b_lms.sch.tasks.slitter.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO;
 
 import java.util.List;
 
@@ -305,4 +306,60 @@ public interface SlitterService {
      * @return
      */
     JSONObject forcedFeedShaft(JSONObject param);
+
+    /**
+     * 查看人工套轴信息
+     * @param param
+     * @return
+     */
+    List<CallPlanViewVO> showManualView(JSONObject param);
+
+    /**
+     * 加急送轴
+     * @param param
+     * @return
+     */
+    JSONObject urgentPlan(JSONObject param);
+
+    /**
+     * 子卷下料2
+     * @param param
+     * @return
+     */
+    JSONObject downRolls2(JSONObject param);
+
+    /**
+     * 母卷暂存架管理
+     * @param param
+     * @return
+     */
+    JSONObject rollCacheManage(JSONObject param);
+
+    /**
+     * 母卷暂存管理提示
+     * @param param
+     * @return
+     */
+    JSONObject rollCacheManageTip(JSONObject param);
+
+    /**
+     * 下卷确认
+     * @param param
+     * @return
+     */
+    JSONObject downRollsCheck(JSONObject param);
+
+    /**
+     * 饵料下卷
+     * @param param
+     * @return
+     */
+    JSONObject downBait(JSONObject param);
+
+    /**
+     * 空轴退回
+     * @param param
+     * @return
+     */
+    JSONObject returnShaft(JSONObject param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index c14ffcb6a..6cc1bef66 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -26,6 +26,7 @@ import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
 import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
 import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
@@ -38,12 +39,15 @@ import org.nl.b_lms.sch.tasks.slitter.*;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
 import org.nl.b_lms.sch.tasks.slitter.mapper.SlitterMapper;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.GxQtyDto;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
 import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
@@ -60,7 +64,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -76,6 +79,8 @@ import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocati
 @Service
 public class SlitterServiceImpl implements SlitterService {
 
+    @Autowired
+    private BstIvtStockingivtMapper bstIvtStockingivtMapper;
     @Autowired
     private IschBaseTaskService taskService;
     @Autowired
@@ -93,8 +98,6 @@ public class SlitterServiceImpl implements SlitterService {
     @Autowired
     private SlitterDownTrussTask slitterDownTrussTask;
     @Autowired
-    private SendCopperFoilSubRollTrussTask sendCopperFoilSubRollTrussTask;
-    @Autowired
     private RedissonClient redissonClient;
     @Autowired
     private TrussCallShaftCacheTask trussCallShaftCacheTask;
@@ -122,10 +125,15 @@ public class SlitterServiceImpl implements SlitterService {
     private IpdmBiSubpackagerelationService subpackagerelationService;
     @Autowired
     private UpShaftTrussTask upShaftTrussTask;
+    @Autowired
+    private ReturnShaftAgvTask returnShaftAgvTask;
+    @Autowired
+    private ISysNoticeService noticeService;
 
     @Override
 
     public JSONObject acsRequestShaftLoadTube(JSONObject param) {
+        // hint: 现在的考虑都是基于B1,B2的车间，后续的B3、B4需要再次修改
         log.info("acs申请套轴的输入参数为：{}", param);
         JSONObject res = new JSONObject();
         JSONObject con = new JSONObject();
@@ -136,6 +144,7 @@ public class SlitterServiceImpl implements SlitterService {
         if (ObjectUtil.isEmpty(autoSendEmpty)) {
             throw new BadRequestException("未配置是否直接送气胀轴");
         }
+        log.info("获取的穿拔轴点位数据：{}", point);
         // 判断尺寸是否相同
         if (!size.equals(point.getQzz_size())) {
             log.error("设备：{}对应的气胀轴尺寸不批对，需要气胀轴尺寸：{}，实际尺寸：{}", deviceCode, point.getQzz_size(), size);
@@ -145,17 +154,40 @@ public class SlitterServiceImpl implements SlitterService {
         List<String> tubes = Stream.of(point.getTube_code1(), point.getTube_code2())
                 .filter(ObjectUtil::isNotEmpty)
                 .collect(Collectors.toList());
-        // 判断是否存在纸管
-        List<MdPbPapervehicle> list = papervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>()
-                .in(MdPbPapervehicle::getMaterial_code, tubes)
-                .gt(MdPbPapervehicle::getQty, 0));
+        // 判断是否存在纸管(查找三点位是否有所需的管芯)
+//        List<MdPbPapervehicle> list = papervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>()
+//                .in(MdPbPapervehicle::getMaterial_code, tubes)
+//                .gt(MdPbPapervehicle::getQty, 0));
+        List<GxQtyDto> gxQtyList = papervehicleService.getGxPoints(point.getPoint_location(), tubes);
         // point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300  or  纸制筒管|纸管|3英寸|12|650
         res.put("device_code", deviceCode);
         res.put("data", con);
-        if ("1".equals(autoSendEmpty.getValue()) && list.size() == 0) {
-            con.put("is_bushing", "2");
+        if ("1".equals(autoSendEmpty.getValue()) && gxQtyList.size() == 0) {
+            con.put("is_bushing", SlitterConstant.TO_SHAFT_INFO_97);
         } else {
-            con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO);
+//            int sum = list.stream()
+//                    .mapToInt(e -> e.getQty().intValue())
+//                    .sum();
+//            // 需要求和判断当前数量和所需数
+//            con.put("is_bushing", sum >= tubes.size() ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO);
+            List<GxQtyDto> hasNeedPoint = gxQtyList.stream()
+                    .filter(gx -> "1".equals(gx.getPoint_type()) && gx.getQty() >= tubes.size())
+                    .collect(Collectors.toList());
+            if (hasNeedPoint.size() > 0) {
+                // 1、判断点位类型有没有=1，且数量大于等于所需数
+                con.put("is_bushing", SlitterConstant.SLITTER_YES);
+            } else {
+                // 2、判断点位有没有任务（010807->point3, 010808->point1）
+                List<String> pointCodes = gxQtyList.stream()
+                        .map(GxQtyDto::getPoint_code)
+                        .distinct()
+                        .collect(Collectors.toList());
+                Integer tasks = papervehicleService.checkHaveTaskByPoints(pointCodes);
+                con.put("is_bushing", tasks > 0
+                        ? SlitterConstant.SLITTER_YES
+                        : "1".equals(autoSendEmpty.getValue()) ? SlitterConstant.TO_SHAFT_INFO_97 : SlitterConstant.TO_SHAFT_INFO_98);
+            }
+
         }
         con.put("left", point.getTube_code1());
         con.put("leftSize", ObjectUtil.isNotEmpty(point.getTube_name1())
@@ -266,9 +298,9 @@ public class SlitterServiceImpl implements SlitterService {
         }
         List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.list(
                 new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
-                .in(PdmBiSlittingproductionplan::getContainer_name, collect)
-                .eq(PdmBiSlittingproductionplan::getStatus, "01")
-                .eq(PdmBiSlittingproductionplan::getIs_delete, "0"));
+                        .in(PdmBiSlittingproductionplan::getContainer_name, collect)
+                        .eq(PdmBiSlittingproductionplan::getStatus, "01")
+                        .eq(PdmBiSlittingproductionplan::getIs_delete, "0"));
         // 去异常位
         if (plans.size() == 0) {
             log.error("找不到[{}]对应的分切计划，分切计划可能被删除或者拼接!", collect);
@@ -338,7 +370,9 @@ public class SlitterServiceImpl implements SlitterService {
         }
         if (ObjectUtil.isEmpty(cutPoint)) {
             // 获取一个空位 （上下区域）
-            List<BstIvtCutpointivt> emptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus(
+//            List<BstIvtCutpointivt> emptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus(
+//                    "1", "1", startPoint.getPoint_location(), "1");
+            List<BstIvtCutpointivt> emptyNotTaskPoint = bcutpointivtService.getNBJAreaNotTaskPointByStatus(
                     "1", "1", startPoint.getPoint_location(), "1");
             if (emptyNotTaskPoint.size() == 0) {
                 throw new BadRequestException("找不到可用套轴对接位!");
@@ -390,35 +424,41 @@ public class SlitterServiceImpl implements SlitterService {
     @SneakyThrows
     @Override
     public JSONObject acsSendShaftToCache(JSONObject param) {
+        // 需要请求放货
         log.info("ACS申请送气涨轴到气涨轴暂存位的输入参数为：{}", param);
+        String lock = "lock";
         JSONObject res = new JSONObject();
         String deviceCode = param.getString("device_code");
         String qzzSize = param.getString("size");
-        // 判断是否有未完成的任务
-        List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
-                .eq(SchBaseTask::getPoint_code1, deviceCode)
-                .lt(SchBaseTask::getTask_status, "07"));
-        if (list.size() > 0) {
-            throw new BadRequestException("点位[" + deviceCode + "]存在未完成得任务！");
-        }
-        BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
-        // 临时存放气涨轴尺寸
-        startPoint.setQzz_size(qzzSize);
-        // 获取空位
-        List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCacheEmpty(startPoint);
-        if (shafttubeivts.size() == 0) {
-            throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
-        }
-        // todo: 过滤空位后面是否有轴的位置
-
-        BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
-        RLock lockPoint = redissonClient.getLock(shafttubeivt.getPoint_code());
+        RLock lockPoint = redissonClient.getLock(lock + qzzSize);
         boolean tryLockPoint = lockPoint.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLockPoint) {
+                // 判断是否有未完成的任务
+                List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
+                        .eq(SchBaseTask::getPoint_code1, deviceCode)
+                        .lt(SchBaseTask::getTask_status, "07"));
+                if (list.size() > 0) {
+                    throw new BadRequestException("点位[" + deviceCode + "]存在未完成得任务！");
+                }
+                BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
+                // 临时存放气涨轴尺寸
+                startPoint.setQzz_size(qzzSize);
+                // 获取等待点（放货点）
+                // 获取空位
+//                List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCacheEmpty(startPoint);
+//                if (shafttubeivts.size() == 0) {
+//                    throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
+//                }
+                BstIvtShafttubeivt putWaitPoint = shafttubeivtService.getOne(new LambdaQueryWrapper<BstIvtShafttubeivt>()
+                        .eq(BstIvtShafttubeivt::getPoint_location, startPoint.getPoint_location())
+                        .eq(BstIvtShafttubeivt::getPoint_type, "8"));
+                if (ObjectUtil.isEmpty(putWaitPoint)) {
+                    throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的等待点位");
+                }
                 // 创建任务
                 param.put("point_code1", deviceCode);
-                param.put("point_code2", shafttubeivt.getPoint_code());
+                param.put("point_code2", putWaitPoint.getPoint_code());
                 // hint: 当前分切计划的气涨轴尺寸
                 param.put("qzz_size", qzzSize);
                 param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴位<>气胀轴缓存位"));
@@ -453,14 +493,20 @@ public class SlitterServiceImpl implements SlitterService {
         }
         BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
         // 获取气涨轴缓存没有任务的点位
-        List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize,
-                startPoint.getQzz_generation(), startPoint.getPoint_location());
-        if (shafttubeivts.size() == 0) {
-            throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位");
+//        List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize,
+//                startPoint.getQzz_generation(), startPoint.getPoint_location());
+//        if (shafttubeivts.size() == 0) {
+//            throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位");
+//        }
+        BstIvtShafttubeivt pickWaitPoint = shafttubeivtService.getOne(new LambdaQueryWrapper<BstIvtShafttubeivt>()
+                .eq(BstIvtShafttubeivt::getPoint_location, startPoint.getPoint_location())
+                .eq(BstIvtShafttubeivt::getPoint_type, "7"));
+        if (ObjectUtil.isEmpty(pickWaitPoint)) {
+            throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的等待点位");
         }
-        BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
+//        BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
         JSONObject taskParam = new JSONObject();
-        taskParam.put("point_code1", shafttubeivt.getPoint_code());
+        taskParam.put("point_code1", pickWaitPoint.getPoint_code());
         taskParam.put("point_code2", startPoint.getPoint_code());
         taskParam.put("is_bushing", SlitterConstant.SLITTER_YES);
         taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴位<>气胀轴缓存位"));
@@ -486,12 +532,11 @@ public class SlitterServiceImpl implements SlitterService {
             log.error("子卷参数不能为空！");
             throw new BadRequestException("子卷参数不能为空！");
         }
-        // 获取分切计划，最多4个需要出站的任务
+        // 获取分切计划，最多4个需要出站的任务 (不在校验05状态)
         List<PdmBiSlittingproductionplan> currentPlans = slittingproductionplanService.list(
                 new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                         .in(PdmBiSlittingproductionplan::getContainer_name, containerList)
-                        .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)
-                        .eq(PdmBiSlittingproductionplan::getStatus, "05"));
+                        .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO));
         if (currentPlans.size() == 0) {
             log.error("当前子卷已经出卷或者不存在！");
             throw new BadRequestException("当前子卷已经出卷或者不存在！");
@@ -514,20 +559,12 @@ public class SlitterServiceImpl implements SlitterService {
         }
         String area = device.getProduct_area();
         // 获取当前分切机的下一组分切计划(最多四条分切计划)
-        // hint: 获取到的分切可能是不同组的但具有一定时间顺序
-        List<PdmBiSlittingproductionplan> timePlans = slittingproductionplanService.list(
-                new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
-                        .eq(PdmBiSlittingproductionplan::getResource_name, device.getExt_code())
-                        .eq(PdmBiSlittingproductionplan::getStatus, "03")
-                        .eq(PdmBiSlittingproductionplan::getIs_delete, "0")
-                        .orderByAsc(PdmBiSlittingproductionplan::getUpdate_time));
-        log.info("获取下一组分切计划(可能存在脏数据)：{}", timePlans);
         // 寻找备好轴的对接点位
-        List<BstIvtCutpointivt> cutPointList = slitterMapper.getReadyShaftPoint(device.getExt_code());
+        List<BstIvtCutpointivt> cutPointList = slitterMapper.getReadyShaftPoint(actualDeviceCode);
         // 任务参数
         JSONObject taskParam = new JSONObject();
         taskParam.put("containers", containers);
-        if (timePlans.size() == 0 || cutPointList.size() == 0) {
+        if (cutPointList.size() == 0) {
             // 如果没有下一组的分切计划，就只做下卷任务（判断下单/下双）
             // 获取分切对接位没任务的空位置
             List<BstIvtCutpointivt> emptyPoints = slitterMapper.getEmptyCutPointNotTask(area,
@@ -581,19 +618,16 @@ public class SlitterServiceImpl implements SlitterService {
                 }
             }
         }
-        PdmBiSlittingproductionplan tmpPlan = timePlans.get(0);
-        // hint: 以第一条为准，过滤和第一条同组同母卷的分切计划
-        List<PdmBiSlittingproductionplan> nextPlans = timePlans.stream()
-                .filter(plan -> plan.getParent_container_name().equals(tmpPlan.getParent_container_name())
-                        && plan.getRestruct_container_name().equals(tmpPlan.getRestruct_container_name())
-                        && plan.getSplit_group().equals(tmpPlan.getSplit_group()))
+        // 找到该分切计划的点位
+        BstIvtCutpointivt newCutPoint = cutPointList.get(0);
+        List<String> qzznos = Stream.of(newCutPoint.getQzz_no1(), newCutPoint.getQzz_no2()).filter(ObjectUtil::isNotEmpty)
                 .collect(Collectors.toList());
+        // hint: 以第一条为准，过滤和第一条同组同母卷的分切计划
+        List<PdmBiSlittingproductionplan> nextPlans = slittingproductionplanService.getByQzzNos(qzznos);
         log.info("获取下一趟分切计划数据：{}", nextPlans);
         // 筛选上下轴各一条
         PdmBiSlittingproductionplan nextUpPlan = nextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null);
         PdmBiSlittingproductionplan nextDownPlan = nextPlans.stream().filter(p -> "2".equals(p.getUp_or_down())).findFirst().orElse(null);
-        // 找到该分切计划的点位
-        BstIvtCutpointivt newCutPoint = cutPointList.get(0);
         String binaryExpress = TaskUtils.binaryConvertExpress(currentUpPlan, currentDownPlan, nextUpPlan, nextDownPlan);
         switch (binaryExpress) {
             case "00":
@@ -821,7 +855,7 @@ public class SlitterServiceImpl implements SlitterService {
         if (list.size() == 0) {
             throw new BadRequestException("分切机" + device_code + " 的分切计划 " + qzzNo + " 不存在");
         }
-        List<SchBaseTask> tasks = taskService.checkHaveTask(device_code);
+        List<SchBaseTask> tasks = taskService.checkHaveTrussTask(Arrays.asList(deviceCode.getUp_point_code(), deviceCode.getDown_point_code()));
         if (tasks.size() > 0) {
             throw new BadRequestException("分切机" + device_code + " 已经有存在的任务");
         }
@@ -862,8 +896,13 @@ public class SlitterServiceImpl implements SlitterService {
         return null;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public JSONObject acsToReduceTube(JSONObject param) {
         log.info("扣除纸管数据的输入参数为：{}", param);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "请求成功!");
         // param: device_code row_num
         if (ObjectUtil.isEmpty(param.getString("row_num"))) {
             log.error("设备：{}，排数不能为空", param.getString("device_code"));
@@ -885,24 +924,38 @@ public class SlitterServiceImpl implements SlitterService {
         MdPbPapervehicle mdPbPapervehicle = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>()
                 .eq(MdPbPapervehicle::getVehicle_code, vehicleCode)
                 .eq(MdPbPapervehicle::getRow_num, param.getString("row_num")));
-        int qty = mdPbPapervehicle.getQty().intValue();
-        if (qty <= 0) {
-            throw new BadRequestException("当前物料数量为0!");
+        if (ObjectUtil.isEmpty(mdPbPapervehicle)) {
+            log.warn("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
+            throw new BadRequestException("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
+        }
+        log.debug("更新前：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle);
+        if (mdPbPapervehicle != null || mdPbPapervehicle.getQty().intValue() > 0) {
+            //数量减一
+            mdPbPapervehicle.setQty(BigDecimal.valueOf(mdPbPapervehicle.getQty().intValue() - 1));
+
+            log.debug("更新后：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle);
+
+            // 检查更新后的 qty 是否为 0，然后删除相应的记录
+            if (mdPbPapervehicle.getQty().intValue() <= 0) {
+                boolean remove = papervehicleService.removeById(mdPbPapervehicle);
+                log.debug("删除0结果：" + vehicleCode + ":" + remove);
+            } else {
+                papervehicleService.update(mdPbPapervehicle);
+            }
+            // todo: 如果qty=0，创建AGV送空任务，（新的task_type）、后期优化可以新增诺宝取货完成提前释放货位，任务状态变成071
+//            if (remove) { // hint: 错误
+//                // 证明删除成功，创建任务搬走
+//                // 查找一个没有任务的空位
+//                List<BstIvtStockingivt> list = stockingivtService.getEmptyPointNotTask(device.getPoint_location(), "0");
+//                if (list.size() == 0) {
+//                    noticeService.createNotice("管芯抓取备货区找不到空位置搬运",
+//                            "管芯抓取点位[" + device.getPoint_name() + "]无法从备货区找到空位",
+//                            NoticeTypeEnum.EXCEPTION.getCode());
+//                    return res;
+//                }
+//                BstIvtStockingivt stockingivt = list.get(0);
+//            }
         }
-        UpdateWrapper<MdPbPapervehicle> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("vehicle_code", vehicleCode)
-                .eq("row_num", param.getString("row_num"))
-                .setSql("qty=qty-1");
-        papervehicleService.update(updateWrapper);
-        // 检查更新后的 qty 是否为 0，然后删除相应的记录
-        QueryWrapper<MdPbPapervehicle> deleteWrapper = new QueryWrapper<>();
-        deleteWrapper.eq("vehicle_code", vehicleCode)
-                .eq("row_num", param.getString("row_num"))
-                .eq("qty", "0");
-        papervehicleService.remove(deleteWrapper);
-        JSONObject res = new JSONObject();
-        res.put("status", HttpStatus.HTTP_OK);
-        res.put("message", "请求成功!");
         return res;
     }
 
@@ -975,14 +1028,12 @@ public class SlitterServiceImpl implements SlitterService {
         String device_code = param.getString("device_code");
 
         //查询当前母卷所在的点位在哪
-        JSONObject cache_jo = WQLObject.getWQLObject("st_ivt_stpointcacheivt").query("container_name = '"+container_name+"'").uniqueResult(0);
+        JSONObject cache_jo = WQLObject.getWQLObject("st_ivt_stpointcacheivt").query("container_name = '" + container_name + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(cache_jo)) {
             throw new BadRequestException("未查询到母卷所在的点位！");
         }
 
 
-
-
         return null;
     }
 
@@ -1026,7 +1077,7 @@ public class SlitterServiceImpl implements SlitterService {
         // param: point_code
         String pointCode = param.getString("point_code");
         // 校验是否存在任务
-        List<SchBaseTask> taskList = taskService.checkHaveTask(pointCode);
+        List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode);
         if (taskList.size() > 0) {
             throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的任务!");
         }
@@ -1048,11 +1099,17 @@ public class SlitterServiceImpl implements SlitterService {
         if (CollectionUtil.isNotEmpty(qzzNos)) {
             List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByQzzNos(qzzNos);
             List<String> collect = plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList());
+            if (collect.size() == 0) {
+                throw new BadRequestException("操作失败，点位[" + pointCode + "]未查到子卷分切计划，请先绑定子卷库存!");
+            }
             taskParam.put("containers", collect);
+        } else {
+            throw new BadRequestException("操作失败，点位[" + pointCode + "]无气胀轴信息，请先绑定子卷库存!");
         }
-        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
-                "1", "0", "2");
-        if (areaEmptyNotTaskPoint.size() == 0) {
+//        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
+//                "1", "0", "2");
+        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getNBJCanUsePoint("1", "1", "0", "2");
+        if (areaEmptyNotTaskPoint.size() <= 1) {
             throw new BadRequestException("请求搬运失败，内包间没有可存放位置！");
         }
         BstIvtCutpointivt endPoint = areaEmptyNotTaskPoint.get(0);
@@ -1192,6 +1249,11 @@ public class SlitterServiceImpl implements SlitterService {
         if (plans.size() == 0) {
             throw new BadRequestException("子卷号：[" + containerName + "] 的分切计划没找到，检查是否推送或者子卷号是否正确！");
         }
+        // 校验是否存在任务
+        List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode1);
+        if (taskList.size() > 0) {
+            throw new BadRequestException("操作失败，点位[" + pointCode1 + "]存在未完成的任务!");
+        }
         BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false);
         PdmBiSlittingproductionplan demoPlan = plans.get(0);
         String resourceName = demoPlan.getResource_name();
@@ -1254,6 +1316,11 @@ public class SlitterServiceImpl implements SlitterService {
         if (plans.size() == 0) {
             throw new BadRequestException("子卷号：[" + containerName + "] 的分切计划没找到，检查是否推送或者子卷号是否正确！");
         }
+        // 校验是否存在任务
+        List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode1);
+        if (taskList.size() > 0) {
+            throw new BadRequestException("操作失败，点位[" + pointCode1 + "]存在未完成的任务!");
+        }
         BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false);
         PdmBiSlittingproductionplan demoPlan = plans.get(0);
         String resourceName = demoPlan.getResource_name();
@@ -1401,7 +1468,7 @@ public class SlitterServiceImpl implements SlitterService {
         String upQzzno = deviceCode.getUp_qzzno();
         String downQzzno = deviceCode.getDown_qzzno();
         if (ObjectUtil.isNotEmpty(upQzzno)) {
-            List<PdmBiSlittingproductionplan> byQzzNo = slittingproductionplanService.getByQzzNoByStatus(upQzzno, "05");
+            List<PdmBiSlittingproductionplan> byQzzNo = slittingproductionplanService.getByQzzNoByNoStatus(upQzzno);
             if (byQzzNo.size() == 0) {
                 msg = "上轴对应的数据不存在！";
             } else {
@@ -1410,12 +1477,16 @@ public class SlitterServiceImpl implements SlitterService {
                         .map(PdmBiSlittingproductionplan::getContainer_name)
                         .collect(Collectors.joining(","));
                 data.put("up", collect);
+                PdmBiSlittingproductionplan dplan = byQzzNo.get(0);
+                if (!dplan.getStatus().equals("05")) {
+                    msg = "上轴的计划不是入站完成！";
+                }
             }
         } else {
             msg = "上轴无子卷信息！";
         }
         if (ObjectUtil.isNotEmpty(downQzzno)) {
-            List<PdmBiSlittingproductionplan> byQzzNo = slittingproductionplanService.getByQzzNoByStatus(downQzzno, "05");
+            List<PdmBiSlittingproductionplan> byQzzNo = slittingproductionplanService.getByQzzNoByNoStatus(downQzzno);
             if (byQzzNo.size() == 0) {
                 msg = msg + "下轴对应的数据不存在！";
             } else {
@@ -1424,6 +1495,10 @@ public class SlitterServiceImpl implements SlitterService {
                         .map(PdmBiSlittingproductionplan::getContainer_name)
                         .collect(Collectors.joining(","));
                 data.put("down", collect);
+                PdmBiSlittingproductionplan dplan = byQzzNo.get(0);
+                if (!dplan.getStatus().equals("05")) {
+                    msg = "下轴的计划不是入站完成！";
+                }
             }
         } else {
             msg = msg + "下轴无子卷信息!";
@@ -1537,6 +1612,20 @@ public class SlitterServiceImpl implements SlitterService {
         if (ObjectUtil.isEmpty(pointByCode)) {
             throw new BadRequestException("点位 [" + pointCode + "] 不存在或者已被禁用！");
         }
+        if (ObjectUtil.isEmpty(vehicleCode)) {
+            throw new BadRequestException("托盘信息不能为空！");
+        }
+        if (!vehicleCode.contains("GX")) {
+            throw new BadRequestException("请扫描或输入正确的托盘码！");
+        }
+
+        LambdaQueryWrapper<BstIvtStockingivt> lam = new LambdaQueryWrapper<>();
+        lam.eq(BstIvtStockingivt::getVehicle_code, vehicleCode)
+                .eq(BstIvtStockingivt::getIs_used, SlitterConstant.SLITTER_YES);
+        BstIvtStockingivt old = bstIvtStockingivtMapper.selectOne(lam);
+        if (ObjectUtil.isNotEmpty(old)) {
+            throw new BadRequestException("当前托盘:" + vehicleCode + "已绑定在点位:" + old.getPoint_code() + "上,不允许重复绑定！");
+        }
         pointByCode.setVehicle_code(vehicleCode);
         pointByCode.setIvt_status("1");
         TaskUtils.updateOptMessageByBStockingPoint(pointByCode);
@@ -1590,7 +1679,7 @@ public class SlitterServiceImpl implements SlitterService {
         List<String> containers = byQzzNos.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList());
         taskParam.put("containers", containers);
         List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("2",
-                "1", "0","0");
+                "1", "0", "0");
         if (areaEmptyNotTaskPoint.size() == 0) {
             throw new BadRequestException(cut.getProduct_area() + "该区域暂存位暂无位置存放满轴");
         }
@@ -1634,7 +1723,7 @@ public class SlitterServiceImpl implements SlitterService {
         PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
         if (ObjectUtil.isNotEmpty(rollWeight)) {
             BigDecimal bigDecimal = new BigDecimal(rollWeight);
-            if (bigDecimal.intValue()<50){
+            if (bigDecimal.intValue() < 50) {
                 throw new BadRequestException("子卷重量异常,不能小于50");
             }
             plan.setWeight(rollWeight);
@@ -1926,8 +2015,12 @@ public class SlitterServiceImpl implements SlitterService {
 //        玻璃纤维及其制品|FRP管|6英寸|15|1700|高强
         // param: area, device_code, up_left_size_k,up_right_size_k, up_left_size_v,up_right_size_v
         // down_left_size_k,down_right_size_k, down_left_size_v,down_right_size_v
-        log.info("创建虚拟分切计划呼叫气胀轴 - {}", param);
+        log.info("forcedFeedShaft_创建虚拟分切计划呼叫气胀轴 - {}", param);
         String area = param.getString("area");
+        int uLeftLen = 0;
+        int uRightLen = 0;
+        int dLeftLen = 0;
+        int dRightLen = 0;
         if (!area.startsWith("B")) {
             throw new BadRequestException("该功能只对二期有用！");
         }
@@ -1944,11 +2037,38 @@ public class SlitterServiceImpl implements SlitterService {
         String downRightSizeK = param.getString("down_right_size_k");
         String downLeftSizeV = param.getString("down_left_size_v");
         String downRightSizeV = param.getString("down_right_size_v");
+        // 获取设备的
+        List<PdmBiSlittingproductionplan> checkPlans = slittingproductionplanService.getXnPlanByDevice(deviceCode);
+        //判断是否有未配送完成的虚拟分切计划
+        if (ObjectUtil.isNotEmpty(checkPlans)) {
+            PdmBiSlittingproductionplan now_checkPlan = checkPlans.get(0);
+            if ("01".equals(now_checkPlan.getStatus())) {
+                log.debug(deviceCode + "气胀轴正在准备，不允许二次呼叫套轴！");
+                throw new BadRequestException(deviceCode + "气胀轴正在准备，不允许二次呼叫套轴!");
+            } else if ("02".equals(now_checkPlan.getStatus())) {
+                log.debug(deviceCode + "气胀轴配送中，不允许二次呼叫套轴！");
+                throw new BadRequestException(deviceCode + "气胀轴配送中，不允许二次呼叫套轴!");
+            }
+        }
+        //判断分切暂存位是否有已配送的气胀轴或未下料完成的子卷
+        //根据机台号获取分切区域表
+        StIvtCutpointivt deviceCut = cutpointivtService.getPintByExtCode(deviceCode, false);
+        //获取机台对应的空闲对接位
+        List<BstIvtCutpointivt> emptyPoint = slitterMapper.getEmptyCutPointNotTask(deviceCut.getProduct_area(),
+                deviceCut.getSort_seq(),
+                SlitterTaskUtil.getPointLocationInCutDevice(
+                        SlitterTaskUtil.getNumberByResourceCode(deviceCode),
+                        deviceCut.getProduct_area()));
+        if (emptyPoint.size() == 0) {
+            log.debug(deviceCode + "对接缓存位不是空位或存在执行中的任务！");
+            throw new BadRequestException(deviceCode + "对接缓存位不是空位或存在执行中的任务！");
+        }
+
         List<PdmBiSlittingproductionplan> plans = new ArrayList<>();
         // 虚拟计划
         for (int i = 0; i < 4; i++) {
             String containerName = area + "虚拟-" + deviceCode + "-" + i;
-            PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
+            PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerNameNotStatus(containerName);
             if (ObjectUtil.isEmpty(plan)) {
                 plan = new PdmBiSlittingproductionplan();
                 plan.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
@@ -2010,6 +2130,7 @@ public class SlitterServiceImpl implements SlitterService {
                 }
                 plan.setUp_or_down("1");
                 plan.setLeft_or_right("1");
+                uLeftLen = SlitterTaskUtil.getPaperLengthInt(plan);
             }
             if (i == 1 && ObjectUtil.isNotEmpty(upRightSizeK)) {
                 // 上右
@@ -2032,6 +2153,7 @@ public class SlitterServiceImpl implements SlitterService {
                 } else {
                     plan.setQzz_generation("5");
                 }
+                uRightLen = SlitterTaskUtil.getPaperLengthInt(plan);
             }
             if (i == 2 && ObjectUtil.isNotEmpty(downLeftSizeK)) {
                 // 下左
@@ -2054,6 +2176,7 @@ public class SlitterServiceImpl implements SlitterService {
                 } else {
                     plan.setQzz_generation("5");
                 }
+                dLeftLen = SlitterTaskUtil.getPaperLengthInt(plan);
             }
             if (i == 4 && ObjectUtil.isNotEmpty(downRightSizeK)) {
                 // 下右
@@ -2076,6 +2199,7 @@ public class SlitterServiceImpl implements SlitterService {
                 } else {
                     plan.setQzz_generation("5");
                 }
+                dRightLen = SlitterTaskUtil.getPaperLengthInt(plan);
             }
             if (i == 0 && ObjectUtil.isEmpty(upLeftSizeK)) {
                 plan.setIs_delete("1");
@@ -2091,6 +2215,10 @@ public class SlitterServiceImpl implements SlitterService {
             }
             plans.add(plan);
         }
+        if (uLeftLen + uRightLen > 1700 || dLeftLen + dRightLen > 1700) {
+            throw new BadRequestException("同一根轴长度不能超过气胀轴长度，请确认是否选择正确!");
+        }
+        log.warn("forcedFeedShaft_______:{}", deviceCode);
         slittingproductionplanService.saveOrUpdateBatch(plans);
         if (area.startsWith("B")) {
             // 机台打开
@@ -2107,4 +2235,439 @@ public class SlitterServiceImpl implements SlitterService {
         res.put("message", "呼叫送轴成功!");
         return res;
     }
+
+    private PdmBiSlittingproductionplan doCheckCanCallAgain(List<PdmBiSlittingproductionplan> checkPlans) {
+        // 如果is_paper_ok = 2那就不允许
+        for (PdmBiSlittingproductionplan checkPlan : checkPlans) {
+            if ("2".equals(checkPlan.getStatus())) {
+                return checkPlan;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public List<CallPlanViewVO> showManualView(JSONObject param) {
+        return slitterMapper.showManualView();
+    }
+
+    @Override
+    public JSONObject urgentPlan(JSONObject param) {
+        JSONObject res = new JSONObject();
+        log.info("加急送轴的输入参数为：{}", param);
+        String workorder_id = param.getString("workorder_id");
+        PdmBiSlittingproductionplan plan = slittingproductionplanService.getById(workorder_id);
+        log.info("当前加急送轴的计划为：{}", plan);
+        if (!"01".equals(plan.getStatus())) {
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急失败,当前计划正在套轴!");
+            return res;
+        }
+        if (!"P1".equals(plan.getManufacture_sort())) {
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急失败,当前计划已加急过一次!");
+            return res;
+        }
+        //更新套轴计划开始时间为当前时间
+        LambdaUpdateWrapper<PdmBiSlittingproductionplan> updateWrapper = new LambdaUpdateWrapper<PdmBiSlittingproductionplan>();
+        updateWrapper.set(PdmBiSlittingproductionplan::getStart_time, DateUtil.now())
+                .set(PdmBiSlittingproductionplan::getManufacture_sort, "P2")
+                .eq(PdmBiSlittingproductionplan::getWorkorder_id, workorder_id)
+                .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO);
+        //判断更新是否成功
+        boolean flag = slittingproductionplanService.update(updateWrapper);
+        if (flag) {
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急成功!");
+        } else {
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急失败,请刷新再试!");
+        }
+        return res;
+    }
+
+    @Override
+    public JSONObject downRolls2(JSONObject param) {
+        log.info("下卷2的输入参数为：{}", param);
+        // param: device_code, container: [{"container_name":"子卷号", "site":"上下轴（1/2）"}]
+        String device_code = param.getString("device_code");
+        StIvtCutpointivt deviceCode = cutpointivtService.getPintByExtCode(device_code, false);
+        List<SchBaseTask> tasks = taskService.checkHaveTrussTask(Arrays.asList(deviceCode.getUp_point_code(), deviceCode.getDown_point_code()));
+        if (tasks.size() > 0) {
+            throw new BadRequestException("分切机" + device_code + " 已经有存在的任务");
+        }
+        JSONArray conArray = param.getJSONArray("container");
+        List<String> containerNames = new ArrayList<>();
+        for (int i = 0; i < conArray.size(); i++) {
+            JSONObject container = conArray.getJSONObject(i);
+            containerNames.add(container.getString("container_name"));
+        }
+        List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByContainerNames(containerNames);
+        // 兜底校验：判断与实际是否一致
+        SlitterTaskUtil.validateConsistency(conArray, plans);
+        JSONObject reqParam = new JSONObject();
+        reqParam.put("device_code", device_code);
+        reqParam.put("container", containerNames);
+        mesSlittingMachineSendMaterial(reqParam);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "子卷出站任务生成成功!");
+        return res;
+    }
+
+    @Override
+    public JSONObject rollCacheManage(JSONObject param) {
+        // param: point_code、flag（1：无空轴，2：有空轴）
+        String pointCode = param.getString("point_code");
+        String flag = param.getString("flag");
+        WQLObject coolTab = WQLObject.getWQLObject("st_ivt_coolpointivt");
+        JSONObject cool_jo = coolTab
+                .query("full_point_code = '" + pointCode + "' or empty_point_code = '" + pointCode + "'")
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(cool_jo)) {
+            throw new BadRequestException("该暂存架不存在!");
+        }
+        cool_jo.put("empty_point_status", "1".equals(flag) ? "01" : "02");
+        cool_jo.put("update_optid", SecurityUtils.getCurrentUserId());
+        cool_jo.put("update_optname", SecurityUtils.getCurrentNickName());
+        cool_jo.put("update_time", DateUtil.now());
+        coolTab.update(cool_jo);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "点位更新成功!");
+        return res;
+    }
+
+    @Override
+    public JSONObject rollCacheManageTip(JSONObject param) {
+        // param: point_code
+        String pointCode = param.getString("point_code");
+        JSONObject res = new JSONObject();
+        JSONObject data = new JSONObject();
+        WQLObject coolTab = WQLObject.getWQLObject("st_ivt_coolpointivt");
+        JSONObject cool_jo = coolTab
+                .query("full_point_code = '" + pointCode + "' or empty_point_code = '" + pointCode + "'")
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(cool_jo)) {
+            throw new BadRequestException("该暂存架不存在!");
+        }
+        data.put("msg", "该位置 " + ("01".equals(cool_jo.getString("empty_point_status")) ? "没有空轴" : "有空轴"));
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("data", data);
+        return res;
+    }
+
+    @Override
+    public JSONObject downRollsCheck(JSONObject param) {
+        // param: device_code, container: [{"container_name":"子卷号", "site":"上下轴（1/2）"}]
+        JSONObject res = new JSONObject();
+        String device_code = param.getString("device_code");
+        List<SchBaseTask> tasks = taskService.checkHaveTask(device_code);
+        if (tasks.size() > 0) {
+            throw new BadRequestException("分切机" + device_code + " 已经有存在的任务");
+        }
+        JSONArray conArray = param.getJSONArray("container");
+        List<String> containerNames = new ArrayList<>();
+        for (int i = 0; i < conArray.size(); i++) {
+            JSONObject container = conArray.getJSONObject(i);
+            containerNames.add(container.getString("container_name"));
+        }
+        List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByContainerNames(containerNames);
+
+        try {
+            SlitterTaskUtil.validateConsistency(conArray, plans);
+        } catch (Exception e) {
+            res.put("flag", "2");
+            res.put("message", e.getMessage());
+        }
+        res.put("flag", "1");
+        return res;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject returnShaft(JSONObject param) {
+        log.info("空轴退回 - {}", param);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "创建AGV任务成功!");
+        // param: point_code
+        String pointCode = param.getString("point_code");
+        //缓存A气胀轴规格 3-4 三寸四代
+        String size1 = param.getString("size1");
+        //缓存B气胀轴规格
+        String size2 = param.getString("size2");
+
+        BstIvtCutpointivt point = bcutpointivtService.getPintByAgvCode(pointCode, false);
+        // 校验是否存在行架任务
+        Boolean haveTaskByZcPoint = taskService.checkHaveTaskByZcPoint(point);
+        if (haveTaskByZcPoint) {
+            throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的行架任务!");
+        }
+        // 校验是否存在agv任务
+        List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode);
+        if (taskList.size() > 0) {
+            throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的agv任务!");
+        }
+
+        if (ObjectUtil.equals(point.getPoint_status(), "2")) {
+            // 如果是没货
+            throw new BadRequestException("点位：" + point.getPoint_code() + "检测空气胀轴，请先清空点位信息再触发！！");
+        }
+        if (ObjectUtil.equals(point.getPoint_status(), "3")) {
+            throw new BadRequestException("点位：" + point.getPoint_code() + "检测子卷，请先清空点位信息再触发！！");
+        }
+        if (ObjectUtil.isNotEmpty(point.getQzz_no1()) || ObjectUtil.isNotEmpty(point.getQzz_no2())) {
+            throw new BadRequestException("点位：" + point.getPoint_code() + " 的气胀轴编码不为空,请先清空点位信息再触发！！");
+        }
+        if (Objects.equals(point.getPoint_status(), "1") && ObjectUtil.isEmpty(point.getQzz_no1()) && ObjectUtil.isEmpty(point.getQzz_no2())) {
+            // 如果是没货 绑定为空轴状态
+            point.setPoint_status("4");
+            bcutpointivtService.updateById(point);
+        }
+        JSONObject taskParam = new JSONObject();
+
+        // 获取内包间缓存位
+        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getNBJCanUsePoint("1", "1", "0", "2");
+        if (areaEmptyNotTaskPoint.size() <= 1) {
+            throw new BadRequestException("请求搬运失败，内包间没有可存放位置！");
+        }
+        BstIvtCutpointivt endPoint = areaEmptyNotTaskPoint.get(0);
+        RLock lock = redissonClient.getLock(endPoint.getPoint_code());
+        boolean tryLock;
+        try {
+            tryLock = lock.tryLock(0, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new BadRequestException("获取锁异常");
+        }
+        try {
+            if (tryLock) {
+                taskParam.put("point_code1", point.getPoint_code());
+                taskParam.put("point_code2", endPoint.getPoint_code());
+                if (ObjectUtil.isNotEmpty(size1)) {
+                    taskParam.put("vehicle_code1", IdUtil.getSnowflake(1, 1).nextIdStr() + size1);
+                }
+                if (ObjectUtil.isNotEmpty(size2)) {
+                    taskParam.put("vehicle_code2", IdUtil.getSnowflake(1, 1).nextIdStr() + size2);
+                }
+                taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料AGV到内包间"));
+                taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
+                returnShaftAgvTask.createTask(taskParam);
+            } else {
+                throw new BadRequestException("系统繁忙，稍后在试!!");
+            }
+        } finally {
+            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+        return res;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject downBait(JSONObject param) {
+        log.info("饵料下卷：{}", param);
+        // param: area, device_code, point_code, left_spec, right_spec
+        String area = param.getString("area");
+        String point_code = param.getString("point_code");
+        String up_or_down = param.getString("up_or_down");
+        String left_spec = param.getString("left_spec_value");
+        String right_spec = param.getString("right_spec_value");
+        String left_spec_value = param.getString("left_spec");
+        String right_spec_value = param.getString("right_spec");
+        int num = ObjectUtil.isNotEmpty(left_spec) && ObjectUtil.isNotEmpty(right_spec) ? 2 : 1;
+        if (!area.startsWith("B")) {
+            throw new BadRequestException("仅限于二期使用");
+        }
+        //查询该点位对应的机台编号
+        StIvtCutpointivt cutDevice = cutpointivtService.getPintByUpOrDownCode(point_code, false);
+//        JSONObject cut_ivt = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("up_point_code ='" + point_code + "' OR down_point_code ='" + point_code + "'").uniqueResult(0);
+        String device_code = cutDevice.getExt_code();
+        if (ObjectUtil.isEmpty(cutDevice)) {
+            throw new BadRequestException("未查询到对应的分切机！");
+        }
+        // 判断是否存在任务
+        List<SchBaseTask> tasks = taskService.checkHaveTask("1".equals(up_or_down) ? cutDevice.getUp_point_code() : cutDevice.getDown_point_code());
+        if (tasks.size() > 0) {
+            throw new BadRequestException("该点位已经创建过任务");
+        }
+        List<PdmBiSlittingproductionplan> plans = new ArrayList<>();
+        String qzzNo = device_code.substring(0, 2)
+                + device_code.substring(device_code.length() - 2)
+                + TaskUtils.getDateTime("yyMMddHHmmss") + "-饵料";
+        String code = "饵料" + TaskUtils.getDateTime("yyMMddHHmmss");
+        // 创建饵料计划
+        for (int i = 0; i < num; i++) {
+            String containerName = area + code + "-" + i;
+            PdmBiSlittingproductionplan plan = new PdmBiSlittingproductionplan();
+            plan.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+            // 公共部分插入
+            plan.setOrder_type("1");
+            plan.setContainer_name(containerName);
+            plan.setProduct_name("220890200000001");
+            plan.setDescription("虚拟卷");
+            plan.setParent_container_name(code);
+            plan.setRestruct_container_name("");
+            plan.setWare_house("1");
+            plan.setResource_name(device_code);
+            plan.setSplit_group("A");
+            plan.setManufacture_sort("P1");
+            plan.setMfg_order_name("-");
+            plan.setManufacture_date(DateUtil.format(DateUtil.date(), "yyyy-MM-dd"));
+            plan.setSplit_breadth(new BigDecimal("999"));
+            plan.setSplit_height(new BigDecimal("999"));
+            plan.setSplit_weight(new BigDecimal("999"));
+            plan.setStart_time(DateUtil.now());
+            plan.setEnd_time("");
+            plan.setStatus("01");
+            plan.setIs_parent_ok("0");
+            plan.setIs_child_tz_ok("0");
+            plan.setIs_child_ps_ok("0");
+            plan.setPaper_weight("0");
+            plan.setQzzno("");
+            plan.setIs_delete("0");
+            plan.setSale_order_name("-");
+            plan.setIs_call("0");
+            plan.setIs_paper_ok("1");
+            plan.setFRP_model("");
+            plan.setFRP_material("");
+            plan.setFRP_description("");
+            plan.setPaper_tube_model("");
+            plan.setPaper_tube_material("");
+            plan.setPaper_tube_description("");
+            plan.setQzzno(qzzNo);
+            plan.setLevel("5");
+            // 区分位置创建
+            if (i == 0 && ObjectUtil.isNotEmpty(left_spec) && "1".equals(up_or_down)) {
+                // 上左
+                plan.setPaper_tube_or_FRP(left_spec_value.startsWith("48") ? "1" : "2");
+                String[] split = left_spec.split("\\|");
+                plan.setQzz_size(String.valueOf(split[2].charAt(0)));
+                if ("1".equals(plan.getPaper_tube_or_FRP())) {
+                    plan.setPaper_tube_material(left_spec_value);
+                    plan.setPaper_tube_model(left_spec);
+                    plan.setPaper_tube_description(left_spec);
+                } else {
+                    plan.setFRP_material(left_spec_value);
+                    plan.setFRP_model(left_spec);
+                    plan.setFRP_description(left_spec);
+                }
+                if (left_spec.contains("3英寸") || left_spec.contains("3.12英寸")) {
+                    plan.setQzz_generation("4");
+                } else {
+                    plan.setQzz_generation("5");
+                }
+                plan.setUp_or_down("1");
+                plan.setLeft_or_right("1");
+            }
+            if (i == 1 && ObjectUtil.isNotEmpty(right_spec) && "1".equals(up_or_down)) {
+                // 上右
+                plan.setPaper_tube_or_FRP(right_spec_value.startsWith("48") ? "1" : "2");
+                String[] split = right_spec.split("\\|");
+                plan.setQzz_size(String.valueOf(split[2].charAt(0)));
+                if ("1".equals(plan.getPaper_tube_or_FRP())) {
+                    plan.setPaper_tube_material(right_spec_value);
+                    plan.setPaper_tube_model(right_spec);
+                    plan.setPaper_tube_description(right_spec);
+                } else {
+                    plan.setFRP_material(right_spec_value);
+                    plan.setFRP_model(right_spec);
+                    plan.setFRP_description(right_spec);
+                }
+                plan.setUp_or_down("1");
+                plan.setLeft_or_right("2");
+                if (right_spec.contains("3英寸") || right_spec.contains("3.12英寸")) {
+                    plan.setQzz_generation("4");
+                } else {
+                    plan.setQzz_generation("5");
+                }
+            }
+            if (i == 0 && ObjectUtil.isNotEmpty(left_spec) && "2".equals(up_or_down)) {
+                // 下左
+                plan.setPaper_tube_or_FRP(left_spec_value.startsWith("48") ? "1" : "2");
+                String[] split = left_spec.split("\\|");
+                plan.setQzz_size(String.valueOf(split[2].charAt(0)));
+                if ("1".equals(plan.getPaper_tube_or_FRP())) {
+                    plan.setPaper_tube_material(left_spec_value);
+                    plan.setPaper_tube_model(left_spec);
+                    plan.setPaper_tube_description(left_spec);
+                } else {
+                    plan.setFRP_material(left_spec_value);
+                    plan.setFRP_model(left_spec);
+                    plan.setFRP_description(left_spec);
+                }
+                plan.setUp_or_down("2");
+                plan.setLeft_or_right("1");
+                if (left_spec.contains("3英寸") || left_spec.contains("3.12英寸")) {
+                    plan.setQzz_generation("4");
+                } else {
+                    plan.setQzz_generation("5");
+                }
+            }
+            if (i == 1 && ObjectUtil.isNotEmpty(right_spec) && "2".equals(up_or_down)) {
+                // 下右
+                plan.setPaper_tube_or_FRP(right_spec_value.startsWith("48") ? "1" : "2");
+                String[] split = right_spec.split("\\|");
+                plan.setQzz_size(String.valueOf(split[2].charAt(0)));
+                if ("1".equals(plan.getPaper_tube_or_FRP())) {
+                    plan.setPaper_tube_material(right_spec_value);
+                    plan.setPaper_tube_model(right_spec);
+                    plan.setPaper_tube_description(right_spec);
+                } else {
+                    plan.setFRP_material(right_spec_value);
+                    plan.setFRP_model(right_spec);
+                    plan.setFRP_description(right_spec);
+                }
+                plan.setUp_or_down("2");
+                plan.setLeft_or_right("2");
+                if (right_spec.contains("3英寸") || right_spec.contains("3.12英寸")) {
+                    plan.setQzz_generation("4");
+                } else {
+                    plan.setQzz_generation("5");
+                }
+            }
+            plans.add(plan);
+        }
+        // 校验设备对应的分切暂存架子是不是可用切无数据无任务。
+        BstIvtCutpointivt cutCacheShelf = bcutpointivtService.getOne(new LambdaQueryWrapper<BstIvtCutpointivt>()
+                .eq(BstIvtCutpointivt::getProduct_area, cutDevice.getProduct_area())
+                .eq(BstIvtCutpointivt::getPlan, cutDevice.getPoint_code())
+                .eq(BstIvtCutpointivt::getIs_used, SlitterConstant.SLITTER_YES));
+        if (ObjectUtil.isEmpty(cutCacheShelf)) {
+            throw new BadRequestException("分切机{" + cutDevice.getPoint_code() + "}对应的分切架子不存在!");
+        }
+        if (!SlitterConstant.SLITTER_YES.equals(cutCacheShelf.getPoint_status())) {
+            throw new BadRequestException("架子[" + cutCacheShelf.getPoint_code() + "]上有货！");
+        }
+        // 判断任务
+        List<SchBaseTask> taskList = taskService.checkHaveTask(cutCacheShelf.getPoint_code());
+        if (taskList.size() > 0) {
+            throw new BadRequestException("分切架子存在任务!");
+        }
+        // 创建任务
+        JSONObject taskParam = new JSONObject();
+        List<String> containers = plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList());
+        taskParam.put("containers", containers);
+        taskParam.put("point_code1", "1".equals(up_or_down)
+                ? cutDevice.getUp_point_code() : cutDevice.getDown_point_code());
+        taskParam.put("point_code2", "1".equals(up_or_down)
+                ? cutCacheShelf.getTruss_point_code1() : cutCacheShelf.getTruss_point_code2());
+        taskParam.put("truss_type", "1");
+        taskParam.put("empty_site", "0");
+        taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务"));
+        taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
+        // 分切计划修改状态 05 -> 06
+        plans.forEach(plan -> {
+            plan.setStatus("06");
+            TaskUtils.updateOptMessageBySlitterPlan(plan);
+        });
+        slittingproductionplanService.saveBatch(plans);
+        // 创建任务
+        slitterDownTrussTask.createTask(taskParam);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "饵料下卷成功!");
+        return res;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
index 502dd496f..72cd2ff49 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
@@ -4,20 +4,26 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.modules.common.exception.BadRequestException;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Author: lyd
  * @Description: 分切部分的任务工具类
  * @Date: 2024/4/12
  */
+@Slf4j
 public class SlitterTaskUtil {
 
     /** B1区域 */
@@ -51,7 +57,7 @@ public class SlitterTaskUtil {
      * 获取组成信息
      * @param tubeDescription 纸管信息
      * @param paperOrFrp 材质（1纸管，2FRP管）
-     * @return 长*外径*内径*壁厚*重量*材质（1纸管，2FRP管）
+     * @return 长*外径*内径*壁厚*重量*薄壁厚*阶梯长度*材质（1纸管，2FRP管）
      */
     public static String getComposePaperTubeInformation(String tubeDescription, String paperOrFrp) {
         if (ObjectUtil.isEmpty(tubeDescription)) {
@@ -63,12 +69,13 @@ public class SlitterTaskUtil {
     /**
      * 获取组成信息
      * @param tubeDescription 纸管信息
-     * @return 长*外径*内径*壁厚*重量
+     * @return 长*外径*内径*壁厚*重量*薄壁厚*阶梯长度
      */
     public static String getComposePaperTubeInformation(String tubeDescription) {
         if (ObjectUtil.isEmpty(tubeDescription)) {
             return "";
         }
+        boolean flag = tubeDescription.contains("阶梯");
         tubeDescription = tubeDescription.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "");
         // 解析描述数组
         String[] tubeArray = tubeDescription.split("\\|");
@@ -77,10 +84,27 @@ public class SlitterTaskUtil {
 
         // 假设壁厚默认值为15，如果描述数组长度为4，则重新赋值
         String th = tubeArray.length == 5 ? tubeArray[3] : "15";
+        String th2 = "0";
+        String jtLen = "0";
         if (tubeArray[3].contains("-")) {
-            th = tubeArray[3].split("-")[0];
+            th = tubeArray[3].split("-")[1];
+            th2 = tubeArray[3].split("-")[0];
+        }
+        if (flag) {
+            switch (tubeArray[tubeArray.length - 1]) {
+                case "1400":
+                case "1700":
+                    jtLen = "75";
+                    break;
+                case "1500":
+                case "1600":
+                    jtLen = "150";
+                    break;
+                default:
+                    jtLen = "0";
+                    break;
+            }
         }
-
         // 计算外径和内径
         double externalDiameter = dia * 25.4 + Double.parseDouble(th) * 2;
         double internalDiameter = dia * 25.4;
@@ -101,15 +125,26 @@ public class SlitterTaskUtil {
         sb.append("*");
         // 重量
         sb.append(0);
+        sb.append("*");
+        // 薄壁厚
+        sb.append(th2);
+        sb.append("*");
+        // 阶梯长度
+        sb.append(jtLen);
         return sb.toString();
     }
 
+    public static void main(String[] args) {
+        System.out.println(getComposePaperTubeInformation("玻璃纤维及其制品|FRP管|6英寸|15|1100", "1"));
+    }
+
     /**
      * 设置所需的套管纸管信息
      * @param param 任务参数
      * @param needPlans 所需的分切计划
      */
     public static void putNeedPaperSpec(JSONObject param, List<PdmBiSlittingproductionplan> needPlans) {
+        log.info("正在设置所需的套管纸管信息...");
         // 纸制筒管|纸管|6英寸|1300  or  纸制筒管|纸管|3英寸|12|650
         for (PdmBiSlittingproductionplan plan : needPlans) {
             if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
@@ -239,6 +274,9 @@ public class SlitterTaskUtil {
         String[] material_codes = new String[paperList.size()];
         String[] material_specs = new String[paperList.size()];
         int[] qtys = new int[paperList.size()];
+        String[] material_codes1 = {null,null,null,null,null};
+        String[] material_specs1 = {null,null,null,null,null};
+        int[] qtys1 = {0,0,0,0,0};
         for (int i = 0; i < paperList.size(); i++) {
             MdPbPapervehicle vehicle = paperList.get(i);
             String materialCode = vehicle.getMaterial_code();
@@ -248,18 +286,32 @@ public class SlitterTaskUtil {
                 qtys[index] += qty;
             } else {
                 material_codes[i] = vehicle.getMaterial_code();
-                String spec = getComposePaperTubeInformation(vehicle.getMaterial_name());
+                String spec = getComposePaperTubeInformation(vehicle.getMaterial_name(), vehicle.getMaterial_code().startsWith("4") ? "1" : "2");
                 material_specs[i] = spec;
                 qtys[i] = qty;
             }
+            //新规格数据处理
+            int row_num = Integer.parseInt(vehicle.getRow_num());
+            String spec = getComposePaperTubeInformation(vehicle.getMaterial_name(), vehicle.getMaterial_code().startsWith("4") ? "1" : "2");
+            material_codes1[row_num-1] = materialCode;
+            material_specs1[row_num-1] = spec;
+            qtys1[row_num-1] = qty;
         }
         // 转成String
         String[] qtysStr = Arrays.stream(qtys)
                 .mapToObj(String::valueOf)
                 .toArray(String[]::new);
+        // 转成String
+        String[] qtysStr1 = Arrays.stream(qtys1)
+                .mapToObj(String::valueOf)
+                .toArray(String[]::new);
         param.put("to_material", String.join(",", material_codes));
         param.put("to_spec", String.join(",", material_specs));
         param.put("to_qty", String.join(",", qtysStr));
+
+        param.put("to_material1", String.join(",", material_codes1));
+        param.put("to_spec1", String.join(",", material_specs1));
+        param.put("to_qty1", String.join(",", qtysStr1));
         param.put("device_code", material_specs);
     }
 
@@ -308,4 +360,173 @@ public class SlitterTaskUtil {
         String[] split = paperStr.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|");
         return split[split.length - 1];
     }
+    public static String getPaperSize(PdmBiSlittingproductionplan plan) {
+//        String s = "玻璃纤维及其制品|FRP管|6英寸|15|1700";
+        String paperStr = "";
+        if (plan.getPaper_tube_or_FRP().equals(SlitterConstant.SLITTER_TYPE_PAPER)) {
+            paperStr = plan.getPaper_tube_model();
+        } else {
+            paperStr = plan.getFRP_model();
+        }
+        String[] split = paperStr.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|");
+        return split[2].replaceAll("英寸","");
+    }
+
+    public static Integer getPaperLengthInt(PdmBiSlittingproductionplan plan) {
+        return Integer.valueOf(getPaperLength(plan));
+    }
+
+    /**
+     * 设置重量
+     * @param plans 分切计划
+     * @return 0,0,0,0
+     */
+    public static void setPaperWeightStr(String weightStr, List<PdmBiSlittingproductionplan> plans) {
+        // 1. 校验输入格式
+        String[] parts = weightStr.split(",");
+        if (parts.length != 4) {
+            // 没有数据则不修改
+            return;
+        }
+
+        // 2. 遍历四个位置
+        for (int index = 0; index < 4; index++) {
+            // 解析重量值（自动四舍五入到两位小数）
+            String strValue = parts[index];
+            BigDecimal value;
+            try {
+                value = new BigDecimal(strValue).setScale(2, RoundingMode.HALF_UP);
+            } catch (NumberFormatException e) {
+                continue; // 跳过无效数值
+            }
+
+            // 3. 根据索引确定位置规则
+            String expectedUp, expectedLeft;
+            switch (index) {
+                case 0:  // 上左
+                    expectedUp = "1";
+                    expectedLeft = "1";
+                    break;
+                case 1:  // 上右
+                    expectedUp = "1";
+                    expectedLeft = "2";
+                    break;
+                case 2:  // 下左
+                    expectedUp = "2";
+                    expectedLeft = "1";
+                    break;
+                case 3:  // 下右
+                    expectedUp = "2";
+                    expectedLeft = "2";
+                    break;
+                default:
+                    throw new IllegalStateException("非法索引: " + index);
+            }
+
+            // 4. 在集合中查找匹配项并更新
+            for (PdmBiSlittingproductionplan plan : plans) {
+                if (expectedUp.equals(plan.getUp_or_down()) &&
+                        expectedLeft.equals(plan.getLeft_or_right())) {
+                    plan.setPaper_weight(value.toString());
+                    break; // 找到后跳出循环
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取重量
+     * @param plans 分切计划
+     * @return 0,0,0,0
+     */
+    public static String getPaperWeightStr(List<PdmBiSlittingproductionplan> plans) {
+        String[] weights = new String[4];
+        Arrays.fill(weights, "0");
+
+        for (PdmBiSlittingproductionplan plan : plans) {
+            // 1. 获取重量并四舍五入
+            String weightStr = plan.getPaper_weight();
+            BigDecimal weight;
+            try {
+                weight = new BigDecimal(weightStr);
+            } catch (Exception e) {
+                continue;
+            }
+            BigDecimal rounded = weight.setScale(2, RoundingMode.HALF_UP);
+
+            // 2. 根据位置确定数组索引
+            String upDown = plan.getUp_or_down();
+            String leftRight = plan.getLeft_or_right();
+            int index = -1;
+
+            if ("1".equals(upDown)) {
+                index = ("1".equals(leftRight)) ? 0 : 1;
+            } else {
+                index = ("1".equals(leftRight)) ? 2 : 3;
+            }
+
+            // 3. 更新对应位置的重量（格式化为两位小数）
+            if (index >= 0 && index < 4) {
+                weights[index] = rounded.toString();
+            }
+        }
+
+        // 4. 拼接结果字符串
+        return String.join(",", weights);
+    }
+
+    /**
+     * 固定输入与输出气胀轴库点位
+     * @param input
+     * @return
+     */
+    public static String getQzzkMappedValue(String input) {
+        switch (input) {
+            case "B_QZZK01": return "B_QZZK02";
+            case "B_QZZK02": return "B_QZZK01";
+            case "B_QZZK03": return "B_QZZK04";
+            case "B_QZZK04": return "B_QZZK03";
+            default: throw new BadRequestException("站点输入错误: " + input);
+        }
+    }
+
+    /**
+     * 下卷前置校验，判断卷的上下轴属性与实际是否一致 - 校验子卷属性
+     * @param jsonArray 子卷数组
+     * @param plans 计划
+     */
+    public static void validateConsistency(JSONArray jsonArray, List<PdmBiSlittingproductionplan> plans) {
+        if (plans.size() == 0) {
+            throw new BadRequestException("计划未找到，请确保MES已推送。");
+        }
+        // 1. 将 List<PdmBiSlittingproductionplan> 转为 Map<container_name, up_or_down>
+        Map<String, String> planMap = plans.stream()
+                .collect(Collectors.toMap(
+                        p -> p.getContainer_name(),
+                        p -> p.getUp_or_down(),
+                        // 如果有重复 key，保留第一个（按需调整）
+                        (existing, replacement) -> existing
+                ));
+
+        // 2. 遍历 JSONArray
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject item = jsonArray.getJSONObject(i);
+            String containerName = item.getString("container_name");
+            String site = item.getString("site");
+
+            // 3. 检查 Plan 中是否存在对应的 container_name
+            if (!planMap.containsKey(containerName)) {
+                throw new BadRequestException("校验失败: container_name " + containerName + " 在计划列表中不存在");
+            }
+
+            // 4. 比较 site 和 up_or_down 是否一致
+            String expectedUpDown = planMap.get(containerName);
+            if (!expectedUpDown.equals(site)) {
+                throw new BadRequestException("校验失败: 子卷号 " + containerName
+                        + " 的上下轴位置"
+                        + "与MES分切计划中的上下轴位置" + expectedUpDown + "不一致!");
+            }
+        }
+        log.info("分切下卷计划位置校验通过!");
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java
index 69d5b43fc..6e2c15051 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java
@@ -67,4 +67,18 @@ public class MdpbBoxtypeController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/confirmBox")
+    @Log("保存bom")
+    public ResponseEntity<Object> confirmBox(@RequestBody JSONObject whereJson) {
+        iMdpbBoxtypeService.confirmBox(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+    @GetMapping("/getBoxTypes")
+    @Log("查询木箱类型")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson) {
+        return new ResponseEntity<>(iMdpbBoxtypeService.list(), HttpStatus.OK);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java
index c211b48ee..f3131c7c7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java
@@ -50,4 +50,10 @@ public interface IMdpbBoxtypeService extends IService<MdpbBoxtype> {
      * @param whereJson： {需要修改的参数}
      */
     void confirmUpdate(JSONObject whereJson);
+
+    /**
+     * 一键修改
+     * @param whereJson： {需要修改的参数}
+     */
+    void confirmBox(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java
index 0a78085ef..55e292315 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java
@@ -81,9 +81,14 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl<BstIvtBoxinfoMapper, B
         BstIvtBoxinfo boxDao = this.getOne(new LambdaQueryWrapper<BstIvtBoxinfo>().eq(BstIvtBoxinfo::getBox_no, whereJson.getString("ContainerName")));
 
         if (ObjectUtil.isEmpty(boxDao)) {
+            String height = whereJson.getString("Height");
+            int i = height.indexOf("|");
+            if (i>1){
+                height=height.substring(0,i);
+            }
             boxDao = BstIvtBoxinfo.builder()
                     .box_id(IdUtil.getStringId())
-                    .box_high(whereJson.getString("Height"))
+                    .box_high(height)
                     .box_length(whereJson.getString("Length"))
                     .box_width(whereJson.getString("Width"))
                     .material_code(whereJson.getString("ProductName"))
@@ -96,7 +101,6 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl<BstIvtBoxinfoMapper, B
 
             // 截取子卷号
             String description = whereJson.getString("Description");
-
             try {
                 String one = description.substring(description.indexOf("|") + 1);
                 String two = one.substring(one.indexOf("|") + 1);
@@ -109,7 +113,12 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl<BstIvtBoxinfoMapper, B
             this.save(boxDao);
 
         }else {
-            boxDao.setBox_high(whereJson.getString("Height"));
+            String height = whereJson.getString("Height");
+            int i = height.indexOf("|");
+            if (i>1){
+                height=height.substring(0,i);
+            }
+            boxDao.setBox_high(height);
             boxDao.setBox_length(whereJson.getString("Length"));
             boxDao.setBox_width(whereJson.getString("Width"));
             boxDao.setVehicle_type(vehicle_type);
@@ -128,7 +137,6 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl<BstIvtBoxinfoMapper, B
 
         return boxDao;
     }
-
     @Override
     public JSONObject saveBoxInfo(JSONObject jsonObject) {
         //从MES获取包装关系
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java
index 5f663621d..935bbd16e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java
@@ -9,11 +9,14 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
+import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService;
 import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService;
 import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype;
 import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbBoxtypeMapper;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.common.exception.BadRequestException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,6 +34,8 @@ import java.util.Set;
 @Service
 public class MdpbBoxtypeServiceImpl extends ServiceImpl<MdpbBoxtypeMapper, MdpbBoxtype> implements IMdpbBoxtypeService {
 
+    @Autowired
+    private IPdmBiOrderbominfoService pdmBiOrderbominfoService;
     @Override
     public IPage<MdpbBoxtype> queryAll(Map whereJson, PageQuery page) {
         // 查询条件
@@ -81,4 +86,23 @@ public class MdpbBoxtypeServiceImpl extends ServiceImpl<MdpbBoxtypeMapper, MdpbB
             );
         }
     }
+
+    @Override
+    public void confirmBox(JSONObject whereJson) {
+        if (ObjectUtil.isEmpty(whereJson.getString("mfgOrder"))) {
+            throw new BadRequestException("bom 订单号不能为空!");
+        }
+        if (ObjectUtil.isEmpty(whereJson.getString("productName"))) {
+            throw new BadRequestException("bom 木箱编码不能为空!");
+        }
+        MdpbBoxtype boxtype = this.getById(whereJson.getString("productName"));
+        if (ObjectUtil.isEmpty(boxtype)) {
+            throw new BadRequestException("木箱编码:"+whereJson.getString("productName")+"查询木箱类型失败!");
+        }
+        pdmBiOrderbominfoService.update(new UpdateWrapper<PdmBiOrderbominfo>().lambda()
+                .eq(PdmBiOrderbominfo::getMfgOrder,whereJson.getString("mfgOrder"))
+                .set(PdmBiOrderbominfo::getProductName, whereJson.getString("productName"))
+                .set(PdmBiOrderbominfo::getDescription, boxtype.getBox_name())
+        );
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
index f8f2de935..6de79e0a5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
@@ -129,6 +129,11 @@ public enum IOSEnum {
             "子卷下线行架任务", "16","退货入库行架任务", "14","RGV输送任务", "15",
             "木箱堆叠行架任务", "17"
     )),
+
+    // acs反馈异常出库
+    ACS_EXCEPTIONAL_TYPE(MapOf.of("入库满入", "1","浅货位有货(入库)", "4",
+            "出库空出", "2","浅货位有货(出库)", "3"
+    )),
     ;
 
     private Map<String, String> code;
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
index 84ead0f16..3dfa90d05 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
@@ -138,4 +138,11 @@ public interface IStIvtIostorinvOutService extends IService<StIvtIostorinv> {
      * @param whereJson: 任务对象
      */
     void finishTask(JSONObject whereJson);
+
+    /**
+     * 出库浅货位有货阻挡异常处理
+     * @param whereJson /
+     * @return String 任务标识
+     */
+    String taskExceptionalOut(JSONObject whereJson);
 }
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 62b6530d9..8dd3dc5c5 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
@@ -1089,6 +1089,45 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         }
     }
 
+    @Override
+    @Transactional
+    public String taskExceptionalOut(JSONObject jsonObject) {
+        // 任务表
+        WQLObject taskService = WQLObject.getWQLObject("sch_base_task");
+        // 仓位表
+        WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr");
+
+        JSONObject jsonTask = taskService.query("task_code = '" + jsonObject.getString("task_code") + "'").uniqueResult(0);
+
+        // 找出对应的浅货位
+        JSONObject jsonAttrOrder = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+
+        JSONObject jsonAttrNow = attrTab.query("row_num = '" + jsonAttrOrder.getString("row_num") + "' AND layer_num = '" + jsonAttrOrder.getString("layer_num") + "' AND col_num = '" + jsonAttrOrder.getString("col_num") + "' and zdepth = '" + IOSEnum.ZDEPTH_STRUCT.code("浅") + "' and stor_id = '" + jsonAttrOrder.getString("stor_id") + "' and is_delete = '0' and is_used = '1'")
+                .uniqueResult(0);
+
+        if (ObjectUtil.isEmpty(jsonAttrNow)) {
+            throw new BadRequestException("对应浅货位不存在或未启用!" + jsonTask.getString("point_code1"));
+        }
+
+        // 锁住仓位
+        jsonAttrNow.put("lock_type", IOSEnum.LOCK_TYPE.code("货位异常出库锁"));
+        attrTab.update(jsonAttrNow);
+
+        // 生成任务
+        JSONObject taskParam = new JSONObject();
+        taskParam.put("start_device_code", jsonAttrNow.getString("struct_code"));
+        taskParam.put("next_device_code", IOSEnum.OUT_POINT.code(jsonAttrNow.getString("row_num")));
+        taskParam.put("task_type", "010712");
+        taskParam.put("car_no", "此货位LMS系统未有库存，请待出至【CK2001】点位后确认实物并重新手工入回库!");
+        taskParam.put("vehicle_code",IOSEnum.IS_NOTANDYES.code("否"));
+
+        TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask();
+        String task_id = taskBean.createTask(taskParam);
+        taskBean.immediateNotifyAcs(null);
+
+        return task_id;
+    }
+
     /**
      * 创建调拨入库单
      * @param disDaoList：出库分配明细集合
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 b961fadb6..8a92a0780 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
@@ -60,8 +60,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -339,6 +343,9 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                         jsonAttr = attrTab.query("sect_id = '" + jsonObject.getString("sect_id") + "' AND lock_type = '1' AND is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = ''").uniqueResult(0);
                     } else {
                         //TODO jsonAttr = inBussManageService.getOneStruct(attrParam);
+                        if (ObjectUtil.isNotEmpty(whereJson.get("in_buss"))) {
+                            attrParam.put("move_block_num", MapUtil.getStr(whereJson, "move_block_num"));
+                        }
                         jsonAttr = twoInBussManageService.getOneStruct(attrParam);
                     }
                 } else {
@@ -587,7 +594,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional(propagation=Propagation.REQUIRES_NEW)
+    @Transactional
     public void reIssueTask(Map whereJson) {
 
         String task_id = MapUtil.getStr(whereJson, "task_id");
@@ -734,7 +741,6 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                     .syscompanyid(SecurityUtils.getDeptId())
                     .sysdeptid(SecurityUtils.getDeptId())
                     .build();
-
             if (ObjectUtil.isNotEmpty(MapUtil.getStr(whereJson, "out_stor_id"))) {
                 mstDao.setOut_stor_id(Long.parseLong(MapUtil.getStr(whereJson, "out_stor_id")));
             }
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 a4e639629..553d0cae8 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
@@ -1,5 +1,7 @@
 package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.sch.point.dao.SchBasePoint;
 import org.nl.b_lms.sch.point.service.IschBasePointService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
@@ -107,6 +110,17 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         if (count > 0) {
             throw new BadRequestException("当前木箱入库任务已存在" + boxNo);
         }
+        SchBaseTask one = ischBaseTaskService.getOne(new QueryWrapper<SchBaseTask>()
+                .eq("task_type", "010702")
+                .eq("is_delete", "0")
+                .orderByDesc("task_id")
+                .last("limit 1"));
+        if (one!=null){
+            String vehicleCode2 = one.getVehicle_code2();
+            if (whereJson.getString("vehicle_code").equals(vehicleCode2)){
+                throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code());
+            };
+        }
         //查询仓库是否存在相同木箱
         JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + boxNo + "'").getResultJSONArray(0);
         if (stIvtStructattr != null && stIvtStructattr.size() > 0) {
@@ -117,18 +131,6 @@ public class InBoxManageServiceImpl implements InBoxManageService {
                 new QueryWrapper<BstIvtBoxinfo>().lambda()
                         .eq(BstIvtBoxinfo::getBox_no, boxNo)
         );
-        /*
-         * 找一个木箱区的一个仓位,生成任务并下发
-         */
-       /* // 判断起点点位是否存在
-        JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" +
-                IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" +
-                IOSEnum.IS_NOTANDYES.code("是") + "'")
-                .uniqueResult(0);
-        if (ObjectUtil.isEmpty(jsonPoint)) {
-            throw new BadRequestException("起始点位不存在或未启用!");
-        }*/
-        // 找一个木箱区空位
         //根据木箱高度，判断入库仓位的高度
         String height = "";
         String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
@@ -336,6 +338,58 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         taskBean.immediateNotifyAcs(null);
     }
 
+
+    @Override
+    @Transactional
+    public void boxBinVehicleByTHRK(JSONObject whereJson) {
+        //查询仓库是否存在相同木箱
+        final String boxSn = whereJson.getString("box_no");
+        JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + boxSn + "'").getResultJSONArray(0);
+        if (stIvtStructattr != null && stIvtStructattr.size() > 0) {
+            throw new BadRequestException("当前木箱已经存在库中" + stIvtStructattr.getJSONObject(0).getString("struct_code"));
+        }
+        JSONObject jo = new JSONObject();
+        jo.put("box_no", boxSn);
+//        lmsToMesService.momGetPackingInfo(jo);
+        // 查询木箱信息
+        BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
+                new QueryWrapper<BstIvtBoxinfo>().lambda()
+                        .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no"))
+        );
+        // 下发桁架任务
+        JSONObject taskParam = new JSONObject();
+        taskParam.put("task_type", "010713");
+        taskParam.put("start_device_code", whereJson.getString("point_code"));
+        taskParam.put("next_device_code", "CK2005");
+        taskParam.put("vehicle_code", whereJson.getString("box_no"));
+        //taskParam.put("vehicle_code2", whereJson.getString("box_no"));
+        JSONObject param = new JSONObject();
+        param.put("layer", whereJson.getString("layer"));
+        param.put("length", boxDao.getBox_length());
+        param.put("width", boxDao.getBox_width());
+        param.put("height", boxDao.getBox_high());
+        param.put("containerType", boxDao.getVehicle_type());
+
+        param.put("barcode", whereJson.getString("box_no") + "-9" );
+        //根据木箱高度，判断入库仓位的高度
+        String height = "";
+        String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
+        String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
+        String box_high = boxDao.getBox_high();
+        if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) {
+            height = "1";
+        } else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) {
+            height = "2";
+        } else {
+            height = "3";
+        }
+        param.put("heightLevel", height);
+        taskParam.put("request_param", param.toString());
+        TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask();
+        taskBean.createTask(taskParam);
+        taskBean.immediateNotifyAcs(null);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void returnIn(JSONObject whereJson) {
@@ -360,6 +414,23 @@ public class InBoxManageServiceImpl implements InBoxManageService {
             }
         }
 
+        // 判断是否是同一个木箱号在一小时内生成过任务
+        // 获取当前时间前一个小时时间
+        DateTime nowDate = DateUtil.parse(DateUtil.now());
+        String queryDate = DateUtil.offsetHour(nowDate, -1).toString();
+
+        int hasCount = ischBaseTaskService.count(
+                new QueryWrapper<SchBaseTask>().lambda()
+                        .eq(SchBaseTask::getVehicle_code, whereJson.getString("box_no"))
+                        .eq(SchBaseTask::getTask_type, "010713")
+                        .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
+                        .ge(SchBaseTask::getCreate_time, queryDate)
+                        .le(SchBaseTask::getCreate_time, DateUtil.now())
+        );
+        if (hasCount>0) {
+            throw new BadRequestException("当前木箱【"+whereJson.getString("box_no")+"】在1个小时之内生成过行架任务!");
+        }
+
         // 根据木箱号查询是否有托盘绑定关系，如果有则解绑
         JSONObject jsonExt = WQLObject.getWQLObject("md_pb_storagevehicleext")
                 .query("pcsn = '" + whereJson.getString("box_no") + "'")
@@ -649,6 +720,11 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         jsonParam.put("row_num", row_num);
         JSONObject jsonAttr = queryStruct(jsonParam);
 
+        // 如果是移库空并且仓位为空则报错
+        if (ObjectUtil.isNotEmpty(block_num) && ObjectUtil.isEmpty(jsonAttr)) {
+            throw new BadRequestException("转库任务巷道"+block_num+"仓位不足!");
+        }
+
         // 为空则新找巷道
         if (ObjectUtil.isEmpty(jsonAttr)) {
 
@@ -668,6 +744,8 @@ public class InBoxManageServiceImpl implements InBoxManageService {
                 json.put("box_length", jsonParam.getString("box_length"));
                 json.put("box_width", jsonParam.getString("box_width"));
                 json.put("box_high", jsonParam.getString("box_high"));
+                json.put("vehicle_type", jsonParam.getString("vehicle_type"));
+                json.put("height", jsonParam.getString("height"));
 
                 String row_num_2 = getMinRow(json);
                 json.put("row_num", row_num_2);
@@ -686,6 +764,51 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         return jsonAttr;
     }
 
+    /**
+     * 同巷道移库查看库位
+     * @param jsonParam
+     * @return
+     */
+    public JSONObject getMoveStruct(JSONObject jsonParam) {
+        // 仓位表
+        WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+        /*
+         * 判断是否有仓位
+         * 判断条件：库区、仓库、是否启用、是否删除、未锁定、没有载具
+         */
+        String block_num = jsonParam.getString("move_block_num");
+        if (StringUtils.isEmpty(block_num)){
+            throw new BadRequestException("同巷道分配库位巷道参数不能为空");
+        }
+        JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
+                "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
+                "AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" +
+                "AND height = '" + jsonParam.getString("height") + "'" +
+                "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " +
+                "AND sect_id = '" + jsonParam.getString("sect_id") + "' AND block_num = '" + block_num + "'").getResultJSONArray(0);
+        if (ObjectUtil.isEmpty(structArray)) {
+            notInRowList.clear();
+            notInBlockList.clear();
+            throw new BadRequestException("仓位不足!");
+        }
+        // 确定排：查看每排的木箱数量，找到数量最小的那排
+        jsonParam.put("block_num", block_num);
+        String row_num = getMinRow(jsonParam);
+
+        // 确定仓位： 找到仓位
+        jsonParam.put("row_num", row_num);
+        JSONObject jsonAttr = queryStruct(jsonParam);
+
+        // 为空则新找巷道
+        if (ObjectUtil.isEmpty(jsonAttr)) {
+            throw new BadRequestException("当前巷道"+block_num+"没有可用库位");
+        }
+
+        notInRowList.clear();
+        notInBlockList.clear();
+        return jsonAttr;
+    }
+
     /**
      * 确定巷道
      *
@@ -906,6 +1029,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
                 List<JSONObject> lowAttr = structAllList.stream()
                         .filter(row -> row.getString("col_num").equals(json.getString("col_num")) &&
                                 row.getString("layer_num").equals(json.getString("layer_num")) &&
+                                row.getString("row_num").equals(json.getString("row_num")) &&
                                 row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("浅")))
                         .collect(Collectors.toList());
 
@@ -934,6 +1058,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
                 List<JSONObject> darkAttr = structAllList.stream()
                         .filter(row -> row.getString("col_num").equals(json.getString("col_num")) &&
                                 row.getString("layer_num").equals(json.getString("layer_num")) &&
+                                row.getString("row_num").equals(json.getString("row_num")) &&
                                 row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深")))
                         .collect(Collectors.toList());
 
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 5a1fd12bf..17ad998f7 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
@@ -26,11 +26,16 @@ 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.impl.SysParamServiceImpl;
+import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 /**
@@ -60,6 +65,13 @@ public class InBussManageServiceImpl implements InBussManageService {
     @Autowired
     private IschBaseTaskService ischBaseTaskService;
 
+    @Autowired
+    private LmsToMesServiceImpl lmsToMesServiceImpl;
+
+    @Resource
+    @Qualifier("threadPoolExecutor")
+    private ThreadPoolExecutor pool;
+
 
     /**
      * 不需要查询的排集合
@@ -136,7 +148,6 @@ public class InBussManageServiceImpl implements InBussManageService {
                     "AND height IN " + jsonObject.getString("height")  +
                     "AND sect_id = '" + jsonObject.getString("sect_id") + "' AND block_num = '"+block_num+"'")
                     .getResultJSONArray(0);
-
         }
 
 
@@ -266,6 +277,7 @@ public class InBussManageServiceImpl implements InBussManageService {
         mst.put("remark", "");
         // 明细
         ArrayList<LinkedHashMap> tableData = new ArrayList<>();
+        List<String> subs = new ArrayList<>();
         for (int i = 0; i < subList.size(); i++) {
             JSONObject json = subList.get(i);
             LinkedHashMap<String, Object> jsonDtl = new LinkedHashMap<>();
@@ -285,10 +297,21 @@ public class InBussManageServiceImpl implements InBussManageService {
             jsonDtl.put("quality_scode", IOSEnum.QUALITY_SCODE.code("合格品"));
             jsonDtl.put("is_active", IOSEnum.IS_SEND.code("是"));
             tableData.add(jsonDtl);
+            subs.add(json.getString("container_name"));
+        }
+        String package_box_sn = (String) tableData.get(0).get("package_box_sn");
+
+        try {
+            JSONObject param_jo = new JSONObject();
+            param_jo.put("box_no", package_box_sn);
+            param_jo.put("box_weight", subList.get(0).getString("box_weight"));
+            param_jo.put("container_name", subs);
+            lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo);
+        } catch (Exception e) {
+            log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + package_box_sn + ",异常信息：" + e);
         }
         mst.put("tableData", tableData);
         // 判断是否已经生成过入库单
-        String package_box_sn = (String) tableData.get(0).get("package_box_sn");
         JSONObject param = new JSONObject();
         param.put("package_box_sn",package_box_sn);
         JSONObject iosMst = stIvtIostorinvMapper.queryBoxMst(param);
@@ -379,6 +402,9 @@ public class InBussManageServiceImpl implements InBussManageService {
                         .eq(StIvtIostorinvdtl::getIostorinvdtl_id, disList.get(0).get("iostorinvdtl_id"))
         ).get(0);
 
+        // 获取当前巷道
+        JSONObject jsonAttr = attrTab.query("struct_code = '" + taskDao.getPoint_code2() + "'").uniqueResult(0);
+
         JSONObject jsonDiv = new JSONObject();
         jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao)));
         jsonDiv.put("tableMater", disList);
@@ -386,6 +412,8 @@ public class InBussManageServiceImpl implements InBussManageService {
         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("move_block_num", jsonAttr.getString("block_num"));
+        jsonDiv.put("in_buss", IOSEnum.IS_NOTANDYES.code("是"));
 
         iStIvtIostorinvService.divStruct(jsonDiv);
 
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 cbced69e0..beb0b80fd 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
@@ -70,7 +70,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
         if (ObjectUtil.isEmpty(jsonPoint)) {
             throw new BadRequestException("起始点位不存在或未启用!");
         }
-        int count = ischBaseTaskService.count(new QueryWrapper<SchBaseTask>()
+       /* int count = ischBaseTaskService.count(new QueryWrapper<SchBaseTask>()
                 .eq("point_code1", whereJson.getString("device_code"))
                 .eq("vehicle_code", whereJson.getString("vehicle_code"))
                 .eq("task_type", "010705")
@@ -78,7 +78,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
                 .lt("task_status", TaskStatusEnum.EXECUTING.getCode()));
         if (count>0){
             return;
-        }
+        }*/
         // 找一个托盘区的空仓位
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
index 221f625ec..78a4ed71b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
@@ -28,17 +28,17 @@ import org.nl.common.utils.IdUtil;
 import org.nl.modules.common.exception.BadRequestException;
 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.system.service.param.dao.Param;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
+import org.nl.wms.pda.st.service.impl.PrintServiceImpl;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -88,6 +88,11 @@ public class LashManageServiceImpl implements LashManageService {
      */
     private final IschBaseTaskService ischBaseTaskService;
 
+    /**
+     * 任务服务
+     */
+    private final ISysParamService iSysParamService;
+
     @Override
     @Transactional
     public void createLashTask(JSONObject whereJson) {
@@ -218,6 +223,8 @@ public class LashManageServiceImpl implements LashManageService {
                 end_point = jsonPoint.getString("point_code");
                 schBasePointMapper.updateById(JSON.parseObject(jsonPoint.toString(), SchBasePoint.class));
 
+                boolean remove_flag = iBstIvtBoxlashboundService.remove(new QueryWrapper<BstIvtBoxlashbound>().lambda()
+                        .eq(BstIvtBoxlashbound::getBox_no, boxDao.getBox_no()));
                 /*
                  * 插入绑定木箱表
                  */
@@ -308,88 +315,141 @@ public class LashManageServiceImpl implements LashManageService {
         jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
         jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code"));
         jsonTaskParam.put("request_param", whereJson);
-
         TwoOutHeapTask bean = SpringContextHolder.getBean(TwoOutHeapTask.class);
         bean.createTask(jsonTaskParam);
-        bean.sendTaskAcs(whereJson.getString("task_group_id"));
     }
 
     @Override
     public JSONObject applyTab(JSONObject whereJson) {
         // 载具扩展属性表
-        WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
-        // 任务表
-        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
+        WQLObject md_pb_storagevehicleext = WQLObject.getWQLObject("md_pb_storagevehicleext");
 
         // TODO 贴标流程
         JSONObject result = new JSONObject();
-
+        //设备号
+        String device_code = whereJson.getString("device_code");
+        //载具号
         String vehicle_code = whereJson.getString("vehicle_code");
-        //查询托盘对应的载具号
-        JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
+        //查询托盘详细信息
+        JSONObject vehicle_ext = md_pb_storagevehicleext.query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(vehicle_ext)) {
             throw new BadRequestException("未查询到托盘对应的扩展属性");
         }
+        //判断木箱信息是否为空
         String box_no = vehicle_ext.getString("pcsn");
         if (StrUtil.isEmpty(box_no)) {
-            throw new BadRequestException("未查询到托盘绑定了相关木箱！");
+            throw new BadRequestException("未查询到托盘:"+vehicle_code+"绑定了相关木箱！");
         }
         // 查询木箱信息
-        BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
-                new QueryWrapper<BstIvtBoxinfo>().lambda()
-                        .eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getString("pcsn"))
+        BstIvtBoxinfo boxinfo = iBstIvtBoxinfoService.getOne(
+                new QueryWrapper<BstIvtBoxinfo>().lambda().eq(BstIvtBoxinfo::getBox_no, box_no)
         );
-
-        // 根据木箱料号查询木箱类型信息
-        MdpbBoxtype boxTypeDao = iMdpbBoxtypeService.getById(boxDao.getMaterial_code());
-        if (ObjectUtil.isEmpty(boxTypeDao)) {
-            throw new BadRequestException("木箱类型信息不存在!木箱料号为：" + boxDao.getMaterial_code());
+        //判断木箱类型信息是否为空
+        if (StrUtil.isEmpty(boxinfo.getMaterial_code())) {
+            throw new BadRequestException("木箱料号未设置木箱类型信息:bst_ivt_boxinfo!");
+        }
+        // 根据木箱料号查询木箱类型信息
+        MdpbBoxtype boxType = iMdpbBoxtypeService.getById(boxinfo.getMaterial_code());
+        if (ObjectUtil.isEmpty(boxType)) {
+            throw new BadRequestException("木箱类型信息不存在!木箱料号为：" + boxinfo.getMaterial_code());
         }
-
         // 返回参数
-        result.put("length", boxDao.getBox_length());
-        result.put("width", boxDao.getBox_width());
-        result.put("height", boxDao.getBox_high());
-        result.put("case", boxDao.getMaterial_code());
+        result.put("length", boxinfo.getBox_length());
+        result.put("width", boxinfo.getBox_width());
+        result.put("height", boxinfo.getBox_high());
+        result.put("case", boxinfo.getMaterial_code());
+
+        // 捆扎模板
+        if (ObjectUtil.isEmpty(boxType.getLash_num())) {
+            throw new BadRequestException("捆扎模版不能为空!");
+        }
+        result.put("bindingTemplate", boxType.getLash_num());
+        // 第一次捆扎次数
+        if (ObjectUtil.isEmpty(boxType.getLash_num_one())) {
+            throw new BadRequestException("第一次捆扎数量不能为空!");
+        }
+        result.put("bundleTimes", boxType.getLash_num_one());
+        // 木箱结构
+        if (ObjectUtil.isEmpty(boxType.getBox_structure())) {
+            throw new BadRequestException("木箱结构不能为空!");
+        }
+        result.put("box_structure", boxType.getBox_structure());
 
         // 是否捆扎： 如果是返检或者反切的则不需要捆扎（找最近的木箱出库单据）
-        if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_one())) {
+        if (ObjectUtil.isEmpty(boxType.getNeed_lash_one())) {
             throw new BadRequestException("第一次是否捆扎不能为空!");
         }
-        String isBinding = boxTypeDao.getNeed_lash_one();
-
-        JSONObject jsonMst = stIvtIostorinvOutMapper.queryBoxOutInfo(boxDao.getBox_no());
+        String isBinding = boxType.getNeed_lash_one();
+        JSONObject jsonMst = stIvtIostorinvOutMapper.queryBoxOutInfo(boxinfo.getBox_no());
         if (ObjectUtil.isNotEmpty(jsonMst)) {
             if (jsonMst.getString("bill_type").equals(IOSEnum.OUT_TYPE.code("改切出库"))
                     || jsonMst.getString("bill_type").equals(IOSEnum.OUT_TYPE.code("返检出库"))) {
                 isBinding = IOSEnum.IS_NOTANDYES.code("否");
             }
         }
-
+        // 是否捆扎
         result.put("isBinding", isBinding);
+
+
+
         // TODO 是否贴标
         result.put("isLabeling", IOSEnum.IS_SEND.code("否"));
+        // TODO 贴标数量
+        result.put("printQty", "2");
+
         // TODO 贴标模版
-        result.put("labelingTemplate", boxDao.getLash_num());
-        // 捆扎模板
-        if (ObjectUtil.isEmpty(boxTypeDao.getLash_num())) {
-            throw new BadRequestException("捆扎模版不能为空!");
-        }
-        result.put("bindingTemplate", boxTypeDao.getLash_num());
+        result.put("labelingTemplate", "201");
         // TODO 打印机
         result.put("printDevice", "1");
-        // TODO 贴标数量
-        result.put("printQty", "1");
-        // 第一次捆扎次数
-        if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_one())) {
-            throw new BadRequestException("第一次捆扎数量不能为空!");
+        //判断系统参数是否贴标
+        String is_labeling = iSysParamService.findByCode("is_labeling2").getValue();
+        if (is_labeling.equals("1")) {
+            result.put("isLabeling", IOSEnum.IS_SEND.code("是"));
+
+            //查询贴标次数参数
+            String labelingTemplateNum = iSysParamService.findByCode("labelingTemplateNum").getValue();
+            result.put("printQty", labelingTemplateNum);
+
+            //查询贴标模板参数
+            String labelingTemplate = iSysParamService.findByCode("labelingTemplate").getValue();
+            result.put("labelingTemplate", labelingTemplate);
+            Param label_num = null;
+            //CK2019,CK2015
+            if(device_code.equals("CK2019") || device_code.equals("CK2015")){
+                label_num = iSysParamService.findMinByCode(device_code);
+                String print_code = label_num.getCode();
+                JSONObject print_info = WQLObject.getWQLObject("pdm_bi_printinfo").query("print_name = '" + print_code + "'").uniqueResult(0);
+                JSONObject print_jo = new JSONObject();
+                print_jo.put("box_no", box_no);
+                print_jo.put("print_type", print_info.getString("print_id"));
+                int times = Integer.parseInt(labelingTemplateNum);
+                for(int i=0;i<times;i++){
+                    new PrintServiceImpl().customerPrintBY2(print_jo);
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+                //更新打印机设备
+                result.put("printDevice", print_info.getString("print_code"));
+                // 贴标成功：更新系统参数贴标次数
+                String label_num_up = label_num.getValue();
+                String now_num = NumberUtil.sub(label_num_up, labelingTemplateNum).toString();
+
+                label_num.setValue(now_num);
+                iSysParamService.update(label_num);
+
+                // 判断是否到达预警值
+                String label_num_down = iSysParamService.findByCode("label_num_down").getValue();
+
+                if (Integer.valueOf(label_num_down) >= Integer.valueOf(now_num)) {
+                    result.put("message", "标签纸数量过低，请更换!");
+                }
+            }else{
+                throw new BadRequestException("贴标请求设备点位异常:"+device_code);
+            }
         }
-        result.put("bundleTimes", boxTypeDao.getLash_num_one());
-        // 木箱结构
-        if (ObjectUtil.isEmpty(boxTypeDao.getBox_structure())) {
-            throw new BadRequestException("木箱结构不能为空!");
-        }
-        result.put("box_structure", boxTypeDao.getBox_structure());
         return result;
     }
 
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 ecefd6d26..3409bdf8d 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
@@ -1,13 +1,17 @@
 package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
+import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.TwoExcepionalMoveTask;
 import org.nl.b_lms.sch.tasks.TwoMoveBoxTask;
+import org.nl.b_lms.sch.tasks.TwoOutBoxExcepTask;
 import org.nl.b_lms.sch.tasks.TwoOutBoxTask;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
@@ -20,9 +24,11 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -41,6 +47,9 @@ import java.util.stream.Collectors;
 @Service
 public class OutBoxManageServiceImpl implements OutBoxManageService {
 
+    @Autowired
+    private TwoOutBoxTask twoOutBoxTask;
+
     /**
      * 出库不需要查询的排集合
      */
@@ -55,7 +64,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
      * 木箱信息服务
      */
     @Autowired
-    private IBstIvtBoxinfoService iBstIvtBoxinfoService;
+    private IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService;
 
     /**
      * 任务服务
@@ -118,9 +127,8 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         JSONObject request_param = new JSONObject();
         request_param.put("containerType", jsonAttr.getString("storagevehicle_type"));
         jsonTaskParam.put("request_param", request_param.toString());
-        TwoOutBoxTask taskBean = new TwoOutBoxTask();
-        taskBean.createTask(jsonTaskParam);
-        taskBean.immediateNotifyAcs(null);
+        twoOutBoxTask.createTask(jsonTaskParam);
+        twoOutBoxTask.immediateNotifyAcs(null);
         // 锁定起点
         jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
         attrTab.update(jsonAttr);
@@ -160,111 +168,82 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
             }
 
         }
-        // 确定巷道：找相同规格木箱的最多的巷道
-        if (ObjectUtil.isEmpty(block_num)) {
-            block_num = getMaxBlock(whereJson);
-        }
-        // 确定排：找某一巷道规格木箱的最多排
-        whereJson.put("block_num", block_num);
-        String row_num = getMaxRow(whereJson);
-        // 确定仓位
-        whereJson.put("row_num", row_num);
-        whereJson.put("notMove",true);
-        JSONObject jsonAttr = getBox(whereJson);
-        // 为空则新找巷道
-        if (ObjectUtil.isEmpty(jsonAttr)) {
-            whereJson.put("flag", "1");
-            notOutBlockList.add(whereJson.getString("block_num"));
-            String join = "('" + String.join("','", notOutBlockList) + "')";
-            whereJson.put("not_block_id", join);
-            List<JSONObject> blockList = WQL.getWO("BST_OUTBOX").addParamMap(whereJson)
-                    .process().getResultJSONArray(0).toJavaList(JSONObject.class);
-            for (int i = 0; i < blockList.size(); i++) {
-                JSONObject json = blockList.get(i);
-                json.put("stor_id", whereJson.getString("stor_id"));
-                json.put("sect_id", whereJson.getString("sect_id"));
-                json.put("box_length", whereJson.getString("box_length"));
-                json.put("box_width", whereJson.getString("box_width"));
-                json.put("box_high", whereJson.getString("box_high"));
-                json.put("num", whereJson.getString("num"));
-                String row_num_2 = getMaxRow(json);
-                json.put("row_num", row_num_2);
-                JSONObject jsonAttr_2 = getBox(json);
-                if (ObjectUtil.isNotEmpty(jsonAttr_2)) {
-                    jsonAttr = jsonAttr_2;
-                    break;
-                } else {
-                    continue;
-                }
+        JSONObject jsonBox = null;
+        for (int i = 0; i < structArray.size(); i++) {
+            JSONObject jsonObject = structArray.getJSONObject(i);
+            int count = ipdmBiSubpackagerelationService.count(new QueryWrapper<PdmBiSubpackagerelation>()
+                    .eq("package_box_sn", jsonObject.getString("storagevehicle_code")));
+            if (count == 0){
+                jsonBox = jsonObject;
+                break;
             }
         }
-        if (ObjectUtil.isEmpty(jsonAttr)) {
+
+        if (ObjectUtil.isEmpty(jsonBox)) {
             notOutRowList.clear();
             notOutBlockList.clear();
             throw new BadRequestException("没有符合规格的木箱!");
         }
         // 查询木箱对应的托盘号
-        JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonAttr.getString("storagevehicle_code") + "'")
+        JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonBox.getString("storagevehicle_code") + "'")
                 .uniqueResult(0);
         if (ObjectUtil.isEmpty(jsonVeExt)) {
-            throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code"));
+            throw new BadRequestException("此木箱没有绑定托盘号!"+jsonBox.getString("storagevehicle_code"));
         }
         // 锁定起点
-        jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("木箱出库锁"));
-        attrTab.update(jsonAttr);
+        jsonBox.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
+        jsonBox.put("update_time", DateUtil.now());
+        attrTab.update(jsonBox);
         // 清空缓存
         notOutRowList.clear();
         notOutBlockList.clear();
-        return jsonAttr.getString("storagevehicle_code");
+        return jsonBox.getString("storagevehicle_code");
     }
 
     @Override
-    @Transactional
     public JSONObject taskExceptional(JSONObject jsonObject) {
         // 仓位表
+        JSONObject jsonAttrNow = null;
         WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr");
-
         // 查询任务
         SchBaseTask taskDao = ischBaseTaskService.getOne(
                 new QueryWrapper<SchBaseTask>().lambda()
                         .eq(SchBaseTask::getTask_code, jsonObject.getString("task_code"))
         );
-
-        // 标记原货位为满入异常锁
         JSONObject jsonAttr = attrTab.query("struct_code = '" + taskDao.getPoint_code1() + "'").uniqueResult(0);
-        jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("货位异常锁"));
+        jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
+        jsonAttr.put("storagevehicle_code",null);
+        jsonAttr.put("remark", "空出设置为空"+taskDao.getTask_id());
         attrTab.update(jsonAttr);
-        if (taskDao.getPoint_code2().contains("ZXQ")){
-            throw new BadRequestException("当前木箱出库至ZXQ,木箱空出异常");
+
+        if ("010706".equals(taskDao.getTask_type())){
+            BstIvtBoxinfo boxDao = bstIvtBoxinfoMapper.selectOne(
+                    new QueryWrapper<BstIvtBoxinfo>().lambda()
+                            .eq(BstIvtBoxinfo::getBox_no, taskDao.getVehicle_code())
+            );
+
+            JSONObject jsonParam = new JSONObject();
+            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.getString("block_num"));
+            jsonParam.put("num", boxDao.getNum());
+            jsonAttrNow = getStruct(jsonParam);
+            if (ObjectUtil.isEmpty(jsonAttrNow)) {
+                throw new BadRequestException("空出重新分配:库存不足!");
+            }
+            // 锁定新终点
+            jsonAttrNow.put("lock_type", IOSEnum.LOCK_TYPE.code("空托盘出库锁"));
+            attrTab.update(jsonAttrNow);
+            // 更新任务起点
+            taskDao.setPoint_code1(jsonAttrNow.getString("struct_code"));
+            taskDao.setVehicle_code(jsonAttrNow.getString("storagevehicle_code"));
+            ischBaseTaskService.updateById(taskDao);
+        }else {
+            taskDao.setRemark("空出,手动处理任务");
+            ischBaseTaskService.updateById(taskDao);
+            throw new BadRequestException("空出异常:手动维护业务及任务");
         }
-        // 重新分配货位
-        BstIvtBoxinfo boxDao = bstIvtBoxinfoMapper.selectOne(
-                new QueryWrapper<BstIvtBoxinfo>().lambda()
-                        .eq(BstIvtBoxinfo::getBox_no, taskDao.getVehicle_code())
-        );
-
-        JSONObject jsonParam = new JSONObject();
-        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.getString("block_num"));
-        jsonParam.put("num", boxDao.getNum());
-
-        // 调用找货位方法
-        JSONObject jsonAttrNow = getStruct(jsonParam);
-        if (ObjectUtil.isEmpty(jsonAttrNow)) {
-            throw new BadRequestException("库存不足!");
-        }
-
-        // 锁定新终点
-        jsonAttrNow.put("lock_type", IOSEnum.LOCK_TYPE.code("木箱出库锁"));
-        attrTab.update(jsonAttrNow);
-
-        // 更新任务起点
-        taskDao.setPoint_code1(jsonAttrNow.getString("struct_code"));
-        taskDao.setVehicle_code(jsonAttrNow.getString("storagevehicle_code"));
-        ischBaseTaskService.updateById(taskDao);
-
         return jsonAttrNow;
     }
 
@@ -287,7 +266,15 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         if (ObjectUtil.isEmpty(jsonAttrNow)) {
             throw new BadRequestException("对应浅货位不存在或未启用!" + jsonTask.getString("point_code1"));
         }
-
+        List<SchBaseTask> list = ischBaseTaskService.list(new QueryWrapper<SchBaseTask>()
+                .eq("point_code1", jsonAttrNow.getString("struct_code"))
+                .eq("point_code2", IOSEnum.OUT_POINT.code(jsonAttrNow.getString("row_num")))
+                .eq("task_type", "010712")
+                .eq("is_delete", "0")
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+        if (!CollectionUtils.isEmpty(list)){
+            return list.get(0).getTask_id();
+        }
         // 锁住仓位
         jsonAttrNow.put("lock_type", IOSEnum.LOCK_TYPE.code("货位异常出库锁"));
         attrTab.update(jsonAttrNow);
@@ -733,8 +720,138 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         TwoMoveBoxTask taskBan = new TwoMoveBoxTask();
         taskBan.createTask(jsonTaskParam);
         taskBan.immediateNotifyAcs(null);
-
+        try {
+            Thread.sleep(500);
+        }catch (Exception ex){}
         return jsonTaskParam.getString("task_group_id");
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void publicBoxOut(List<JSONObject> list) {
+        WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
+        WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
+
+        // 查询需要出库的仓位信息
+        String struct_code_in = list.stream()
+                .map(row -> row.getString("struct_code"))
+                .collect(Collectors.joining("','"));
+
+        List<JSONObject> attrList = attrTab.query("struct_code in ('" + struct_code_in + "') AND sect_code = 'BZC01'")
+                .getResultJSONArray(0).toJavaList(JSONObject.class);
+
+        // 获取这些仓位的每排仓位
+        String row_num_in = attrList.stream()
+                .map(row -> row.getString("row_num"))
+                .distinct()
+                .collect(Collectors.joining("','"));
+
+        List<JSONObject> allList = attrTab.query("row_num IN ('" + row_num_in + "') AND sect_code = 'BZC01' AND is_delete = '0'")
+                .getResultJSONArray(0).toJavaList(JSONObject.class);
+
+        // 查询木箱对应的托盘号
+        String box_no_in = list.stream()
+                .map(row -> row.getString("box_no"))
+                .collect(Collectors.joining("','"));
+
+        List<JSONObject> extList = extTab.query("pcsn IN ('" + box_no_in + "')")
+                .getResultJSONArray(0).toJavaList(JSONObject.class);
+
+        // 需要移库的木箱仓位
+        ArrayList<JSONObject> moveList = new ArrayList<>();
+
+        // 创建任务
+        for (JSONObject json : attrList) {
+            // 判断是否是深货位
+            if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) {
+                // 查询对应的浅货位
+                JSONObject jsonShallow = allList.stream()
+                        .filter(row -> row.getString("row_num").equals(json.getString("row_num")) &&
+                                row.getString("col_num").equals(json.getString("col_num")) &&
+                                row.getString("layer_num").equals(json.getString("layer_num")) &&
+                                row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("浅"))
+                        )
+                        .findFirst().orElse(null);
+                if (ObjectUtil.isEmpty(jsonShallow)) {
+                    throw new BadRequestException("仓位【"+json.getString("struct_code")+"】对应的浅货位信息错误!");
+                }
+
+                // 判断浅货位是否有空木箱
+                if (ObjectUtil.isNotEmpty(jsonShallow.getString("storagevehicle_code"))) {
+                    // 判断是否是当前需要出库的集合当中
+                    int size = (int) attrList.stream()
+                            .filter(row -> row.getString("struct_code").equals(jsonShallow.getString("struct_code"))).count();
+
+                    // 不在要出库的集合当中
+                    if (size == 0) {
+                        // 判断是否被锁定
+                        if (jsonShallow.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
+                            // 加入要移库的集合当中
+                            moveList.add(jsonShallow);
+                        } else if (!jsonShallow.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("木箱出库锁"))
+                            && (!jsonShallow.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("移出锁")))
+                        ) {
+                            throw new BadRequestException("仓位【"+jsonShallow.getString("struct_code")+"】被锁定，无法生成移库任务!");
+                        }
+                    }
+                }
+            }
+//            // 校验木箱是否绑定了托盘
+//            JSONObject jsonExt = extList.stream()
+//                    .filter(row -> row.getString("pcsn").equals(json.getString("storagevehicle_code")))
+//                    .findFirst().orElse(null);
+//
+//            if (ObjectUtil.isEmpty(jsonExt)) {
+//                throw new BadRequestException("此木箱【"+json.getString("storagevehicle_code")+"】没有绑定托盘，请核查");
+//            }
+
+            // 创建任务
+            JSONObject jsonTaskParam = new JSONObject();
+            jsonTaskParam.put("task_type", "010704");
+            jsonTaskParam.put("start_device_code", json.getString("struct_code"));
+            jsonTaskParam.put("next_device_code", IOSEnum.EXCEP_OUT.code("异常出库口"));
+            jsonTaskParam.put("vehicle_code", json.getString("storagevehicle_code"));
+//            jsonTaskParam.put("vehicle_code2", jsonExt.getString("storagevehicle_code"));
+            jsonTaskParam.put("task_group_id", IdUtil.getStringId());
+            jsonTaskParam.put("priority", json.getString("zdepth"));
+            JSONObject request_param = new JSONObject();
+            request_param.put("containerType", json.getString("storagevehicle_type"));
+            jsonTaskParam.put("request_param", request_param.toString());
+            TwoOutBoxExcepTask twoOutBoxExcepTask = new TwoOutBoxExcepTask();
+            twoOutBoxExcepTask.createTask(jsonTaskParam);
+
+            // 更新仓位锁定状态
+            json.put("lock_type", IOSEnum.LOCK_TYPE.code("木箱出库锁"));
+            attrTab.update(json);
+        }
+
+        // 查询移库木箱对应的托盘
+        String storagevehicle_code_in = moveList.stream()
+                .map(row -> row.getString("storagevehicle_code"))
+                .collect(Collectors.joining("','"));
+        List<JSONObject> extMoveList = extTab.query("pcsn IN ('" + storagevehicle_code_in + "')")
+                .getResultJSONArray(0).toJavaList(JSONObject.class);
+
+        // 此循环为防止下发一部分后报错无法回滚
+        moveList.forEach(item -> {
+            // 校验木箱和托盘是否绑定
+            JSONObject jsonExtMove = extMoveList.stream()
+                    .filter(row -> row.getString("pcsn").equals(item.getString("storagevehicle_code")))
+                    .findFirst().orElse(null);
+
+            if (ObjectUtil.isEmpty(jsonExtMove)) {
+                throw new BadRequestException("此移库木箱【"+jsonExtMove.getString("storagevehicle_code")+"】没有绑定托盘，请核查");
+            }
+        });
+
+        // 生成移库任务
+        for (JSONObject jsonMove : moveList) {
+            // 调用接口生成木箱移库任务
+            this.createBoxMove(jsonMove);
+        }
+
+        // 下发木箱出库任务
+        new TwoOutBoxExcepTask().immediateNotifyAcs(null);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java
index b21ac6d2d..ed5a43e7e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBoxManageService.java
@@ -36,6 +36,7 @@ public interface InBoxManageService {
      * }
      */
     void boxBinVehicle(JSONObject whereJson);
+    void boxBinVehicleByTHRK(JSONObject whereJson);
 
     /**
      * 任务异常处理(1.满入 2.浅货位有货-放货时)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java
index d5ae9ab9e..58dddd75d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java
@@ -46,11 +46,15 @@ public interface LashManageService {
      *     length: 木箱长
      *     weight: 木箱宽
      *     height: 木箱高
+     *     case: 木箱类型
      *     isBinding: 是否捆绑
-     *     isLabeling: 是否贴标
      *     bindingTemplate: 捆扎模板
-     *     labelingTemplate: 贴标模板
+     *     bundleTimes: 第一次捆扎数量
+     *     box_structure: 木箱结构
+     *     box_structure: 木箱结构
      *     bundleTimes: 捆扎次数
+     *     isLabeling: 是否贴标
+     *     labelingTemplate: 贴标模板
      *     printQty: 贴标数量
      *     printDevice: 使用打印机
      * }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
index 3f979a9be..bee2a6954 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
@@ -2,6 +2,8 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service;
 
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+
 /**
  * <p>
  * 空木箱业务处理 服务类
@@ -52,4 +54,10 @@ public interface OutBoxManageService {
      */
     public String createBoxMove(JSONObject jsonObject);
 
+    /**
+     * 根据木箱号出库公共方法(多条数据)
+     * @param list 需要出库的木箱集合
+     */
+    void publicBoxOut(List<JSONObject> list);
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql
index 3218aaf1d..39528f7cc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql
@@ -156,7 +156,9 @@
                  AND attr.stor_id = 输入.stor_id
                  AND attr.sect_id = 输入.sect_id
                  AND attr.block_num = 输入.block_num
-                 AND attr.row_num = 输入.row_num
+                 OPTION 输入.row_num <> ""
+                     attr.row_num = 输入.row_num
+                 ENDOPTION
                  AND attr.storagevehicle_type = 输入.vehicle_type
                  AND attr.height = 输入.height
                  order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC
@@ -187,7 +189,9 @@
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
                 AND attr.block_num = 输入.block_num
-                AND attr.row_num = 输入.row_num
+                OPTION 输入.row_num <> ""
+                    attr.row_num = 输入.row_num
+                 ENDOPTION
                 AND attr.storagevehicle_type = 输入.vehicle_type
                 AND attr.height = 输入.height
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql
index 7ae8d20c2..5f5f8fc03 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql
@@ -70,7 +70,7 @@
                 AND box.is_packing = '0'
 
                 OPTION 输入.not_block_id <> ""
-                    attr.block_num not in = 输入.not_block_id
+                    attr.block_num not in 输入.not_block_id
                 ENDOPTION
 
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql
index 9efe41774..a750f0d50 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql
@@ -66,7 +66,7 @@
                 ENDOPTION
 
                 OPTION 输入.not_block_id <> ""
-                    attr.block_num not in = 输入.not_block_id
+                    attr.block_num not in 输入.not_block_id
                 ENDOPTION
 
                 group by attr.block_num
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java b/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java
new file mode 100644
index 000000000..8aa9d234f
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java
@@ -0,0 +1,54 @@
+package org.nl.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: lyd
+ * @Description:
+ * @Date: 2023/5/9
+ */
+@Getter
+@AllArgsConstructor
+public enum SpecEnum {
+
+    FQ_WG(1, "分切称重",""),
+    XX(2, "子卷下线",""),
+    ZJ(3, "质检",""),
+    BZ(4, "包装",""),
+    BZ_REMOVE(5, "包装解除",""),
+    BZ_MES(6, "包装回传","CamstarApi/momBoxPackageSubmit"),
+    ZXRK(7, "装箱入库",""),
+    TYCK(8, "退异常口",""),
+    YX_MES(9, "验箱","CamstarApi/BoxDataCollectionSubmit2"),
+    RK(10, "入库",""),
+    RK_YC(11, "异常口入库",""),
+    RK_MES(12, "入库回传","CamstarApi/ChildRollFGInboundComplete"),
+;
+
+    private final Integer value;
+    private final String desc;
+    private final String url;
+    public static String conversUrl(Integer value){
+        if (value != null){
+            for (SpecEnum specEnum : SpecEnum.values()) {
+                if (specEnum.getValue().equals(value)){
+                    return specEnum.getUrl();
+                }
+            }
+
+        }
+        return "";
+    }
+    public static String converName(Integer value){
+        if (value != null){
+            for (SpecEnum specEnum : SpecEnum.values()) {
+                if (specEnum.getValue().equals(value)){
+                    return specEnum.getDesc();
+                }
+            }
+
+        }
+        return "";
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/ApiDocScan.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/ApiDocScan.java
new file mode 100644
index 000000000..227ddcc81
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/ApiDocScan.java
@@ -0,0 +1,58 @@
+package org.nl.common.utils;
+
+
+import org.nl.modules.logging.annotation.Log;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import javax.annotation.Resource;
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/*
+ * @author ZZQ
+ * @Date 2023/10/17 14:51
+ * 接口文档工具
+ */
+@Component
+public class ApiDocScan implements SmartLifecycle {
+    @Resource
+    @Qualifier("requestMappingHandlerMapping")
+    public RequestMappingHandlerMapping requestHandlers;
+
+    public static Map<String,String> Log_Url;
+
+    @Override
+    public void start() {
+        Map<RequestMappingInfo, HandlerMethod> handlerMethods = requestHandlers.getHandlerMethods();
+        HashMap map = new HashMap<>();
+        handlerMethods.forEach((a,b)->{
+            Set<String> patterns = a.getPatternsCondition().getPatterns();
+            String name = patterns.iterator().next();
+            Annotation[] annotations = b.getMethod().getDeclaredAnnotations();
+            for (Annotation annotation : annotations) {
+                if (annotation instanceof Log){
+                    Log log = (Log) annotation;
+                    String urlName = log.value();
+                    map.put(urlName,name);
+                }
+            }
+        });
+        Log_Url = map;
+    }
+
+    @Override
+    public void stop() {
+
+    }
+    @Override
+    public boolean isRunning() {
+        return false;
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
index b8ed22d97..d5893473d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
@@ -1,5 +1,6 @@
 package org.nl.common.utils;
 
+import cn.hutool.http.HttpUtil;
 import lombok.SneakyThrows;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.util.SpringContextHolder;
@@ -27,8 +28,11 @@ public class CodeUtil {
                 String flag = "1";
                 HashMap<String, String> map = new HashMap<>();
                 map.put("flag", flag);
-                map.put("code", ruleCode);
-                return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map);
+                String code = HttpUtil.get("http://127.0.0.1:8013/api/codeDetail/getNewCode?code=" + ruleCode + "&flag=" + flag);
+                if (code.contains("status")){
+                    throw new BadRequestException(code);
+                }
+                return code;
             } else {
                 throw new BadRequestException("系统繁忙，稍后在试!");
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
index 01ecd5799..127941c1b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
@@ -1,11 +1,13 @@
 package org.nl.common.utils;
 
 import lombok.SneakyThrows;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -32,6 +34,55 @@ public class RedissonUtils {
             } else {
                 return;
             }
+        }catch (Exception ex){
+            throw ex;
+        }finally {
+            if (isLock && lock.isHeldByCurrentThread()){
+                lock.unlock();
+            }
+        }
+    }
+
+    /**
+     *
+     * @param process
+     * @param key
+     * @param secend:最大等待时间
+     * @param param
+     */
+    @SneakyThrows
+    public static void lock(Consumer process, String key, int secend, Object param){
+        RedissonClient redissonClient = SpringContextHolder.getBean(RedissonClient.class);
+        RLock lock = redissonClient.getLock(key);
+        boolean isLock;
+        isLock = lock.tryLock(secend,secend+5,TimeUnit.SECONDS);
+        try {
+            if (isLock){
+                process.accept(param);
+            } else {
+                throw new BadRequestException("当前业务"+key+"正在执行");
+            }
+        }catch (Exception ex){
+            ex.printStackTrace();
+            throw ex;
+        }finally {
+            if (isLock && lock.isHeldByCurrentThread()){
+                lock.unlock();
+            }
+        }
+    }
+    @SneakyThrows
+    public static void lock(Consumer process, String key, int secend, Object param,String throwinfo){
+        RedissonClient redissonClient = SpringContextHolder.getBean(RedissonClient.class);
+        RLock lock = redissonClient.getLock(key);
+        boolean isLock;
+        isLock = lock.tryLock(secend,secend+5,TimeUnit.SECONDS);
+        try {
+            if (isLock){
+                process.accept(param);
+            } else {
+                throw new BadRequestException(throwinfo);
+            }
         }catch (Exception ex){
             ex.printStackTrace();
             throw ex;
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/ReturnLockProcess.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/ReturnLockProcess.java
new file mode 100644
index 000000000..9fa883ef0
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/ReturnLockProcess.java
@@ -0,0 +1,9 @@
+package org.nl.common.utils;
+
+import java.io.IOException;
+
+@FunctionalInterface
+public
+interface ReturnLockProcess<T> {
+    T process() throws IOException;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
index 90c30a0ab..38cb2421d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
@@ -66,6 +66,22 @@ public class TaskUtils {
         target.setUpdate_time(now);
     }
 
+
+    /**
+     * 根据任务维护分切点位库存
+     * @param  target
+     */
+    public static void pointMaintenance(SchBaseTask task, BstIvtCutpointivt target) {
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String currentUsername = SecurityUtils.getCurrentUsername();
+        String now = DateUtil.now();
+        target.setUpdate_optid(currentUserId);
+        target.setUpdate_optname(currentUsername);
+        target.setUpdate_time(now);
+    }
+
+
+
     /**
      * 用0，1，2，3四个的二进制字符表示是下单(双)上单(双)
      * @param currentUpPlan 要下来的上轴
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
index 88e916df8..3671c0ada 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Primary;
 
 import javax.sql.DataSource;
 
-@Configuration
+//@Configuration
 @Slf4j
 public class DataBaseConfig {
     public static CountSqlParser countSqlParser = new CountSqlParser();
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
index f119c085b..5152f0a4d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
@@ -8,13 +8,18 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
 import com.alibaba.druid.proxy.jdbc.StatementProxy;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.util.JdbcUtils;
+import com.mysql.cj.jdbc.ConnectionImpl;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 
+import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /*
  * @author ZZQ
@@ -23,6 +28,11 @@ import java.util.List;
 @Slf4j
 public class DruidFilter extends FilterEventAdapter {
 
+    private static final Pattern GENERIC_HOST_PTRN = Pattern.compile("(?<scheme>[\\w\\+:%]+)\\s*" // scheme: required; alphanumeric, plus, colon or percent
+            + "(?://(?<host>[^:/?#]*)).*");
+
+    public static volatile List<String> Table_Range  = new ArrayList<>();
+
     @Override
     public int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementProxy statement) throws SQLException {
 
@@ -37,25 +47,29 @@ public class DruidFilter extends FilterEventAdapter {
 
     @Override
     protected void statementExecuteAfter(StatementProxy statement, String sql, boolean result) {
-        int size = statement.getParametersSize();
-        String executeSql = sql;
-        int count = 0;
+        String database="";
         try {
+            ConnectionImpl connection = (ConnectionImpl)statement.getConnection();
+            String url = connection.getURL();
+            Matcher matcher = GENERIC_HOST_PTRN.matcher(url);
+            if (matcher.matches()){
+                database = matcher.group("host");
+            }
+            int size = statement.getParametersSize();
+            String executeSql = sql;
+            int count = 0;
             count = statement.getUpdateCount();
-        } catch (Exception ex) {
-        }
-        if (count > 0) {
-            if (size > 0) {
+            if (count>=0){
                 Collection<JdbcParameter> values = statement.getParameters().values();
                 List<Object> params = new ArrayList<>();
                 for (JdbcParameter value : values) {
                     params.add(value.getValue());
                 }
                 executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
+                log.info("[----SQL----][update][执行结果:{}][数据库:{}][ SQL: {} ]",count,database, executeSql);
             }
-            if (!sql.contains("sys_log") && !sql.contains("sys_interface_log")){
-                log.info("[----SQL----][update][ SQL: {} ]", executeSql);
-            }
+        }catch (Exception ex){
+            log.warn("[-SQL解析异常-][{}]", ex.getMessage());
         }
         super.statementExecuteAfter(statement, sql, result);
     }
@@ -64,25 +78,36 @@ public class DruidFilter extends FilterEventAdapter {
     public ResultSetProxy statement_getResultSet(FilterChain chain, StatementProxy statement) throws SQLException {
         ResultSetProxy rs = super.statement_getResultSet(chain, statement);
         String executeSql = statement.getLastExecuteSql();
+        String database="";
         int result = 0;
-        if (rs != null) {
-            ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class);
-            result = rss.getRows().size();
-        }
         try {
-            int size = statement.getParametersSize();
-            if (size > 0) {
-                Collection<JdbcParameter> values = statement.getParameters().values();
-                List<Object> params = new ArrayList<>();
-                for (JdbcParameter value : values) {
-                    params.add(value.getValue());
+            String finalExecuteSql = executeSql;
+            boolean present = Table_Range.stream().filter(a -> finalExecuteSql.contains(a)).findAny().isPresent();
+            if (CollectionUtils.isEmpty(Table_Range) || present){
+                ConnectionImpl connection = (ConnectionImpl)statement.getConnection();
+                String url = connection.getURL();
+                Matcher matcher = GENERIC_HOST_PTRN.matcher(url);
+                if (matcher.matches()){
+                    database = matcher.group("host");
                 }
-                executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
+                if (rs != null) {
+                    ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class);
+                    result = rss.getRows().size();
+                }
+                int size = statement.getParametersSize();
+                if (size > 0) {
+                    Collection<JdbcParameter> values = statement.getParameters().values();
+                    List<Object> params = new ArrayList<>();
+                    for (JdbcParameter value : values) {
+                        params.add(value.getValue());
+                    }
+                    executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
+                }
+                log.info("[----SQL----][select][执行结果:{}][数据库:{}][ SQL: {} ]", result,database, executeSql);
             }
-        } catch (Exception ex) {
+        }catch (Exception ex){
             log.warn("[-SQL解析异常-][{}]", ex.getMessage());
         }
-        log.info("[----SQL----][select][执行结果:{}][ SQL: {} ]", result, executeSql);
         return rs;
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java b/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
index 557fe91bc..d2a73ba07 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
@@ -9,10 +9,11 @@ import java.util.UUID;
 public class TlogIdGenerator extends TLogIdGenerator {
     @Override
     public String generateTraceId() {
-        String idStr = String.valueOf(System.currentTimeMillis());
+        String idStr;
         try {
              idStr = IdUtil.getSnowflake(1, 1).nextIdStr();
         }catch (Exception ex){
+             idStr = String.valueOf(System.currentTimeMillis());
         }
         return idStr;
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
index 7615078c0..3e97fae34 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
@@ -2,9 +2,11 @@ package org.nl.config.mybatis;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.github.pagehelper.PageInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -30,18 +32,16 @@ public class MybatisPlusConfig {
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
 
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        // 分页插件
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+////        // 分页插件
+       interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         //乐观锁插件
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
 
         return interceptor;
     }
+//    @Bean
+//    ConfigurationCustomizer mybatisConfigurationCustomizer() {
+//        return configuration -> configuration.addInterceptor(new PageInterceptor());
+//    }
 
-    @PostConstruct
-    public void datainnit() {
-        String url = ((DruidDataSource) dataSource).getUrl();
-        System.out.println("项目数据库地址：" + url);
-        log.debug("项目数据库地址：{}", url);
-    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BlockItemDTO.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BlockItemDTO.java
new file mode 100755
index 000000000..fb1fa1daf
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BlockItemDTO.java
@@ -0,0 +1,23 @@
+package org.nl.modules.common.base;
+
+import lombok.Data;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.io.Serializable;
+import java.util.Map;
+
+@Data
+public class BlockItemDTO implements Serializable {
+    private static final long serialVersionUID = 4337563581927229706L;
+
+    /**
+     * 主键(分块明细项Id)
+     */
+    private Long id;
+
+    /**
+     * Excel一行数据(key为列名[columns_name可以和Excel列显示名不一致],value为单元格内容)
+     */
+    private Map<String,String> columnMap;
+
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
index c2bc6bc65..93365c265 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
@@ -43,10 +43,8 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -104,33 +102,27 @@ public class LogAspect {
         Object result;
         try {
             log.info("[--request--][请求接口:{}][请求参数:{}]", url, params);
-            currentTime.set(System.currentTimeMillis());
             result = joinPoint.proceed();
-        }catch (Throwable ex) {
+        }catch (Exception ex) {
             StringBuffer errorStack = new StringBuffer();
             errorStack.append("<br/>【异常堆栈:");
+            String errorMsg = ex.getMessage();
             int x = 0;
-            if (ex instanceof UndeclaredThrowableException){
-                ex = ((UndeclaredThrowableException) ex).getUndeclaredThrowable();
-                if (ex instanceof InvocationTargetException){
-                    ex = ((InvocationTargetException) ex).getTargetException();
-                }
-            }
             StackTraceElement[] stackTrace = ex.getStackTrace();
             if (stackTrace != null && stackTrace.length > 0) {
                 for (StackTraceElement stack : stackTrace) {
                     x++;
                     errorStack.append(stack.toString().replaceAll("<", ">")).append("<br/>");
-                    if (x > 15) {
+                    if (x > 10) {
                         break;
                     }
                 }
             }
-            log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url, ex.getMessage(), params, ThrowableUtil.getStackTrace(ex));
+            log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url, errorMsg, params, errorStack.append("】").toString());
             if (ex instanceof BadRequestException){
                 throw ex;
             }else {
-                throw new BadRequestException("系统繁忙,请联系管理员确认,稍后再试");
+               throw new BadRequestException("系统繁忙,请联系管理员确认,稍后再试");
             }
         } finally {
             log.info("[--response--][请求接口:{} 执行结束][耗时:{}s]", url, (System.currentTimeMillis() - comming) / 1000);
@@ -173,20 +165,6 @@ public class LogAspect {
     }
 
 
-    /**
-     * 配置异常通知
-     *
-     * @param joinPoint join point for advice
-     * @param e         exception
-     */
-//    @AfterThrowing(pointcut = "logPointcut()", throwing = "e")
-    public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
-        SysLog log = new SysLog("ERROR", System.currentTimeMillis() - currentTime.get());
-        currentTime.remove();
-        log.setException_detail(ThrowableUtil.getStackTrace(e).getBytes());
-        HttpServletRequest request = RequestHolder.getHttpServletRequest();
-        logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
-    }
 
     public String getUsername() {
         try {
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java
index ae5169a7b..b79e23c7e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java
@@ -24,21 +24,17 @@ import org.springframework.web.bind.annotation.*;
 public class EsLogController {
     private final EsLogService esLogService;
 
-
     @GetMapping("/labels/{type}")
-
     public ResponseEntity<Object> labelsValues(@PathVariable String type) {
         return new ResponseEntity<>(esLogService.getLabelsValues(type), HttpStatus.OK);
     }
 
     @PostMapping("/query")
-
     public ResponseEntity<Object> queryAll(@RequestBody LogQuery query) {
         return new ResponseEntity<>(esLogService.query(query), HttpStatus.OK);
     }
 
     @DeleteMapping("/clearLogs")
-
     public ResponseEntity<Object> clearLogs(@RequestBody LogQuery query) {
         esLogService.clearLogs(query);
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java
index 92a557fc5..e43ffa406 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java
@@ -16,6 +16,7 @@ import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.*;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.BytesRef;
+import org.nl.common.utils.ApiDocScan;
 import org.nl.config.lucene.LuceneAppender;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.logging.service.EsLogService;
@@ -24,13 +25,11 @@ import org.nl.modules.logging.service.dto.LogRepositoryDTO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author ldjun
@@ -70,11 +69,27 @@ public class LuceneLogServiceImpl implements EsLogService {
     @Override
     public JSONArray getLabelsValues(String type) {
         JSONArray result = new JSONArray();
-        for (String v : INFO_LEVEL) {
-            JSONObject item = new JSONObject();
-            item.put("label", v);
-            item.put("value", v);
-            result.add(item);
+        switch (type){
+            case "logLevel":
+                for (String v : INFO_LEVEL) {
+                    JSONObject item = new JSONObject();
+                    item.put("label", v);
+                    item.put("value", v);
+                    result.add(item);
+                }
+                break;
+            case "interface":
+                if (!CollectionUtils.isEmpty(ApiDocScan.Log_Url)){
+                    Set<String> strings = ApiDocScan.Log_Url.keySet();
+                    for (String label : strings) {
+                        String value = ApiDocScan.Log_Url.get(label);
+                        JSONObject item = new JSONObject();
+                        item.put("label", label);
+                        item.put("value", value);
+                        result.add(item);
+                    }
+                }
+                break;
         }
         return result;
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java
deleted file mode 100644
index 8cd8b559f..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-///*
-// *  Copyright 2019-2020 Zheng Jie
-// *
-// *  Licensed under the Apache License, Version 2.0 (the "License");
-// *  you may not use this file except in compliance with the License.
-// *  You may obtain a copy of the License at
-// *
-// *  http://www.apache.org/licenses/LICENSE-2.0
-// *
-// *  Unless required by applicable law or agreed to in writing, software
-// *  distributed under the License is distributed on an "AS IS" BASIS,
-// *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// *  See the License for the specific language governing permissions and
-// *  limitations under the License.
-// */
-//package org.nl.modules.logging.service.mapstruct;
-//
-//import org.mapstruct.Mapper;
-//import org.mapstruct.ReportingPolicy;
-//import org.nl.modules.common.base.BaseMapper;
-//import org.nl.modules.logging.domain.Log;
-//import org.nl.modules.logging.service.dto.LogErrorDTO;
-//
-///**
-// * @author Zheng Jie
-// * @date 2019-5-22
-// */
-//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-//public interface LogErrorMapper extends BaseMapper<LogErrorDTO, Log> {
-//
-//}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java
deleted file mode 100644
index a86f7d507..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-///*
-// *  Copyright 2019-2020 Zheng Jie
-// *
-// *  Licensed under the Apache License, Version 2.0 (the "License");
-// *  you may not use this file except in compliance with the License.
-// *  You may obtain a copy of the License at
-// *
-// *  http://www.apache.org/licenses/LICENSE-2.0
-// *
-// *  Unless required by applicable law or agreed to in writing, software
-// *  distributed under the License is distributed on an "AS IS" BASIS,
-// *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// *  See the License for the specific language governing permissions and
-// *  limitations under the License.
-// */
-//package org.nl.modules.logging.service.mapstruct;
-//
-//import org.mapstruct.Mapper;
-//import org.mapstruct.ReportingPolicy;
-//import org.nl.modules.common.base.BaseMapper;
-//import org.nl.modules.logging.domain.Log;
-//import org.nl.modules.logging.service.dto.LogSmallDTO;
-//
-///**
-// * @author Zheng Jie
-// * @date 2019-5-22
-// */
-//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-//public interface LogSmallMapper extends BaseMapper<LogSmallDTO, Log> {
-//
-//}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
index 3b3d29f23..17a82a645 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
@@ -99,7 +99,7 @@
 //    }
 //
 //    @Override
-//    @Transactional(Transactional.TxType.REQUIRES_NEW)
+//    @Transactional(Transactional.TxType.`REQUIRES_NEW`)
 //    public String codeDemo(Map form) {
 //        String code = (String) form.get("code");
 //        String id = this.queryIdByCode(code);
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java
index 22e50fccb..9e888d301 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java
@@ -28,7 +28,7 @@ public class WQLCore {
     //解析wql文件的根目录
     public static String ROOT = "wql";
     //数据库默认名
-    public static String defalutDBName = "dataSource";
+    public static String defalutDBName = "shardingSphereDataSource";
     //wql源文件
     public static HashMap<String, ArrayList<String>> wqlMap = new HashMap<String, ArrayList<String>>();
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
index 6bf8ae107..f84183697 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
@@ -20,6 +20,7 @@ import org.apache.commons.beanutils.BasicDynaBean;
 import org.apache.commons.beanutils.BasicDynaClass;
 import org.apache.commons.beanutils.DynaProperty;
 import org.apache.commons.beanutils.RowSetDynaClass;
+import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
 import org.nl.modules.wql.util.WqlUtil;
 
 import java.beans.IntrospectionException;
@@ -342,6 +343,11 @@ public class ResultBean implements Serializable, Cloneable {
         }
         try {
             //支持别名的设置
+            if (sqlResultSet instanceof  ShardingSphereResultSet){
+                ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet;
+                sqlResultSet = resultSet.getResultSets().get(0);
+            }
+
             WQLRowSetDynaClass rs = new WQLRowSetDynaClass(sqlResultSet, true, -1);
             rslist.add(rs);
             ResultCount = rslist.size();
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java
index 32a23d9f4..6ed6b045d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java
@@ -26,7 +26,7 @@ public class WQLObject implements Serializable, Cloneable {
     private static final long serialVersionUID = 3512111887957792224L;
 
 
-    private String dbname = "dataSource";    //指定使用的数据库
+    private String dbname = "shardingSphereDataSource";    //指定使用的数据库
 
     public WQLObject setDbname(String dbname) {
         this.dbname = dbname;
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java
index d70395fc6..9e47f4255 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java
@@ -7,7 +7,7 @@
  *
  * 创  建  者 ：yumeng
  * 创建时间：2014-07-01 14:25:35
- * 文件版本：v1.0 
+ * 文件版本：v1.0
  *
  *******************************************************/
 package org.nl.modules.wql.core.engine.object;
@@ -47,7 +47,7 @@ public class WO implements Serializable, Cloneable {
     public WP wp;
 
     private String code = "";                //当前交易编号
-    private String dbname = "dataSource";    //指定使用的数据库
+    private String dbname = "shardingSphereDataSource";    //指定使用的数据库
 
     public WO setDbname(String dbname) {
         this.dbname = dbname;
@@ -368,7 +368,7 @@ public class WO implements Serializable, Cloneable {
 //								//this.wp.conn = null;
 ////								this.wp.utx=null;
 //							}
-//							
+//
 //						} else {
 //							try {
 ////								if(this.wp.utx!=null){
@@ -410,7 +410,7 @@ public class WO implements Serializable, Cloneable {
 //							DBConnection.freeConnection(this.wp.conn,this.dbname);
 //						}
 //					}
-//					
+//
 //					if(this.wp._success){
 //						log.debug(this.code+"执行成功");
 //						this.wp.rb.setSucess(1);
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java
index 6a40a1ff9..91c2c5360 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java
@@ -2,8 +2,11 @@ package org.nl.system.controller.coderule;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.system.service.coderule.ISysCodeRuleDetailService;
 import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
@@ -55,12 +58,20 @@ public class SysCodeRuleDetailController {
     }
 
     @Log("修改编码明细")
-
     @PutMapping
     @SaCheckPermission("genCode:edit")
     public ResponseEntity<Object> update(@RequestBody SysCodeRuleDetail json) {
         codeDetailService.update(json);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+    @GetMapping("getNewCode")
+    @SaIgnore
+    public ResponseEntity<Object> getCode(String code,String flag) {
+        if (StringUtils.isEmpty(flag)){
+            flag = "1";
+        }
+        String newCode = codeDetailService.getNewCode(code, flag);
+        return new ResponseEntity<>(newCode,HttpStatus.OK);
+    }
 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java
index dc3da84de..0f7abb7ee 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java
@@ -1,5 +1,6 @@
 package org.nl.system.controller.dict;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
@@ -8,6 +9,7 @@ import org.nl.system.service.dict.ISysDictService;
 import org.nl.system.service.dict.dao.Dict;
 import org.nl.system.service.dict.dto.DictQuery;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -59,7 +61,6 @@ public class SysDictController {
 
     @PutMapping
     @Log("修改字典")
-
     //@SaCheckPermission("@el.check('dict:edit')")
     public ResponseEntity<Object> updateDict(@Validated @RequestBody Dict dto) {
         dictService.updateDict(dto);
@@ -76,12 +77,16 @@ public class SysDictController {
     }
 
     @GetMapping("/dictDetail")
-
     public ResponseEntity<Object> queryDetails(@RequestParam Map criteria, PageQuery pageable) {
         DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class);
         return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery, pageable)), HttpStatus.OK);
     }
 
+    @PostMapping("/dictDetail/post")
+    public ResponseEntity<Object> queryDetailsPost(@RequestBody String code) {
+        return new ResponseEntity<>(TableDataInfo.build(dictService.queryDetailsPost(code)), HttpStatus.OK);
+    }
+
 
     @GetMapping(value = "/dictDetail/map")
     public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java
index d5c51ec90..1049b765e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java
@@ -4,15 +4,19 @@ package org.nl.system.controller.generator;
 import cn.dev33.satoken.annotation.SaIgnore;
 
 
-import lombok.RequiredArgsConstructor;
+import org.nl.config.DruidFilter;
 import org.nl.system.service.generator.ICodeGenConfigService;
 import org.nl.system.service.generator.dao.CodeGenConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 代码生成配置表 前端控制器
@@ -40,5 +44,15 @@ public class CodeGenConfigController {
     public ResponseEntity<Object> update(@Validated @RequestBody CodeGenConfig genConfig){
         return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK);
     }
+
+    @PostMapping("/changeRange")
+    @SaIgnore
+    public ResponseEntity<Object> changeRange(@RequestBody Map param){
+        if (!CollectionUtils.isEmpty(param)){
+            DruidFilter.Table_Range = (List<String>) param.get("tables");
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
index 3f349b7ee..da451eb7b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
@@ -45,4 +45,8 @@ public interface ISysCodeRuleDetailService extends IService<SysCodeRuleDetail> {
      * @param json
      */
     void update(SysCodeRuleDetail json);
+    /**
+     * http获取code
+     */
+    String getNewCode(String code,String flag);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
index 4cf4df144..817050f92 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
@@ -2,22 +2,28 @@ package org.nl.system.service.coderule.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.system.service.coderule.ISysCodeRuleDetailService;
+import org.nl.system.service.coderule.dao.SysCodeRule;
 import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
 import org.nl.system.service.coderule.dao.mapper.SysCodeRuleDetailMapper;
+import org.nl.system.service.coderule.dao.mapper.SysCodeRuleMapper;
 import org.nl.system.service.coderule.dto.CodeRuleDetailQuery;
 import org.nl.system.service.coderule.utils.CodeRuleTypeEnum;
 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.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -32,6 +38,9 @@ public class SysCodeRuleDetailServiceImpl extends ServiceImpl<SysCodeRuleDetailM
     @Autowired
     private SysCodeRuleDetailMapper codeRuleDetailMapper;
 
+    @Resource
+    private SysCodeRuleMapper codeRuleMapper;
+
     @Override
     public IPage<SysCodeRuleDetail> queryAll(CodeRuleDetailQuery form, PageQuery page) {
         LambdaQueryWrapper<SysCodeRuleDetail> lam = new LambdaQueryWrapper<>();
@@ -77,4 +86,79 @@ public class SysCodeRuleDetailServiceImpl extends ServiceImpl<SysCodeRuleDetailM
     public void update(SysCodeRuleDetail json) {
         codeRuleDetailMapper.updateById(json);
     }
+
+    @Override
+    @Transactional
+    public String getNewCode(String code, String flag) {
+        String id = codeRuleMapper.selectOne(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, code)).getId();
+        // 如果flag = 1就执行更新数据库的操作
+        List<SysCodeRuleDetail> ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper<SysCodeRuleDetail>()
+                .eq(SysCodeRuleDetail::getCode_rule_id, id)
+                .orderByAsc(SysCodeRuleDetail::getSort_num));
+        String demo = "";
+        boolean isSame = true;
+        for (SysCodeRuleDetail detail : ruleDetails) {
+            String value = "";
+            String type = detail.getType();
+            //固定直接取值
+            if (type.equals(CodeRuleTypeEnum.FIXED.getType())) {
+                value = detail.getInit_value();
+            }
+            //日期判断数据库的值与当前值是否相同来决定顺序的值
+            if (type.equals(CodeRuleTypeEnum.DATE.getType())) {
+                String currentValue = detail.getCurrent_value();
+                Date date = DateUtil.date();
+                String format = detail.getFormat();
+                String nowDate = DateUtil.format(date, format);
+                if (!nowDate.equals(currentValue)) {
+                    isSame = false;
+                }
+                if ("1".equals(flag)) {
+                    detail.setInit_value(nowDate);
+                    detail.setCurrent_value(nowDate);
+                }
+                value = nowDate;
+            }
+            //顺序的值：如果日期一样就+步长，等于最大值就归为初始值；日期不一样就归为初始值
+            if (type.equals(CodeRuleTypeEnum.ORDER.getType())) {
+                String numValue = "";
+                int step = Integer.parseInt(detail.getStep());
+                Long maxValue = Long.valueOf(detail.getMax_value());
+                if (!isSame || (Long.valueOf(detail.getCurrent_value()) + step) > maxValue) {
+                    numValue = detail.getInit_value();
+                } else {
+                    numValue = Integer.parseInt(detail.getCurrent_value()) + step + "";
+                }
+                int size = numValue.length();
+                int length = detail.getLength();
+                String fillchar = detail.getFillchar();
+                for (int m = 0; m < (length - size); m++) {
+                    value += fillchar;
+                }
+                value += numValue;
+                if ("1".equals(flag)) {
+                    if (!isSame) {
+                        int initValue = Integer.parseInt(detail.getInit_value());
+                        if (StrUtil.isEmpty((initValue + ""))) {
+                            throw new BadRequestException("请完善编码数值的初始值！");
+                        }
+                        detail.setCurrent_value(String.valueOf(initValue));
+                    } else {
+                        int numCurr = Integer.parseInt(detail.getCurrent_value());
+                        if (numCurr >= maxValue) {
+                            numCurr = Integer.parseInt(detail.getInit_value());
+                            detail.setCurrent_value(String.valueOf(numCurr));
+                        } else {
+                            detail.setCurrent_value(String.valueOf(numCurr + step));
+                        }
+                    }
+                }
+            }
+            demo += value;
+            if ("1".equals(flag)) {
+               codeRuleDetailMapper.updateById(detail);
+            }
+        }
+        return demo;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
index f9a98852f..9ef728082 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
@@ -4,6 +4,9 @@ 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 cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +17,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.MapOf;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.utils.ElAdminConstant;
 import org.nl.system.service.coderule.ISysCodeRuleService;
 import org.nl.system.service.coderule.dao.SysCodeRule;
 import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
@@ -62,7 +66,6 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
 
     @SneakyThrows
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public String codeDemo(Map form) {
         String code = (String) form.get("code");
         String id = codeRuleMapper.selectOne(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, code)).getId();
@@ -132,7 +135,10 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
             }
             demo += value;
             if ("1".equals(flag)) {
-                codeRuleDetailMapper.updateById(detail);
+                new Thread(()->{
+                    codeRuleDetailMapper.updateById(detail);
+                })
+                .start();
             }
             log.info("更新成功：更新数据{}", detail);
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/ISysDictService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/ISysDictService.java
index 8c168dc06..f70fd51ec 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/ISysDictService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/ISysDictService.java
@@ -94,4 +94,11 @@ public interface ISysDictService extends IService<Dict> {
      * @return
      */
     List<Dict> queryAll();
+
+    /**
+     * 根据code获取字典数据
+     * @param code
+     * @return
+     */
+    List<Dict> queryDetailsPost(String code);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
index a1f5cea70..f35cfc04c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
@@ -17,6 +17,8 @@ import org.nl.system.service.dict.dao.Dict;
 import org.nl.system.service.dict.dao.mapper.SysDictMapper;
 import org.nl.system.service.dict.dto.DictQuery;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -77,6 +79,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @CacheEvict(value = "dict", key = "#dto.code")
     public void updateDict(Dict dto) {
         Dict dict = sysDictMapper.selectById(dto.getDict_id());
         if (ObjectUtil.isEmpty(dict)) {
@@ -102,6 +105,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @CacheEvict(value = "dict", allEntries = true)
     public void deleteBatchByIds(Set<String> ids) {
         // 查找code删除
         ids.forEach(id -> {
@@ -132,6 +136,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @CacheEvict(value = {"dict"}, key = "#dict.code")
     public void createDetail(Dict dict) {
         // 校验是否已经有标签
         Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper<Dict>().eq(Dict::getLabel, dict.getLabel())
@@ -170,6 +175,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @CacheEvict(value = {"dict"}, key = "#resources.code")
     public void updateDetail(Dict resources) {
         Dict dict = sysDictMapper.selectById(resources.getDict_id());
         if (ObjectUtil.isEmpty(dict)) {
@@ -189,6 +195,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @CacheEvict(value = "dict", allEntries = true)
     public void deleteDetail(String id) {
         sysDictMapper.deleteById(id);
     }
@@ -201,4 +208,15 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
                 .groupBy(Dict::getCode, Dict::getName));
     }
 
+    @Override
+    @Cacheable(value = {"dict"}, key = "#code")
+    public List<Dict> queryDetailsPost(String code) {
+        LambdaQueryWrapper<Dict> lam = new LambdaQueryWrapper<>();
+        lam.eq(Dict::getCode, code)
+                .isNotNull(Dict::getLabel)
+                .ne(Dict::getLabel, "")
+                .orderBy(true, true, Dict::getDict_sort);
+        return sysDictMapper.selectList(lam);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
index 51de17ff2..52e1a3f74 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
@@ -100,9 +100,8 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
 
     @Override
     public Integer countByReceiveNotRead() {
-        List<SysNotice> sysNotices = sysNoticeMapper.selectList(new LambdaQueryWrapper<SysNotice>()
+        return sysNoticeMapper.selectCount(new LambdaQueryWrapper<SysNotice>()
                 .eq(SysNotice::getHave_read, NoticeEnum.HAVE_READ_OFF.getValue()));
-        return ObjectUtil.isNotEmpty(sysNotices) ? sysNotices.size() : 0;
     }
 
     @Override
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java
index fa257c4c5..6b998867c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java
@@ -55,4 +55,6 @@ public interface ISysParamService extends IService<Param> {
      * @return Param
      */
     Param findByCode(String code);
+
+    Param findMinByCode(String code);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
index ecaf104e8..46f898aa2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -103,4 +104,13 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
         Param param = paramMapper.selectOne(queryWrapper);
         return param;
     }
+
+    @Override
+    public Param findMinByCode(String code) {
+        QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("code", code);
+        queryWrapper.orderByDesc("value");
+        List<Param> param = paramMapper.selectList(queryWrapper);
+        return param.get(0);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
index 1041e14d5..c18855cac 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
@@ -15,6 +15,8 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import java.net.InetAddress;
+import java.util.LinkedHashSet;
 import java.util.List;
 
 @Component
@@ -39,7 +41,7 @@ public class JobRunner implements ApplicationRunner {
         log.info("--------------------注入定时任务---------------------");
         List<SysQuartzJob> quartzJobs = quartzJobService.findByIsPauseIsFalse();
         quartzJobs.forEach(job -> {
-            if (localIp.equals(job.getJob_ip())) {
+            if (judgmentIp(job.getJob_ip())) {
                 log.info("定时任务:{}, 执行ip: {}, 定时任务开启", job.getJob_name(), localIp);
                 System.out.println("定时任务: " + job.getJob_name() + ", 执行ip: " + localIp + ", 定时任务开启");
                 quartzManage.addJob(job);
@@ -52,4 +54,9 @@ public class JobRunner implements ApplicationRunner {
         log.info("--------------------定时任务注入完成---------------------");
     }
 
+    public static Boolean judgmentIp(String ip) {
+        return NetUtil.localAddressList(null).stream()
+                .anyMatch(inet -> ip.equals(inet.getHostAddress()));
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
index d020b4201..0fa8c3f38 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import lombok.SneakyThrows;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
@@ -121,7 +122,7 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
             }
         }, Date.class);
         try {
-            
+
             BeanUtils.populate(sysUser, userDetail);
         } catch (Exception ex) {
             throw new RuntimeException();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
index 74c727342..35acd3bf2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
@@ -480,7 +480,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
 
         //添加子节点
         try {
-            List<Entity> list = Db.use((DataSource) SpringContextHolder.getBean("dataSource")).query(sql);
+            List<Entity> list = Db.use((DataSource) SpringContextHolder.getBean("shardingSphereDataSource")).query(sql);
             list.forEach(item -> {
                 set.add(item.getStr("class_id"));
             });
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
index a6d979f90..674a67c0e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
@@ -143,6 +143,7 @@ public class StructivtServiceImpl implements StructivtService {
         map.put("is_virtual", is_virtual);
         map.put("sub_type", sub_type);
         map.put("quality_scode", quality_scode);
+        map.put("control", control);
         if (StrUtil.isNotEmpty(material)) {
             map.put("material", "%" + material + "%");
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index 527fc78d2..629d18949 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -230,6 +230,13 @@ public class AcsToWmsController {
         return new ResponseEntity<>(acsToWmsService.acsCallShaftFromCache(param), HttpStatus.OK);
     }
 
+    @PostMapping("/acsRequestPoint")
+    @Log(value = "二期ACS请求出轴", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS)
+    @SaIgnore
+    public ResponseEntity<Object> acsRequestPoint(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(acsToWmsService.acsRequestPoint(param), HttpStatus.OK);
+    }
+
     @PostMapping("/forceMove")
     @Log(value = "二期捆扎位ACS请求强制离开", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS)
     @SaIgnore
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index 6dbbe188a..5756ceda4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -239,4 +239,11 @@ public interface AcsToWmsService {
      * @return JSONObject
      */
     JSONObject forceMove(JSONObject param);
+
+    /**
+     * 二期请求放货/取货
+     * @param param
+     * @return
+     */
+    JSONObject acsRequestPoint(JSONObject param);
 }
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 55313e9f7..005b3b2b1 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
@@ -19,9 +19,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
+import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
 import org.nl.b_lms.pda.service.ProductOutTwoService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
+import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService;
+import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
@@ -39,9 +44,11 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
 import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.enums.TASKEnum;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.*;
 import org.nl.common.enums.NoticeTypeEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.common.enums.SpecEnum;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
@@ -51,6 +58,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.system.service.param.ISysParamService;
+import org.nl.system.service.param.dao.Param;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
@@ -61,6 +69,8 @@ import org.nl.wms.pda.mps.service.impl.BakingServiceImpl;
 import org.nl.wms.pda.st.service.impl.PrintServiceImpl;
 import org.nl.wms.sch.ComPareUtil;
 import org.nl.wms.sch.manage.AbstractAcsTask;
+import org.nl.wms.sch.manage.AutoSendFeiShu;
+import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.tasks.CutConveyorTask;
 import org.nl.wms.sch.tasks.EmptyVehicleTask;
@@ -107,6 +117,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     private final ISysNoticeService noticeService;
 
+    @Autowired
+    private  IPdmBiContainerinboundService iPdmBiContainerinboundService;
+
     /**
      * 入库处理类服务
      */
@@ -159,6 +172,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Resource
     private SsxDjwTask ssxDjwTask;
 
+    @Autowired
+    private IMdpbBoxtypeService iMdpbBoxtypeService;
 
     @Autowired
     private ISysParamService iSysParamService;
@@ -172,6 +187,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Autowired
     private ProductOutTwoService productOutTwoService;
 
+    @Autowired
+    private IStIvtIostorinvOutService iStIvtIostorinvOutService;
+    @Autowired
+    private IBstIvtShafttubeivtService shafttubeivtService;
+
     private final IstIvtCutpointivtService cutpointivtService;
     private final WmsToAcsService wmsToAcsService;
 
@@ -191,6 +211,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         JSONArray array = JSONArray.parseArray(string);
         //返回处理失败的任务
         JSONArray errArr = new JSONArray();
+        JSONObject result = new JSONObject();
         for (int i = 0; i < array.size(); i++) {
             JSONObject row = array.getJSONObject(i);
             String task_id = row.getString("task_id");
@@ -198,16 +219,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
             try {
                 if (tryLock) {
-                    JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task")
-                            .query("task_id = '" + task_id + "'").uniqueResult(0);
-                    if (ObjectUtil.isEmpty(taskObj)){
-                        throw new BadRequestException("未找到任务标识为：" + task_id + "的任务！");
+                    JSONObject task = WQLObject.getWQLObject("SCH_BASE_Task")
+                            .query("task_id = '" + task_id + "'")
+                            .uniqueResult(0);
+                    if (ObjectUtil.isEmpty(task)){
+                            throw new BadRequestException("未找到任务标识为：" + task_id + "的任务！");
                     }
-                    if ("1".equals(taskObj.getString("is_delete"))){
+                    if ("1".equals(task.getString("is_delete"))){
                         log.debug(task_id+"当前LMS任务已删除，不需要再次反馈更新！");
                         continue;
                     }
-                    if ("08,07".contains(taskObj.getString("task_status"))){
+                    if ("08,07".contains(task.getString("task_status"))){
                         log.debug(task_id+"当前LMS任务完成或取消，不需要再次反馈更新！");
                         continue;
                     }
@@ -215,37 +237,29 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         WQLObject.getWQLObject("SCH_BASE_Task")
                                 .update(MapOf.of("car_no",row.getString("car_no")),"task_id = '" + task_id + "'");
                     }
-                    // 任务处理类
-                    String processing_class = taskObj.getString("handle_class");
-                    if (StrUtil.isEmpty(processing_class)) {
+                    String handleClassName = task.getString("handle_class");
+                    if (StrUtil.isEmpty(handleClassName)) {
                         throw new BadRequestException("当前任务的处理类未找到！");
                     }
-                    AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(taskObj.getString("handle_class")));
+                    AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(task.getString("handle_class")));
                     abstractTask.updateTaskStatus(row,Task_Status_Convers.get(row.getString("task_status")));
                 } else {
                     throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
                 }
+            }catch (BadRequestException ex){
+                log.error(task_id+"acs更新任务失败:{}", ex);
+                WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败:"+ex.getMessage()),"task_id = '" + task_id + "'");
+                throw ex;
             }catch (Exception ex){
                 log.error(task_id+"acs更新任务失败:{}", ex);
-                String msg = "";
-                if (!StringUtils.isEmpty(ex.getMessage())){
-                    int length = ex.getMessage().length();
-                    if (length>100){
-                        msg = ex.getMessage().substring(0, 99);
-                    }else {
-                        msg = ex.getMessage();
-                    }
-                }
-                WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark","更新"+row.getString("task_status")+"失败:"+msg),"task_id = '" + task_id + "'");
+                WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败,系统异常"),"task_id = '" + task_id + "'");
                 throw ex;
             }finally {
                 if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                     lock.unlock();
                 }
             }
-
         }
-        JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());
         result.put("message", "任务状态反馈成功!");
         result.put("data", new JSONObject());
@@ -785,7 +799,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
         RLock lock = redissonClient.getLock("acs_to_deviceApply_wms:" + type);
         boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
-
+        WQLObject pdm_bi_subpackagerelation = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
         try {
             if (tryLock) {
                 if ("1".equals(type)) {
@@ -796,7 +810,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (StrUtil.isEmpty(weight)) {
                         throw new BadRequestException("重量不能为空！");
                     }
-                    JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
+                    JSONObject sub_jo = pdm_bi_subpackagerelation.query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
                     if (ObjectUtil.isEmpty(sub_jo)) {
                         throw new BadRequestException("未查询到该木箱对应的包装关系！");
                     }
@@ -818,7 +832,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         //更新实际重量
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("real_weight", NumberUtil.round(weight, 1));
-                        WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + vehicle_code + "'");
+                        pdm_bi_subpackagerelation.update(map, "package_box_sn = '" + vehicle_code + "'");
                         data.put("is_auto_table", "0");
                         result.put("data", data);
                         return result;
@@ -878,7 +892,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (StrUtil.isEmpty(vehicle_code)) {
                         throw new BadRequestException("木箱码不能为空！");
                     }
-                    JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
+                    JSONObject sub_jo = pdm_bi_subpackagerelation.query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
                     if (ObjectUtil.isEmpty(sub_jo)) {
                         throw new BadRequestException("未查询到该木箱对应的包装关系！");
                     }
@@ -2079,95 +2093,65 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      * 二楼到一楼，成品子卷到达一楼输送线
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    @SneakyThrows
     public JSONObject sendProductToFirstFloor(JSONObject whereJson) {
-        // JSONObject whereJson 应该传子卷号，设备号，车间号
-        // 先查询满轴缓存位是否有可用库位，有创建搬运任务
-        // 任务完成创建空载具补充到输送线桁架任务，子卷搬运至待检区或或管制区agv任务
-        // 如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发；
-        // 这个情况是有agv任务在搬去待检区或管制区的路上，还没有更新任务状态；需要查询是否有这种任务，等这个任务更新完后，
-        // 再补发之前创建的输送线到满轴缓存位任务；
-        log.info("二楼到一楼，成品子卷到达一楼输送线接口sendProductToFirstFloor被调用--------------------------：" + whereJson.toString());
+        log.info("sendProductToFirstFloor被调用--------------------------：" + whereJson.toString());
         if (StringUtils.isBlank(whereJson.getString("device_code")) || StringUtils.isBlank(whereJson.getString("material_barcode"))) {
             throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为空！");
         }
         if (whereJson.getString("device_code").equals("null") || whereJson.getString("material_barcode").equals("null")) {
             throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为null！");
         }
-        String containerName = whereJson.getString("material_barcode");
         JSONObject result = new JSONObject();
-        result.put("data", containerName);
-        RLock lock = redissonClient.getLock(containerName);
-        boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
-        try {
-            if (tryLock) {
-                //1.查询满轴缓存位是否有空位
-                List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService
-                        .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
-                                .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
-                List<BstIvtPackageinfoivt> mzPointList = bstIvtPackageinfoivtList.stream()
-                        .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位").equals(r.getPoint_status())
-                                && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()))
-                        .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq).reversed()).collect(Collectors.toList());
-
-                JSONObject jo = new JSONObject();
-                jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
-                jo.put("vehicle_code", containerName);
-                //2.创建输送线->满轴位桁架任务，
-                String point_code1 = whereJson.getString("device_code");
-                jo.put("point_code1", point_code1);
-                if (ObjectUtils.isNotEmpty(mzPointList)) {
-                    //任意一个满轴缓存位为终点
-                    jo.put("point_code2", mzPointList.get(0).getPoint_code());
-                    List<BstIvtPackageinfoivt> kzjPointList = bstIvtPackageinfoivtList.stream()
-                            .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位").equals(r.getPoint_status())
-                                    && PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status()))
-                            .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq)).collect(Collectors.toList());
-                    //空载具缓存位有空载具，桁架取空载具从外到里取空载具，升序
-                    if (ObjectUtils.isNotEmpty(kzjPointList)) {
-                        //创建输送线四个点任务
-                        return createTask(containerName, jo, kzjPointList.get(0).getPoint_code(), whereJson.getString("device_code"));
-                    } else {
-                        //创建输送线->满轴缓存位两个点任务
-                        return createTask2(containerName, jo);
-                    }
-                } else {
-                    //如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发；
-                    List<String> taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"), PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"), PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")));
-                    List<SchBaseTask> existTaskList = taskService.getExistTasks(taskTypes);
-                    //如果有就不创建，没有就创建
-                    if (ObjectUtils.isEmpty(existTaskList)) {
-                        //只确定起点NBJ1002
-                        JSONObject jo2 = new JSONObject();
-                        jo2.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
-                        jo2.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"));
-                        jo2.put("point_code1", "NBJ1002");
-                        jo2.put("vehicle_code", containerName);
-                        jo2.put("task_status", TaskStatusEnum.SURE_START.getCode());
-                        jo2.put("is_send", false);
-                        mzhcwTask.createTask(jo2);
-                        //不确定起点的空载具缓存位->输送线任务
-                        createTask3(containerName);
-                        result.put("status", HttpStatus.OK.value());
-                        result.put("message", "反馈成功!");
-                    } else {
-                        log.info("已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList.get(0).getTask_code() + "，请检查!");
-                        result.put("status", HttpStatus.BAD_REQUEST.value());
-                        result.put("message", "已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList.get(0).getTask_code() + "，请检查!");
-                    }
-                }
-            } else {
-                log.info("二楼到一楼成品子卷到达一楼输送线任务正在创建被锁住。");
-                result.put("status", HttpStatus.BAD_REQUEST.value());
-                result.put("message", "二楼到一楼成品子卷到达一楼输送线任务正在创建被锁住。");
+        result.put("status", HttpStatus.BAD_REQUEST.value());
+        result.put("data", whereJson.getString("material_barcode"));
+        RedissonUtils.lock(c->{
+            //1.查询满轴缓存位是否有空位
+            List<BstIvtPackageinfoivt> MzPoints = packageinfoivtService
+                    .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
+                            .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
+                            .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"))
+                            .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空"))
+                            .orderByDesc(BstIvtPackageinfoivt::getSort_seq));
+            if (CollectionUtils.isEmpty(MzPoints)){
+                result.put("message", "满轴位无可用位置");
+                return result;
             }
-        } finally {
-            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
-                lock.unlock();
+            List<BstIvtPackageinfoivt> empPoints = packageinfoivtService
+                    .selectNoTargetTaskPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"));
+            if (CollectionUtils.isEmpty(empPoints)){
+                result.put("message", "空轴位无可用位置");
+                return result;
             }
-        }
-        log.info("二楼到一楼，成品子卷到达一楼输送线接口sendProductToFirstFloor调用成功--------------------------：" + result.toString());
+            // 创建前先判断是否有已创建相同任务
+            List<String> taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"), PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"), PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"), PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"), PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")));
+            List<SchBaseTask> existTaskList1 = taskService.getExistTasks(taskTypes);
+            List<SchBaseTask> existTaskList2 = existTaskList1.stream().filter(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"))||r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))||r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))).collect(Collectors.toList());
+            List<SchBaseTask> existTaskList3 = existTaskList1.stream().filter(r -> StringUtils.isNotBlank(r.getResponse_param())).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(existTaskList2) ||!CollectionUtils.isEmpty(existTaskList3)  ){
+                result.put("message", "存在正在执行的输送线行架任务");
+                return result;
+            }
+            List<BstIvtPackageinfoivt> sortEmpPoint = empPoints.stream().sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq)).collect(Collectors.toList());
+            JSONObject taskParam = new JSONObject();
+            taskParam.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
+            taskParam.put("vehicle_code", whereJson.getString("material_barcode"));
+            taskParam.put("point_code1", whereJson.getString("device_code"));
+            taskParam.put("point_code2", MzPoints.get(0).getPoint_code());
+            taskParam.put("point_code3", sortEmpPoint.get(0).getPoint_code());
+            taskParam.put("point_code4", whereJson.getString("device_code"));
+            taskParam.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"));
+            taskParam.put("is_send", true);
+            mzhcwTask.createTask(taskParam);
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,null,Boolean.TRUE,null,whereJson.getString("material_barcode"));
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+            }
+            result.put("status", HttpStatus.OK.value());
+            result.put("message", "反馈成功!");
+            return result;
+        },"sendProductToFirstFloor",null);
+        log.info("sendProductToFirstFloor调用成功--------------------------：" + result);
         return result;
     }
 
@@ -2187,6 +2171,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"));
             jo.put("is_send", true);
             mzhcwTask.createTask(jo);
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,null,Boolean.TRUE,null,containerName);
+
             //不确定起点的空载具缓存位->输送线任务
             createTask3(containerName);
             result.put("status", HttpStatus.OK.value());
@@ -2230,6 +2216,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"));
             jo.put("is_send", true);
             mzhcwTask.createTask(jo);
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,null,Boolean.TRUE,null,containerName);
+
             result.put("status", HttpStatus.OK.value());
             result.put("message", "反馈成功!");
         } else {
@@ -2275,53 +2263,93 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (ObjectUtil.isEmpty(whereJson.getString("material_barcode"))) {
                         throw new BadRequestException("子卷号不能为空!");
                     }
-                    if (whereJson.getIntValue("weight") <= 0) {
-                        throw new BadRequestException("上报的重量不能为0!");
-                    }
-                    JSONObject jsonObject = ComPareUtil.CompareWhight(whereJson);
-                    if (jsonObject.getBoolean("compaer_result")) {
-                        whereJson.put("bill_type", IOSEnum.IN_TYPE.code("生产入库"));
-                        //"material_barcode":"C1101,","device_code":"RK1018","weight":500.95,"vehicle_code":"B01401","type":"1"
+                    // 5-木箱入库.木箱回库
+                    String materialBarcode = whereJson.getString("material_barcode");
+                    if (materialBarcode.contains("BRMX")){
+                        String brBox = Arrays.asList(materialBarcode.split(",")).get(0);
+                        whereJson.put("box_no", brBox.replace("BR", ""));
+                        inBoxManageService.inBox(whereJson);
+                    }else {
+                        if (whereJson.getIntValue("weight") <= 0) {
+                            throw new BadRequestException("上报的重量不能为0!");
+                        }
+                        List<String> errorMsg = new ArrayList<>();
+                        JSONObject jsonObject = ComPareUtil.CompareWhight(whereJson);
+                        Boolean inbound = jsonObject.getBoolean("inbound");
+                        Boolean compaerResult = jsonObject.getBoolean("compaer_result");
+                        String box_no = jsonObject.getString("box_no");
+                        Integer box_weight = jsonObject.getIntValue("box_weight");
+                        Integer current_weight = jsonObject.getIntValue("current_weight");
+                        List<String> containers = jsonObject.getObject("containers", List.class);
                         int count = taskService.count(new QueryWrapper<SchBaseTask>()
                                 .eq("point_code1", whereJson.getString("device_code"))
-                                .eq("task_type", "010703")
                                 .eq("vehicle_code2", whereJson.getString("vehicle_code"))
                                 .eq("is_delete", "0")
                                 .lt("task_status", TaskStatusEnum.EXECUTING.getCode()));
+                        JSONObject jsonExt = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(jsonExt)) {
+                            errorMsg.add("载具无数据"+whereJson.getString("vehicle_code"));
+                        }else {
+                            String pcsn = jsonExt.getString("pcsn");
+                            if (StringUtils.isNotEmpty(pcsn)){
+                                JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + pcsn + "'").getResultJSONArray(0);
+                                if (stIvtStructattr != null && stIvtStructattr.size() > 0) {
+                                    errorMsg.add("载具"+whereJson.getString("vehicle_code")+"已绑定"+pcsn);
+                                }
+                            }
+                        }
+                        if (!compaerResult){
+                            errorMsg.add("称重"+current_weight+"不匹配"+box_weight);
+                            Param notify = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("weight_notify");
+                            if (notify!=null && StringUtils.isNotEmpty(notify.getValue())){
+                                AutoSendFeiShu.sendFeiShuMsg(notify.getValue(),box_no+"称重"+current_weight+",理论"+box_weight,"二期称重异常提醒");
+                            }
+                        }
+                        if (!inbound){
+                            errorMsg.add("手动至异常口");
+                        }
                         if (count>0){
-                            log.info("acs申请入库任务以存在直接跳过"+whereJson.getString("vehicle_code"));
-                            result.put("status", HttpStatus.OK.value());
-                            result.put("message", "acs申请入库任务以存在直接跳过!");
-                            return result;
+                            errorMsg.add(whereJson.getString("vehicle_code")+"存在任务");
                         }
-                        inBussManageService.inTask(whereJson);
-                    } else {
-                        JSONObject jsonTaskParam = new JSONObject();
-                        //创建异常任务去异常入库口
-                        //入库口
-                        jsonTaskParam.put("point_code1", "RK1018");
-                        //异常位
-                        jsonTaskParam.put("point_code2", "RK1003");
-                        jsonTaskParam.put("vehicle_code", jsonObject.getString("box_no"));
-                        jsonTaskParam.put("vehicle_code2", whereJson.getString("vehicle_code"));
-                        JSONObject request_param = new JSONObject();
-                        if (whereJson.getString("vehicle_code").startsWith("A")) {
-                            request_param.put("containerType", "2");
-                        } else if (whereJson.getString("vehicle_code").startsWith("B")) {
-                            request_param.put("containerType", "1");
+                        //"material_barcode":"C1101,","device_code":"RK1018","weight":500.95,"vehicle_code":"B01401","type":"1"
+                        if (CollectionUtils.isEmpty(errorMsg)) {
+                            whereJson.put("bill_type", IOSEnum.IN_TYPE.code("生产入库"));
+                            inBussManageService.inTask(whereJson);
+                            PdmProductSpecServiceImpl.doRecord(SpecEnum.RK,null,Boolean.TRUE,null,containers);
                         } else {
-                            throw new BadRequestException("托盘号有误，无法找到对应的托盘类型！");
-                        }
-                        // 更新子卷包装关系为生成
-                        JSONObject param = new JSONObject();
-                        param.put("status", IOSEnum.IS_NOTANDYES.code("否"));
-                        WQLObject.getWQLObject("pdm_bi_subpackagerelation")
-                                .update(param,"package_box_sn = '"+jsonObject.getString("box_no")+"'");
+                            iPdmBiContainerinboundService
+                                    .update(new UpdateWrapper<PdmBiContainerinbound>()
+                                            .set("remark",JSONObject.toJSONString(errorMsg))
+                                            .eq("box",box_no));
+                            //更新子卷入库备注信息
+                            JSONObject jsonTaskParam = new JSONObject();
+                            //创建异常任务去异常入库口
+                            //入库口
+                            jsonTaskParam.put("point_code1", "RK1018");
+                            //异常位
+                            jsonTaskParam.put("point_code2", "RK1003");
+                            jsonTaskParam.put("vehicle_code", jsonObject.getString("box_no"));
+                            jsonTaskParam.put("vehicle_code2", whereJson.getString("vehicle_code"));
+                            JSONObject request_param = new JSONObject();
+                            if (whereJson.getString("vehicle_code").startsWith("A")) {
+                                request_param.put("containerType", "2");
+                            } else if (whereJson.getString("vehicle_code").startsWith("B")) {
+                                request_param.put("containerType", "1");
+                            } else {
+                                throw new BadRequestException("托盘号有误，无法找到对应的托盘类型！");
+                            }
+                            // 更新子卷包装关系为生成
+                            JSONObject param = new JSONObject();
+                            param.put("status", IOSEnum.IS_NOTANDYES.code("否"));
+                            WQLObject.getWQLObject("pdm_bi_subpackagerelation")
+                                    .update(param,"package_box_sn = '"+jsonObject.getString("box_no")+"'");
 
-                        jsonTaskParam.put("request_param", request_param);
-                        TwoExceptionInTask bean = SpringContextHolder.getBean(TwoExceptionInTask.class);
-                        bean.createTask(jsonTaskParam);
-                        bean.immediateNotifyAcs(null);
+                            jsonTaskParam.put("request_param", request_param);
+                            TwoExceptionInTask bean = SpringContextHolder.getBean(TwoExceptionInTask.class);
+                            bean.createTask(jsonTaskParam);
+                            bean.immediateNotifyAcs(null);
+                            PdmProductSpecServiceImpl.doRecord(SpecEnum.TYCK,null,Boolean.FALSE,errorMsg.toString(),containers);
+                         }
                     }
 
                 } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) {
@@ -2352,10 +2380,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     whereJson.put("box_no", whereJson.getString("material_barcode"));
                     inBoxManageService.inBox(whereJson);
                 } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("退货入库"))) {
-                    WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo");
-                    // 载具扩展属性表
-                    WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
-                    // 6-退货入库
                     String materialBarcode = whereJson.getString("material_barcode");
                     if(StrUtil.isEmpty(materialBarcode)){
                         throw new BadRequestException("当前木箱号不能为空！");
@@ -2365,47 +2389,72 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         // 处理分割结果不足的情况
                         throw new BadRequestException("当前木箱号数据异常！"+box_arr.toString());
                     }
-                    //获取当前的入库类型
-                    whereJson.put("bill_type", "000" + box_arr[1]);
-                    whereJson.put("box_no", box_arr[0]);
-                    JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("box_no") + "' AND status in ('0','1','99')").getResultJSONArray(0);
-                    if (ObjectUtil.isEmpty(resultJSONArray)) {
-                        throw new BadRequestException("未查询到子卷包装信息!");
-                    }
-                    String material_barcode = "";
-                    for (int i = 0; i < resultJSONArray.size(); i++) {
-                        JSONObject resultObj = resultJSONArray.getJSONObject(i);
-                        if (i == 0) {
-                            material_barcode = resultObj.getString("container_name");
-                        } else {
-                            material_barcode += "," + resultObj.getString("container_name");
+                    if (box_arr[1].equals("9")){
+                        //空木箱入库
+                        // -{"material_barcode":"MX250324000091-1","device_code":"CK2005","vehicle_code":"B00165","type":"6"}
+                        whereJson.put("box_no", box_arr[0]);
+                        inBoxManageService.inBox(whereJson);
+                    }else {
+                        //退货入库
+                        WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo");
+                        // 载具扩展属性表
+                        WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
+                        //获取当前的入库类型
+                        whereJson.put("bill_type", "000" + box_arr[1]);
+                        whereJson.put("box_no", box_arr[0]);
+                        JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("box_no") + "' AND status in ('0','1','99')").getResultJSONArray(0);
+                        if (ObjectUtil.isEmpty(resultJSONArray)) {
+                            throw new BadRequestException("未查询到子卷包装信息!");
+                        }
+                        String material_barcode = "";
+                        for (int i = 0; i < resultJSONArray.size(); i++) {
+                            JSONObject resultObj = resultJSONArray.getJSONObject(i);
+                            if (i == 0) {
+                                material_barcode = resultObj.getString("container_name");
+                            } else {
+                                material_barcode += "," + resultObj.getString("container_name");
+                            }
                         }
-                    }
 
-                    JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'")
-                            .uniqueResult(0);
-                    if (ObjectUtil.isEmpty(jsonVehicle)) {
-                        throw new BadRequestException("载具不存在!");
+                        JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'")
+                                .uniqueResult(0);
+                        if (ObjectUtil.isEmpty(jsonVehicle)) {
+                            throw new BadRequestException("载具不存在!");
+                        }
+                        int hasTask = taskService.count(new QueryWrapper<SchBaseTask>()
+                                .eq("is_delete", "0")
+                                .eq("vehicle_code2", whereJson.getString("vehicle_code"))
+                                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                        if (hasTask>0){
+                            throw new BadRequestException("托盘"+whereJson.getString("vehicle_code")+"存在执行的任务");
+                        }
+                        JSONObject ext_jo = veExtTab.query("storagevehicle_code = '" + jsonVehicle.getString("storagevehicle_code") + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(ext_jo)) {
+                            JSONObject jsonVeExt = new JSONObject();
+                            jsonVeExt.put("storagevehicleext_id", org.nl.common.utils.IdUtil.getLongId());
+                            jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id"));
+                            jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code"));
+                            jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type"));
+                            jsonVeExt.put("pcsn", whereJson.getString("box_no"));
+                            jsonVeExt.put("device_uuid", org.nl.common.utils.IdUtil.getLongId());
+                            jsonVeExt.put("update_time", DateUtil.now());
+                            veExtTab.insert(jsonVeExt);
+                        } else {
+                            String pcsn = ext_jo.getString("pcsn");
+                            if (StringUtils.isNotEmpty(pcsn)){
+                                JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + pcsn + "'").getResultJSONArray(0);
+                                if (stIvtStructattr != null && stIvtStructattr.size() > 0) {
+                                    throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经绑定木箱"+pcsn);
+                                }
+                            }
+                            ext_jo.put("pcsn", whereJson.getString("box_no"));
+                            ext_jo.put("device_uuid", org.nl.common.utils.IdUtil.getLongId());
+                            ext_jo.put("update_time", DateUtil.now());
+                            veExtTab.update(ext_jo);
+                        }
+                        whereJson.put("material_barcode", material_barcode);
+                        inBussManageService.inTask(whereJson);
                     }
-                    JSONObject ext_jo = veExtTab.query("storagevehicle_code = '" + jsonVehicle.getString("storagevehicle_code") + "'").uniqueResult(0);
-                    if (ObjectUtil.isEmpty(ext_jo)) {
-                        JSONObject jsonVeExt = new JSONObject();
-                        jsonVeExt.put("storagevehicleext_id", org.nl.common.utils.IdUtil.getLongId());
-                        jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id"));
-                        jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code"));
-                        jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type"));
-                        jsonVeExt.put("pcsn", whereJson.getString("box_no"));
-                        jsonVeExt.put("device_uuid", org.nl.common.utils.IdUtil.getLongId());
-                        jsonVeExt.put("update_time", DateUtil.now());
-                        veExtTab.insert(jsonVeExt);
-                    } else {
-                        ext_jo.put("pcsn", whereJson.getString("box_no"));
-                        ext_jo.put("device_uuid", org.nl.common.utils.IdUtil.getLongId());
-                        ext_jo.put("update_time", DateUtil.now());
-                        veExtTab.update(ext_jo);
-                    }
-                    whereJson.put("material_barcode", material_barcode);
-                    inBussManageService.inTask(whereJson);
                 }
                 result.put("status", HttpStatus.OK.value());
                 result.put("message", "下发成功!");
@@ -2505,7 +2554,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     }
 
     @Override
-    @Transactional
     @SneakyThrows
     public JSONObject deviceApplyExceptional(JSONObject whereJson) {
         log.info("deviceApplyExceptional请求参数：---------------------------------------------" + whereJson.toString());
@@ -2528,40 +2576,40 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 // 判断任务类型
                 if (taskDao.getTask_type().equals(TASKEnum.BOX_TYPE.code("木箱入库"))) {
                     // 木箱入库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = inBoxManageService.taskExceptional(whereJson);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.BOX_TYPE.code("木箱出库"))) {
                     // 木箱出库：空出、浅货位有货-取货时
-                    if (type.equals("2")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         point_code = outBoxManageService.taskExceptional(whereJson);
                     }
-                    if (type.equals("3")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)"))) {
                         String task_id = outBoxManageService.taskExceptionalOut(whereJson);
                         result.put("task_id", task_id);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘入库"))) {
                     // 托盘入库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = inVehicleManageService.taskExceptional(whereJson);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘出库"))) {
                     // 托盘出库：空出、浅货位有货-取货时
-                    if (type.equals("2")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         point_code = outVehicleManageService.taskExceptional(whereJson);
                     }
-                    if (type.equals("3")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)"))) {
                         String task_id = outVehicleManageService.taskExceptionalOut(whereJson);
                         result.put("task_id", task_id);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品入库"))) {
                     // 成品入库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = inBussManageService.taskExceptional(whereJson);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品出库"))) {
                     // 成品出库：空出
-                    if (type.equals("2")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         taskDao.setRemark("【空出】请检查货位库存!");
                         taskDao.setCar_no("【空出】请检查货位库存!");
                         taskService.updateById(taskDao);
@@ -2572,11 +2620,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         log.info("deviceApplyExceptional返回参数：---------------------------------------------" + result.toString());
                         return result;
                     }
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)"))) {
+                        // 浅货位阻挡-取货时
+                        String task_id = iStIvtIostorinvOutService.taskExceptionalOut(whereJson);
+                        result.put("task_id", task_id);
+                    }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("立库转库"))) {
                     // 立库转库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = outBussManageService.taskExceptional(whereJson);
-                    } else if (type.equals("2")) {
+                    } else if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         // 立库转库空出
                         taskDao.setRemark("【空出】请检查货位库存!");
                         taskDao.setCar_no("【空出】请检查货位库存!");
@@ -2590,7 +2643,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     }
                 }
 
-                if (!type.equals("3") && ObjectUtil.isEmpty(point_code)) {
+                if (!type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)")) && ObjectUtil.isEmpty(point_code)) {
                     throw new BadRequestException("立库异常任务处理失败，仓位为空!");
                 }
 
@@ -2689,13 +2742,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public JSONObject feedbackSubVolumeWeightApply(JSONObject param) {
+        log.info("ACS反馈子卷重量：{}", param);
         JSONObject res = new JSONObject();
         String subVolume = param.getString("sub_volume");
         String weight = param.getString("weight1");
+//        PdmBiSlittingproductionplan containerName = slittingproductionplanService.getByContainerName(subVolume);
+//        if (ObjectUtil.isEmpty(containerName)) {
+//            throw new BadRequestException("子卷号[" + subVolume + "]对应的分切计划不存在!");
+//        }
+//        if (ObjectUtil.isNotEmpty(containerName.getWeight())) {
+//            throw new BadRequestException("子卷号[" + subVolume + "]不允许重复更新重量!");
+//        }
         LambdaUpdateWrapper<PdmBiSlittingproductionplan> updateWrapper = new UpdateWrapper<PdmBiSlittingproductionplan>().lambda();
         updateWrapper.set(PdmBiSlittingproductionplan::getWeight, NumberUtil.round(weight, 2).toString())
                 .eq(PdmBiSlittingproductionplan::getContainer_name, subVolume);
         boolean update = slittingproductionplanService.update(updateWrapper);
+        PdmProductSpecServiceImpl.doRecord(SpecEnum.FQ_WG,param,Boolean.TRUE,null,subVolume);
         if (update) {
             res.put("code", cn.hutool.http.HttpStatus.HTTP_OK);
             res.put("message", "更新成功!");
@@ -2711,11 +2773,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return param;
     }
 
-    public static void main(String[] args) {
-        String material_barcode = "123123-1";
-        String split = material_barcode.split("-")[0];
-        System.out.println(split);
-    }
     @Override
     public JSONObject getBoxInfo(JSONObject param) {
         String material_barcode = param.getString("material_barcode");
@@ -2990,4 +3047,111 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         log.info("forceMove返回参数：---------------------------------------------{}", result.toString());
         return result;
     }
+
+    @Override
+    public JSONObject acsRequestPoint(JSONObject param) {
+        log.info("acsRequestPoint输入参数为--------------------------：" + param.toString());
+        JSONObject result = new JSONObject();
+        // task_code、type
+        String type = param.getString("type");
+        String taskCode = param.getString("task_code");
+        SchBaseTask task = taskService.getOne(new LambdaQueryWrapper<SchBaseTask>()
+                .eq(SchBaseTask::getTask_code, taskCode)
+                .eq(SchBaseTask::getIs_delete, "0"));
+        if (ObjectUtil.isEmpty(task)) {
+            throw new BadRequestException("任务号【" + taskCode + "】对应的任务找不到！");
+        }
+        String targetPoint = "";
+        boolean updateFlag = false;
+        if ("1".equals(type)) {
+            if (task.getPoint_code1().contains("QHD")) {
+                // 请求取货
+                String deviceCode = task.getPoint_code2();
+                BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
+                JSONObject requestParam = JSONObject.parseObject(task.getRequest_param());
+                String qzzSize = requestParam.getString("qzz_size");
+                // 获取气涨轴缓存没有任务的点位
+                List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCache(qzzSize,
+                        startPoint.getQzz_generation(), startPoint.getPoint_location());
+                if (shafttubeivts.size() == 0) {
+                    throw new BadRequestException("未找到气涨轴规格「" + qzzSize + "」的暂存位");
+                }
+                BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
+                targetPoint = shafttubeivt.getPoint_code();
+                // 修改任务
+                task.setPoint_code1(targetPoint);
+                task.setRemark("取货请求成功");
+                task.setUpdate_time(DateUtil.now());
+                updateFlag = true;
+            } else {
+                targetPoint = task.getPoint_code1();
+            }
+        }
+        if ("2".equals(type)) {
+            if (task.getPoint_code2().contains("FHD")) {
+                // 请求放货
+                // 穿拔轴点位
+                String deviceCode = task.getPoint_code1();
+                BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
+                JSONObject requestParam = JSONObject.parseObject(task.getRequest_param());
+                String qzzSize = requestParam.getString("qzz_size");
+                // 临时存放气涨轴尺寸
+                startPoint.setQzz_size(qzzSize);
+                // 获取空位
+                List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskShaftCacheEmpty(startPoint);
+                if (shafttubeivts.size() == 0) {
+                    throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
+                }
+                BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
+                targetPoint = shafttubeivt.getPoint_code();
+                // 修改任务
+                task.setPoint_code2(targetPoint);
+                task.setRemark("放货请求成功");
+                task.setUpdate_time(DateUtil.now());
+                updateFlag = true;
+            } else {
+                targetPoint = task.getPoint_code2();
+            }
+        }
+        if ("3".equals(type)) {
+            if (task.getPoint_code2().contains("FHD")) {
+                // 请求放货
+                // 穿拔轴点位
+                String deviceCode = task.getPoint_code1();
+                BstIvtShafttubeivt startPoint = shafttubeivtService.getByPointCode(deviceCode, false);
+                JSONObject requestParam = JSONObject.parseObject(task.getRequest_param());
+                String qzzSize = requestParam.getString("qzz_size");
+                if (ObjectUtil.isEmpty(qzzSize)) {
+                    throw new BadRequestException("气涨轴规格不能为空！");
+                }
+                String qzz= qzzSize.substring(qzzSize.length() - 3);
+                String[] split = qzz.split("-");
+                String size = split[0];
+                String qzz_generation = split[1];
+
+                // 获取空位
+                List<BstIvtShafttubeivt> shafttubeivts = shafttubeivtService.getNotTaskEmptyShaftCache(size, qzz_generation,"0");
+                if (shafttubeivts.size() == 0) {
+                    throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
+                }
+                BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
+                targetPoint = shafttubeivt.getPoint_code();
+                // 修改任务
+                task.setPoint_code2(targetPoint);
+                task.setRemark("放货请求成功");
+                task.setUpdate_time(DateUtil.now());
+                updateFlag = true;
+            } else {
+                targetPoint = task.getPoint_code2();
+            }
+        }
+        if (updateFlag) {
+            taskService.updateById(task);
+        }
+        result.put("status", HttpStatus.OK.value());
+        result.put("device_code", targetPoint);
+        result.put("message", "反馈成功!");
+        log.info("acsRequestPoint输出参数为--------------------------：" + result.toString());
+        return result;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
index 682d61d52..a0314833f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
@@ -15,9 +15,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.nl.b_lms.pdm.info.dao.PdmBiContainerinfo;
 import org.nl.b_lms.pdm.info.service.IPdmBiContainerinfoService;
+import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
+import org.nl.common.enums.SpecEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -28,6 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * LMS系统为客户端，MES为服务端
  */
@@ -948,7 +954,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
         param.put("QuanlityInBox", num);
         param.put("BoxWeight", box_weight);
         param.put("ContainerList", rows);
-
+        List<String> list = new ArrayList<>();
         try {
             String resultMsg = HttpRequest.post(url)
                     .body(String.valueOf(param))
@@ -957,6 +963,11 @@ public class LmsToMesServiceImpl implements LmsToMesService {
             result = JSONObject.parseObject(resultMsg);
             IpdmBiSubpackagerelationService subpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class);
             JSONArray array = result.getJSONArray("RTDAT");
+            for (int i = 0; i < rows.size(); i++) {
+                JSONObject item = rows.getJSONObject(i);
+                String containerName = item.getString("ContainerName");
+                list.add(containerName);
+            }
             if (ObjectUtil.isNotEmpty(array)) {
                 for (int i = 0; i < array.size(); i++) {
                     JSONObject row = array.getJSONObject(i);
@@ -966,15 +977,13 @@ public class LmsToMesServiceImpl implements LmsToMesService {
                 }
             }
             log.info("momBoxPackageSubmit接口输出参数为：-------------------" + result.toString());
-
-
             String RTYPE = result.getString("RTYPE");
             if ("E".equals(RTYPE)) {
                 throw new BadRequestException(result.getString("RTMSG"));
             }
-
-
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.TRUE,null,list);
         } catch (Exception e) {
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.FALSE,e.getMessage(),list);
             throw new BadRequestException("MES提示错误：" + e.getMessage());
         }
         return result;
@@ -988,6 +997,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
 
         String box_no = param.getString("box_no");
         String box_weight = param.getString("box_weight");
+        List containerName = param.getObject("container_name", List.class);
 
         if (StrUtil.isEmpty(box_no)) {
             throw new BadRequestException("木箱号不能为空！");
@@ -1017,14 +1027,23 @@ public class LmsToMesServiceImpl implements LmsToMesService {
         row1.put("DataValue","true");
         row1.put("DataCollectionDefId","001c61800000004f");
         row1.put("DataCollectionDefName","PACKAGE");
-        row1.put("DataCollectionDefName","PACKAGE");
-        rows.add(row1);
-        row1.put("DataPointName","信息核对准确");
-        rows.add(row1);
-        row1.put("DataPointName","木箱是否防护");
         rows.add(row1);
+        JSONObject row2 = new JSONObject();
+        row2.put("DataPointName","信息核对准确");
+        row2.put("DataType","7");
+        row2.put("DataValue","true");
+        row2.put("DataCollectionDefId","001c61800000004f");
+        row2.put("DataCollectionDefName","PACKAGE");
+        rows.add(row2);
+        JSONObject row3 = new JSONObject();
+        row3.put("DataPointName","木箱是否防护");
+        row3.put("DataType","7");
+        row3.put("DataValue","true");
+        row3.put("DataCollectionDefId","001c61800000004f");
+        row3.put("DataCollectionDefName","PACKAGE");
+        rows.add(row3);
         param.put("DataPoints", rows);
-
+        log.info("BoxDataCollectionSubmit2接口请求参数为：-------------------" + param.toString());
         try {
             String resultMsg = HttpRequest.post(url)
                     .body(String.valueOf(param))
@@ -1035,11 +1054,13 @@ public class LmsToMesServiceImpl implements LmsToMesService {
 
             String RTYPE = result.getString("RTYPE");
             if ("E".equals(RTYPE)) {
-                throw new BadRequestException(result.getString("RTMSG"));
+                throw new BadRequestException("MES提示错误：" +result.getString("RTMSG"));
             }
         } catch (Exception e) {
-            throw new BadRequestException("MES提示错误：" + e.getMessage());
+            PdmProductSpecServiceImpl.doRecord(SpecEnum.YX_MES,param,Boolean.FALSE,e.getMessage(),containerName);
+            throw new BadRequestException("MES错误：" + e.getMessage());
         }
+        PdmProductSpecServiceImpl.doRecord(SpecEnum.YX_MES,param,Boolean.TRUE,null,containerName);
         return result;
     }
 
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 5f30db8cc..ebc038baa 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
@@ -1714,7 +1714,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             if (ObjectUtil.isEmpty(Type)) {
                 throw new BadRequestException("传入的类型不能为空！");
             }
-
+            //表处设备表
             JSONObject device_jo = WQLObject.getWQLObject("st_ivt_stpointivt").query("ext_code = '" + ResourceName + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(device_jo)) {
                 throw new BadRequestException("未查询到[" + ResourceName + "]应的表处机设备！");
@@ -1742,10 +1742,14 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     form.put("acs_task_type", "3");
                 } else {
                     //取满取空放满放空
+                    //满轴
                     form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
+                    //放满
                     form.put("point_code2", device_jo.getString("up_point_code") + "_M");
+                    //取空
                     form.put("point_code3", device_jo.getString("up_point_code") + "_K");
                     //判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位
+                    //01没有空轴
                     if (jsonCoolIvt.getString("empty_point_status").equals("01")) {
                         form.put("point_code4", jsonCoolIvt.getString("empty_point_code"));
                     } else {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java
index dd2fa72cb..55ff4175d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java
@@ -4,8 +4,12 @@ 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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
+import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.common.utils.MapOf;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -16,8 +20,13 @@ import org.nl.wms.sch.manage.AutoQueryProudDayData;
 import org.nl.wms.sch.tasks.URLEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -26,6 +35,8 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService {
 
     @Autowired
     private final WmsToAcsService wmsToAcsService;
+    @Autowired
+    private IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService;
 
     @Override
     public JSONObject getDeviceInfo(JSONObject jo) {
@@ -59,50 +70,52 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService {
 
     @Override
     public JSONArray getStructInfo(JSONObject jo) {
-        JSONArray rows = WQLObject.getWQLObject("st_ivt_structattr").query("sect_code IN ('ZC01','KTP01','ZZ01','PD01')").getResultJSONArray(0);
+        List<JSONObject> rows = ipdmBiSubpackagerelationService.getStructInfoBySZLS();
         JSONArray data = new JSONArray();
+        List<String> boxs = new ArrayList<>();
+        for (JSONObject row : rows) {
+            String box = row.getString("storagevehicle_code");
+            if (!StringUtils.isEmpty(box) && box.contains("MX")){
+                boxs.add(box);
+            }
+        }
+        List<PdmBiSubpackagerelation> list = ipdmBiSubpackagerelationService.list(new QueryWrapper<PdmBiSubpackagerelation>()
+                .in("package_box_sn", boxs)
+                .select("package_box_sn","container_name","product_description", "sale_order_name", "quanlity_in_box","box_weight", "net_weight"));
+        Map<String, List<PdmBiSubpackagerelation>> collect = list.stream().filter(a->StringUtils.isNotEmpty(a.getPackage_box_sn())).collect(Collectors.groupingBy(item -> item.getPackage_box_sn()));
         for (int i = 0; i < rows.size(); i++) {
-            JSONObject row = rows.getJSONObject(i);
-            JSONObject json = new JSONObject();
-            String struct_code = row.getString("struct_code");
-            json.put("struct_code", struct_code);
-            json.put("struct_status", "0");
-            String storagevehicle_code = row.getString("storagevehicle_code");
-            if (StrUtil.isNotEmpty(storagevehicle_code)) {
-                json.put("storagevehicle_code", storagevehicle_code);
-                if (storagevehicle_code.startsWith("KTP")) {
-                    json.put("struct_status", "1");
-                }
-                String struct_id = row.getString("struct_id");
-                JSONArray array = WQL
-                        .getWO("QST_STRUCTATTR")
-                        .addParamMap(MapOf.of("struct_id", struct_id, "flag", "1"))
-                        .process()
-                        .getResultJSONArray(0);
-                // 计算合计
-                JSONObject object = array.getJSONObject(0);
-                if (ObjectUtil.isNotEmpty(object.getString("net_weight"))) {
-                    BigDecimal container_weight = array.stream().map(info -> ((JSONObject) info).getBigDecimal("net_weight")).reduce(BigDecimal.ZERO, BigDecimal::add);
-                    json.put("container_weight", container_weight);
-                    json.put("product_description", object.getString("product_description"));
-                    json.put("sale_order_name", object.getString("sale_order_name"));
-                    json.put("quanlity_in_box", object.getString("quanlity_in_box"));
-                    json.put("box_weight", object.getString("box_weight"));
-                    json.put("struct_status", "2");
-                    JSONArray detail = new JSONArray();
-                    for (int j = 0; j < array.size(); j++) {
-                        JSONObject dtl = array.getJSONObject(j);
-                        String container_name = dtl.getString("container_name");
-                        String net_weight = dtl.getString("net_weight");
-                        JSONObject jsonObject = new JSONObject();
-                        jsonObject.put("container_name", container_name);
-                        jsonObject.put("net_weight", net_weight);
-                        detail.add(jsonObject);
+            JSONObject row = rows.get(i);
+            JSONObject item = new JSONObject();
+            item.put("struct_code", row.getString("struct_code"));
+            item.put("struct_status", "0");
+            String box = row.getString("storagevehicle_code");
+            if (!StringUtils.isEmpty(box)){
+                item.put("storagevehicle_code", box);
+                if (box.startsWith("KTP")) {
+                    item.put("struct_status", "1");
+                }else {
+                    List<PdmBiSubpackagerelation> subs = collect.get(box);
+                    if (!CollectionUtils.isEmpty(subs) && StringUtils.isNotEmpty(subs.get(0).getNet_weight())){
+                        BigDecimal container_weight = subs.stream().map(info -> new BigDecimal(info.getNet_weight()))
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        item.put("container_weight", container_weight);
+                        item.put("product_description", subs.get(0).getProduct_description());
+                        item.put("sale_order_name", subs.get(0).getSale_order_name());
+                        item.put("quanlity_in_box", subs.get(0).getQuanlity_in_box().toString());
+                        item.put("box_weight", subs.get(0).getBox_weight());
+                        item.put("struct_status", "2");
+                        JSONArray detail = new JSONArray();
+                        for (PdmBiSubpackagerelation dtl : subs) {
+                            JSONObject jsonObject = new JSONObject();
+                            jsonObject.put("container_name", dtl.getContainer_name());
+                            jsonObject.put("net_weight", dtl.getNet_weight().toString());
+                            detail.add(jsonObject);
+                        }
+                        item.put("detail", detail);
                     }
-                    json.put("detail", detail);
                 }
             }
-            data.add(json);
+            data.add(item);
         }
         return data;
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
index 50365855b..7ee477412 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -139,6 +139,7 @@ public class BakingServiceImpl implements BakingService {
                 jsonMap.put("point_location", jsonPointZc.getString("point_location"));
                 JSONArray hot_rows = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().getResultJSONArray(0);
                 JSONObject jsonHotIvt = new JSONObject();
+                log.debug("获取温度幅度hot_rows:"+hot_rows);
                 for (int i = 0; i < hot_rows.size(); i++) {
                     JSONObject hot_row = hot_rows.getJSONObject(i);
                     String point_code = hot_row.getString("point_code");
@@ -150,6 +151,7 @@ public class BakingServiceImpl implements BakingService {
                     if (ObjectUtil.isNotEmpty(point_temperature)) {
                         if (point_temperature.equals(temperature)) {
                             jsonHotIvt = hot_row;
+                            log.debug("获取满足温度幅度jsonHotIvt:"+jsonHotIvt);
                             break;
                         }
                     }
@@ -560,7 +562,7 @@ public class BakingServiceImpl implements BakingService {
 
     public JSONObject getJsonObject(String product_area, JSONObject point_code2_jo, String temperature) {
         if (ObjectUtil.isEmpty(point_code2_jo)) {
-            throw new BadRequestException("暂无满足条件的烘箱位置!");
+            throw new BadRequestException("烘箱对接没有可用位置!");
         }
         JSONObject jsonMap = new JSONObject();
         jsonMap.put("flag", "1");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
index e38436f12..26e118d65 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
@@ -265,7 +265,7 @@ public class FeedingServiceImpl implements FeedingService {
     public JSONObject handleConfirm(JSONObject form) {
         String point_code = form.getString("point_code");
         String next_point_code = form.getString("next_point_code");
-
+        String container_name = form.getString("container_name");
         if (StrUtil.isEmpty(point_code)) {
             throw new BadRequestException("输入的起点不能为空！");
         }
@@ -288,6 +288,57 @@ public class FeedingServiceImpl implements FeedingService {
         if (!StrUtil.equals(cool_jo.getString("full_point_status"), "02")) {
             throw new BadRequestException("该点位上不存在母卷！");
         }
+        if (!StrUtil.equals(cool_jo.getString("container_name"), container_name)) {
+            throw new BadRequestException("该点位:"+point_code+"不存在母卷:"+container_name);
+        }
+        JSONObject result = new JSONObject();
+        result.put("message", "操作成功!");
+        //B1烘箱外边的冷却点
+        if (cool_jo.getString("product_area").equals("B1") && cool_jo.getString("point_type").equals("1")) {
+            JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + next_point_code + "' and product_area='"+cool_jo.getString("product_area")+"'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(cut_jo)) {
+                cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + next_point_code + "' and product_area='"+cool_jo.getString("product_area")+"' and point_type in ('1','6')").uniqueResult(0);
+            }
+            if (ObjectUtil.isEmpty(cut_jo)) {
+                throw new BadRequestException("请扫描B1车间分切机满轴点位、分切缓存位满轴点位、生箔冷却缓存位满轴点位做为终点！");
+            }
+            //创建AGV任务
+            JSONObject jo = new JSONObject();
+            if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) {
+                jo.put("point_code1", cool_jo.getString("full_point_code"));
+                jo.put("point_code2", cut_jo.getString("full_point_code"));
+                jo.put("material_code",cool_jo.getString("container_name"));
+                jo.put("product_area", cut_jo.getString("product_area"));
+                jo.put("task_type", "010302");
+            } else {
+                jo.put("point_code1", cool_jo.getString("full_point_code"));
+                jo.put("point_code2", cut_jo.getString("full_point_code"));
+                jo.put("point_code3", cut_jo.getString("empty_point_code"));
+                // 2.找冷却区空货位
+                JSONObject map = new JSONObject();
+                map.put("flag", "2");
+                map.put("product_area", cut_jo.getString("product_area"));
+                map.put("point_location", "0");
+
+                JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
+                // 如果为空
+                if (ObjectUtil.isEmpty(jsonCooIvt)) {
+                    map.put("point_location", "1");
+                    jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
+                }
+                if (ObjectUtil.isEmpty(jsonCooIvt)) {
+                    throw new BadRequestException("B1车间冷却区空位不足");
+                }
+                jo.put("point_code4", jsonCooIvt.getString("empty_point_code"));
+                jo.put("material_code", cool_jo.getString("container_name"));
+                jo.put("product_area", cut_jo.getString("product_area"));
+                jo.put("task_type", "010301");
+            }
+            AbstractAcsTask task = new CoolCutTask();
+            task.createTask(jo);
+
+            return result;
+        }
 
         if (cool_jo.getString("product_area").equals("B1") && cool_jo.getString("point_type").equals("3")) {
             if (ObjectUtil.isNotEmpty(cool_jo) && cool_jo.getString("point_type").equals("4")) {
@@ -384,7 +435,8 @@ public class FeedingServiceImpl implements FeedingService {
                 OutHotTask outHotTask = new OutHotTask();
                 String task_id = outHotTask.createTask(task_jo);
             }
-        } else {
+        }
+        else {
             JSONObject jo = new JSONObject();
             //查询该分切机对应的点位
             JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + next_point_code + "'").uniqueResult(0);
@@ -467,7 +519,6 @@ public class FeedingServiceImpl implements FeedingService {
             WQLObject.getWQLObject("ST_IVT_CoolRegionIO").insert(jsonCool);
         }
 
-        JSONObject result = new JSONObject();
         result.put("message", "操作成功!");
         return result;
     }
@@ -522,8 +573,17 @@ public class FeedingServiceImpl implements FeedingService {
         if (type.equals("2")) {
             //查询对应的分切点位是否存在
             JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
-            if (ObjectUtil.isEmpty(cut_jo)) {
-                throw new BadRequestException("请输入或者扫码分切区域的满轴点位！");
+
+            //B1支持从分切上料暂存架送回母卷
+            if(point_code.contains("B1_FQZC")){
+                cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(cut_jo)) {
+                    throw new BadRequestException("请输入或者扫码分切区域的满轴点位！");
+                }
+            }else{
+                if (ObjectUtil.isEmpty(cut_jo)) {
+                    throw new BadRequestException("请输入或者扫码分切区域的满轴点位！");
+                }
             }
             if (StrUtil.equals("01", cut_jo.getString("full_point_status"))) {
                 throw new BadRequestException("该点位库存状态不存在满轴！");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
index 19c41e750..27bb52e8b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
@@ -175,7 +175,7 @@ public class RawFoilServiceImpl implements RawFoilService {
         if (jsonSb.getString("product_area").equals("B1")) {
             // 2.根据就近原则查对应空卷轴
             JSONObject map = new JSONObject();
-            map.put("flag", "6");
+            map.put("flag", "601");
             map.put("product_area", jsonSb.getString("product_area"));
             map.put("point_location", jsonSb.getString("point_location"));
             // 查找冷却区空轴位状态是空轴的点位
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
index 97223b505..b0740b142 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
@@ -305,7 +305,7 @@ IF 输入.flag = "6"
             FROM
             	ST_IVT_CoolPointIvt ivt
             WHERE
-                ivt.empty_point_status = '02'
+                ivt.empty_point_status = '01'
             AND
                 ivt.is_used = '1'
             AND NOT EXISTS (
@@ -333,3 +333,39 @@ IF 输入.flag = "6"
 		ENDQUERY
 	ENDIF
 
+	IF 输入.flag = "601"
+    		QUERY
+    			SELECT
+                	ivt.*
+                FROM
+                	ST_IVT_CoolPointIvt ivt
+                WHERE
+                    ivt.empty_point_status = '02'
+                AND ivt.point_type = '1'
+                AND
+                    ivt.is_used = '1'
+                AND NOT EXISTS (
+                       SELECT
+                          *
+                       FROM
+                          sch_base_task
+                       WHERE
+                          ( point_code1 = ivt.empty_point_code OR point_code4 = ivt.empty_point_code )
+                          AND task_status < '07'
+                       AND is_delete = '0'
+                    )
+
+                    OPTION 输入.product_area <> ""
+                        ivt.product_area = 输入.product_area
+                    ENDOPTION
+
+                    OPTION 输入.point_location <> ""
+                        ivt.point_location = 输入.point_location
+                    ENDOPTION
+
+                    order by ivt.point_code ASC
+
+    			ENDSELECT
+    		ENDQUERY
+    	ENDIF
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java
index 79d34451c..8441eaddd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java
@@ -33,6 +33,16 @@ public interface PrintService {
      */
     JSONObject customerPrint2(JSONObject whereJson);
 
+
+
+    /**
+     * 二期贴标数据组织
+     *
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject customerPrintBY2(JSONObject whereJson);
+
     /**
      * 获取单据类型
      *
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 37b0ea539..3a815afca 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
@@ -1,6 +1,7 @@
 package org.nl.wms.pda.st.service.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -319,6 +320,147 @@ public class PrintServiceImpl implements PrintService {
         return jo;
     }
 
+    @Override
+    public JSONObject customerPrintBY2(JSONObject whereJson) {
+        JSONObject jo = new JSONObject();
+        WQLObject printTab = WQLObject.getWQLObject("pdm_bi_printinfo");
+        WQLObject custTab = WQLObject.getWQLObject("md_cs_customerbase");
+        WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
+
+        String box_no = whereJson.getString("box_no");
+
+        JSONObject box_jo = subTab.query("package_box_sn = '" + box_no + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(box_jo)) {
+            throw new BadRequestException("未查询到木箱相关信息！");
+        }
+        //组织木箱打印信息
+        //箱号
+        String package_box_sn = box_jo.getString("package_box_sn");
+
+        String package_box_sn1 = "";
+        String package_box_sn2 = "";
+        try {
+            // 木箱1
+            package_box_sn1 = package_box_sn.substring(0, package_box_sn.indexOf("@") + 1);
+            // 木箱2
+            package_box_sn2 = package_box_sn.substring(package_box_sn.indexOf("@") + 1, package_box_sn.length());
+        } catch (Exception e) {
+            package_box_sn2 = package_box_sn;
+        }
+        //订单号
+        String sale_order_name = box_jo.getString("sale_order_name");
+        //品名
+        String product_description = box_jo.getString("product_description");
+        //物料号
+        String product_name = box_jo.getString("product_name");
+        //规格: 厚度*幅宽
+        String width = box_jo.getString("thickness_request") + "*" + box_jo.getString("width_standard");
+
+        //入库日期:取此箱子中最晚的入库日期
+        JSONObject jsonInbound = subTab.query("package_box_sn = '" + box_no + "' order by date_of_fg_inbound DESC").uniqueResult(0);
+        String date_of_FG_inbound = jsonInbound.getString("date_of_fg_inbound");
+
+        String box_weight = NumberUtil.round(box_jo.getString("box_weight"), 2).toString();
+        //生产日期：取此箱子中最晚的生产日期
+        JSONObject jsonProduction = subTab.query("package_box_sn = '" + box_no + "' order by date_of_production DESC").uniqueResult(0);
+        String date_of_production = jsonProduction.getString("date_of_production");
+        //批号
+        String pcsn = jsonProduction.getString("date_of_production");
+        if (ObjectUtil.isNotEmpty(pcsn)) {
+            pcsn = pcsn.replaceAll("[[\\s-:punct:]]", "");
+        }
+        //卷数
+        String quanlity_in_box = box_jo.getString("quanlity_in_box");
+        //保质期
+        String quality_guaran_period = box_jo.getString("quality_guaran_period");
+        //检验员
+        String nspector = "1";
+        //储存条件
+        String storage_conditions = "";
+
+        // 根据客户条件选择对应模板
+        JSONObject jsonCust = custTab.query("cust_code = '" + box_jo.getString("customer_name") + "' and is_delete = '0' and is_used = '1'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonCust)) {
+            throw new BadRequestException("客户不存在或未启用");
+        }
+
+        if (ObjectUtil.isEmpty(jsonCust.getString("bz_print_no"))) {
+            throw new BadRequestException("请先设置客户打印模板");
+        }
+        String bz_print_no = jsonCust.getString("bz_print_no");
+
+        double weight = 0;
+        JSONArray rows = WQL.getWO("PDA_ST_01").addParam("flag", "5").addParam("box_no", box_no).process().getResultJSONArray(0);
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.getJSONObject(i);
+            weight += row.getDoubleValue("net_weight");
+        }
+
+        // 生成txt文件
+        JSONObject jsonPrint = printTab.query("print_id = '" + whereJson.getString("print_type") + "'").uniqueResult(0);
+        //10.1.3.21/LMSPrinter/
+        String time = String.valueOf(DateUtil.current());
+        String filePath = jsonPrint.getString("print_route") +time+"外包标签.txt";
+        FileWriter fw = null;
+        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,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 + ","
+                    + 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", "打印成功！");
+            log.info(DateUtil.now()+"打印成功！");
+        } catch (Exception e) {
+            jo.put("message", "打印失败！" + e.getMessage());
+            log.info(DateUtil.now()+"1打印失败！");
+        } finally {
+            try {
+                if(fw != null){
+                    fw.close();
+                }
+            } catch (Exception e) {
+                jo.put("message", "打印失败！" + e.getMessage());
+                log.info(DateUtil.now()+"2打印失败！");
+            }
+        }
+        return jo;
+    }
+
     @Override
     public JSONObject printType(JSONObject whereJson) {
         JSONArray rows = WQL.getWO("PDA_ST_01").addParam("flag", "6").process().getResultJSONArray(0);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java
index 88c2539be..f8e2b3e84 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java
@@ -1,6 +1,7 @@
 package org.nl.wms.pdm.bi.rest;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -8,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.pdm.bi.service.SubpackagerelationService;
 import org.nl.wms.pdm.bi.service.dto.SubpackagerelationDto;
+import org.nl.wms.sch.manage.AutoSendFeiShu;
 import org.nl.wms.util.TranUtil;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -73,13 +75,10 @@ public class SubpackagerelationController {
     public void download(@RequestParam Map map, HttpServletResponse response) throws IOException {
         subpackagerelationService.download(map, response);
     }
-    @Log("导出数据")
-    @GetMapping(value = "/tranTest")
-    public void tranTest(@RequestBody JSONObject param) throws IOException {
-        TranUtil.openTransaction((req,callback)->{
-
-            return null;
-        },new JSONArray());
+    @PostMapping (value = "/sendMsg")
+    @SaIgnore
+    public void tranTest(@RequestBody JSONObject param) {
+        AutoSendFeiShu.sendFeiShuMsg(param.getString("u"),param.getString("m"),param.getString("t"));
     }
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
index 09c82fcae..19497e755 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
@@ -29,7 +29,6 @@ public class AcsUtil {
         return jsonObject;
     }
 
-    @InterfaceLog
     public JSONObject notifyAcs3(String api, JSONArray list) {
         log.info("下发ACS参数----------------------------------------+" + api + ",---" + list.toString());
         //判断是否连接ACS系统
@@ -158,4 +157,37 @@ public class AcsUtil {
         }
         return result;
     }
+    public static JSONObject notifyAcsObject(String api, JSONObject param) {
+        //判断是否连接ACS系统
+        String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue();
+        JSONObject result = new JSONObject();
+        if (StrUtil.equals("0", isConnect)) {
+            result.put("status", HttpStatus.OK.value());
+            result.put("message", "下发成功，但未连接ACS!");
+            result.put("data", new JSONObject());
+            return result;
+        }
+        String product_area = param.getString("product_area");
+        String acs_url = URLEnum.find(product_area);
+        if (StrUtil.isEmpty(acs_url)) {
+            log.info(product_area);
+            throw new BadRequestException("未查询到区域对应的acs地址！");
+        }
+        String url = acs_url + api;
+        try {
+            String resultMsg = HttpRequest.post(url)
+                    .body(JSONObject.toJSONString(param))
+                    .execute().body();
+            result = JSONObject.parseObject(resultMsg);
+            log.info("ACS相应参数----------------------------------------+" + api + ",---" + result.toString());
+        } catch (Exception e) {
+            result.put("status", HttpStatus.BAD_REQUEST);
+            result.put("message", "网络不通,操作失败!");
+            result.put("data", new JSONObject());
+        }
+        if (!StrUtil.equals(result.getString("status"), "200")) {
+            throw new BadRequestException(result.getString("message"));
+        }
+        return result;
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
index d1eef376f..ecc4992d0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound;
+import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ComPareUtil {
 
@@ -67,10 +70,17 @@ public class ComPareUtil {
         if (!(NumberUtil.sub(box_weight, weight_sys) <= current_weight && NumberUtil.add(box_weight, weight_sys) >= current_weight)) {
             compaer_result = false;
         }
-
+        //查询子卷入库配置
+        IPdmBiContainerinboundService iPdmBiContainerinboundService = SpringContextHolder.getBean(IPdmBiContainerinboundService.class);
+        PdmBiContainerinbound pdmBiContainerinbound = iPdmBiContainerinboundService.getOne(new QueryWrapper<PdmBiContainerinbound>()
+                .eq("box", sub.getPackage_box_sn()));
         JSONObject json = new JSONObject();
         json.put("compaer_result", compaer_result);
         json.put("box_no", sub.getPackage_box_sn());
+        json.put("box_weight", sub.getBox_weight().intValue());
+        json.put("current_weight", new BigDecimal(current_weight).intValue());
+        json.put("containers", list.stream().map(a->a.getContainer_name()).collect(Collectors.toList()));
+        json.put("inbound", (pdmBiContainerinbound != null ? pdmBiContainerinbound.getInbound():false));
         return json;
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
index dafefac1a..e51dc2e1e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
@@ -120,6 +120,11 @@ public abstract class AbstractAcsTask {
      *
      */
     public JSONObject immediateNotifyAcs(String task_id) {
+        try {
+            Thread.sleep(1000);
+        }catch (Exception ex){
+
+        }
         List<AcsTaskDto> taskList;
             if (StringUtils.isEmpty(task_id)){
                taskList = this.schedule();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java
new file mode 100644
index 000000000..ef6db9464
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java
@@ -0,0 +1,76 @@
+package org.nl.wms.sch.manage;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.first_floor_area.auto.AutoSendToZxq;
+import org.nl.modules.wql.WQL;
+import org.nl.wms.sch.tasks.InCoolIvtTask;
+import org.nl.wms.sch.tasks.InHotTask;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/2/21
+ */
+@Slf4j
+@Component
+public class AutoIntoHotCacheTask {
+    private final String THIS_CLASS = AutoIntoHotCacheTask.class.getName();
+    @Autowired
+    private IschBaseTaskService taskService;
+    @Autowired
+    private RedissonClient redissonClient;
+
+    @SneakyThrows
+    public void run() {
+        log.info("定时对B1入暂存....");
+        RLock lock = redissonClient.getLock(THIS_CLASS);
+        boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
+        try {
+            if (tryLock) {
+                    List<SchBaseTask> tasks = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
+                            .eq(SchBaseTask::getTask_type, "010206")
+                            .eq(SchBaseTask::getIs_delete, "0")
+                            .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode()));
+                    for (SchBaseTask task : tasks) {
+
+                        JSONObject cache_param = JSONObject.parseObject(task.getRemark());
+                        JSONObject cache_jo = WQL.getWO("PDA_COOLIN").addParamMap(cache_param).process().uniqueResult(0);
+                        if (ObjectUtil.isEmpty(cache_jo) || ObjectUtil.isEmpty(cache_jo.getString("point_code"))) {
+                            log.info("烘箱对接位：{} 没找到暂存位！", task.getPoint_code1());
+                            return;
+                        }
+                        new InHotTask().immediateNotifyAcs(task.getTask_id());
+
+                        task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+                        task.setPoint_code2(cache_jo.getString("point_code"));
+                        task.setRemark("-");
+                        task.setUpdate_time(DateUtil.now());
+                        task.setTask_type("010204");
+                        taskService.updateById(task);
+                    }
+            } else {
+                log.info("定时对B1入暂存任务被锁住。");
+            }
+        } finally {
+            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
index 5b85cf98d..d0de8d4f0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
@@ -116,7 +116,8 @@ public class AutoSaveIvtExcel {
                         path,
                         type,
                         "",
-                        DateUtil.now());
+                        DateUtil.now()
+                        );
                 iToolLocalStorageService.save(localStorage);
                 workbook.write(fileOut);
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java
index 72a3375f1..99143e89a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java
@@ -47,7 +47,35 @@ public class AutoSendFeiShu {
             }
         }
     }
-
+    public static void sendFeiShuMsg(String ul,String m,String t){
+        JSONObject jo = new JSONObject();
+        String[] u = ul.split(",");
+        JSONArray UserList = new JSONArray();
+        if (u.length > 0) {
+            for (String s : u) {
+                JSONObject param = new JSONObject();
+                param.put("User", s);
+                UserList.add(param);
+            }
+        }
+        jo.put("SendType", "L");
+        jo.put("Title", t);
+        jo.put("WarnType", "string");
+        jo.put("MessageType", "P");
+        jo.put("UserList", UserList);
+        jo.put("Message", m);
+        String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue();
+        String api = "/FeiShuNoticesWebApi/CommunalApi";
+        url = url + api;
+        try {
+            log.info("飞书输 ru参数为：-------------------" + String.valueOf(jo));
+            String resultMsg = HttpRequest.post(url)
+                    .body(String.valueOf(jo))
+                    .execute().body();
+        } catch (Exception e) {
+            log.info(e.getMessage());
+        }
+    }
     void sendInfo(JSONArray device_rows) {
         WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus");
         for (int i = 0; i < device_rows.size(); i++) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java
index 593800237..7a47aa6ba 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java
@@ -1,5 +1,6 @@
 package org.nl.wms.sch.service;
 
+import org.nl.common.TableDataInfo;
 import org.springframework.data.domain.Pageable;
 
 import java.util.Map;
@@ -18,7 +19,7 @@ public interface TaskService {
      * @param page      分页参数
      * @return Map<String, Object>
      */
-    Map<String, Object> queryAll(Map whereJson, Pageable page);
+    Map queryAll(Map whereJson, Pageable page);
 
     /**
      * 任务操作
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
index efcc5e1ea..e33475460 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
@@ -23,10 +24,13 @@ import org.nl.wms.sch.service.dto.RegionDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
 
 /**
  * @author ldjun
@@ -52,20 +56,29 @@ public class PointServiceImpl implements PointService {
         map.put("point_type", whereJson.get("point_type"));
         Object name = whereJson.get("name");
         if (ObjectUtil.isNotEmpty(name)) {
-            String search = (String) name;
-            String[] split = search.split("_");
-            name = String.join("\\_", split);
-            map.put("name", name);
+
+            map.put("name", "%"+name+"%");
         }
         JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc");
         JSONArray content = json.getJSONArray("content");
+        if (CollectionUtils.isEmpty(content)){
+            return json;
+        }
+        List<String> regionIds = new ArrayList<>();
+        for (int i = 0; i < content.size(); i++) {
+            JSONObject object = content.getJSONObject(i);
+            String region_id = object.getString("region_id");
+            regionIds.add(region_id);
+        }
+        List<RegionDto> regionDtos = regionService.queryAll("region_id in ('" + regionIds.stream().collect(Collectors.joining(",")) + "')");
+        Map<Long, RegionDto> attrMap = regionDtos.stream().collect(HashMap::new, (m, o) -> m.put(o.getRegion_id(), o), HashMap::putAll);
         JSONArray res = new JSONArray();
         for (int i = 0; i < content.size(); i++) {
             JSONObject object = content.getJSONObject(i);
             Long region_id = object.getLong("region_id");
             String point_status = object.getString("point_status");
             String point_type = object.getString("point_type");
-            RegionDto regionDto = regionService.findById(region_id);
+            RegionDto regionDto = attrMap.get(region_id);
             String point_status_explain = regionDto.getPoint_status_explain();
             String point_type_explain = regionDto.getPoint_type_explain();
             // 获取点位状态名称
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
index 42cb0ee04..50d3d58ff 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
@@ -8,9 +8,13 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
@@ -20,6 +24,7 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.basedata.master.service.ClassstandardService;
 import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
 import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl;
+import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.service.TaskService;
 import org.redisson.api.RLock;
@@ -50,7 +55,7 @@ public class TaskServiceImpl implements TaskService {
     private final RedissonClient redissonClient;
 
     @Override
-    public Map<String, Object> queryAll(Map form, Pageable page) {
+    public Map queryAll(Map form, Pageable page) {
 
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
@@ -68,7 +73,7 @@ public class TaskServiceImpl implements TaskService {
             map.put("task_status", task_status.replace("-1", ""));
         }
         if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) {
-            map.put("task_code", "%" + whereJson.getString("task_code") + "%");
+            map.put("task_code", whereJson.getString("task_code"));
         }
         if (StrUtil.isNotEmpty(whereJson.getString("point_code1"))) {
             map.put("point_code1", "%" + whereJson.getString("point_code1") + "%");
@@ -102,17 +107,7 @@ public class TaskServiceImpl implements TaskService {
         if (ObjectUtil.isNotEmpty(in_area_id)) {
             map.put("in_area_id", in_area_id);
         }
-        JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
-        JSONArray content = json.getJSONArray("content");
-        JSONArray res = new JSONArray();
-
-        //点位基础表【SCH_BASE_Point】
-        WQLObject schBasePointService = WQLObject.getWQLObject("SCH_BASE_Point");
-        for (int i = 0; i < content.size(); i++) {
-            JSONObject taskObj = content.getJSONObject(i);
-            res.add(taskObj);
-        }
-        json.put("content", res);
+        JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task_id desc");
         return json;
     }
 
@@ -124,70 +119,37 @@ public class TaskServiceImpl implements TaskService {
         boolean tryLock = lock.tryLock(0,20, TimeUnit.SECONDS);
         try {
             if (tryLock) {
-                String method_name = MapUtil.getStr(map, "method_name");
                 JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
-                if ("finish".equals(method_name)) {
-                    //强制执行，只把任务变更成完成状态
-                    // 更改任务状态为完成
-                    HashMap hashMap = new HashMap<>();
-                    hashMap.put("task_status", TaskStatusEnum.FINISHED.getCode());
-                    hashMap.put("update_optid", SecurityUtils.getCurrentUserId());
-                    hashMap.put("update_optname", SecurityUtils.getCurrentUsername());
-                    hashMap.put("update_time", DateUtil.now());
-                    hashMap.put("remark", "任务被用户:" + SecurityUtils.getCurrentUsername() + "在:" + DateUtil.now() + "强制完成。");
-                    WQLObject.getWQLObject("SCH_BASE_Task").update(hashMap,"task_id = '" + task_id + "'");
-                } else {
-                    // 任务处理类
-                    String processing_class = taskObj.getString("handle_class");
-                    String message = "";
-
-                    try {
-                        Object obj = new Object();
-                        try {
-                            obj = SpringContextHolder.getBean(Class.forName(processing_class));
-                        } catch (Exception e) {
-                            Class<?> clz = Class.forName(processing_class);
-                            obj = clz.newInstance();
-                        }
-                        // 调用每个任务类的method_name()强制结束方法
-                        Method m = obj.getClass().getMethod(method_name, String.class);
-                        JSONObject result = (JSONObject) m.invoke(obj, task_id);
-                        if (ObjectUtil.isEmpty(result)) {
-                            return;
-                        }
-                        JSONArray arr = result.getJSONArray("errArr");
-                        WQLObject wo = WQLObject.getWQLObject("sch_base_task");
-                        if (ObjectUtil.isNotEmpty(arr)) {
-                            for (int i = 0; i < arr.size(); i++) {
-                                JSONObject json = arr.getJSONObject(i);
-                                JSONObject param = new JSONObject();
-                                param.put("task_id", json.getString("task_id"));
-                                param.put("remark", json.getString("message"));
-                                wo.update(param);
-                            }
-                            throw new BadRequestException("任务操作失败!");
-                        } else {
-                            JSONObject param = new JSONObject();
-                            param.put("task_id", task_id);
-                            param.put("remark", "操作成功");
-                            wo.update(param);
-                        }
-                    } catch (InvocationTargetException e) {
-                        if (ObjectUtil.isNull(e.getTargetException().getMessage())) {
-                            message = e.getTargetException().toString();
-                        } else {
-                            message = e.getTargetException().getMessage();
-                        }
-                        throw new BadRequestException(message);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        throw new BadRequestException(e.getMessage());
-                    }
+                String processing_class = taskObj.getString("handle_class");
+                AbstractAcsTask obj = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
+                switch (MapUtil.getStr(map, "method_name")){
+                    case "finish":
+                        taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
+                        taskObj.put("update_optid", SecurityUtils.getCurrentUserId());
+                        taskObj.put("update_optname", SecurityUtils.getCurrentUsername());
+                        taskObj.put("update_time", DateUtil.now());
+                        taskObj.put("remark", "任务被用户:" + SecurityUtils.getCurrentUsername() + "在:" + DateUtil.now() + "强制完成。");
+                        WQLObject.getWQLObject("SCH_BASE_Task").update(taskObj);
+                        break;
+                    case "forceFinish":
+                        obj.forceFinish(task_id);
+                        break;
+                    case "cancel":
+                        obj.cancel(task_id);
+                        break;
+                    case "immediateNotifyAcs":
+                        obj.immediateNotifyAcs(task_id);
+                        break;
                 }
             } else {
                 throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
             }
-        } finally {
+        }catch (BadRequestException ex){
+            log.error(task_id+"手动更新任务失败:{}", ex);
+            WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+MapUtil.getStr(map, "method_name")+"失败:"+ex.getMessage()),"task_id = '" + task_id + "'");
+            throw ex;
+        }
+        finally {
             if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                 lock.unlock();
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
index 01f061771..0c3d5c549 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
@@ -78,7 +78,7 @@
                             point.is_used = 输入.is_used
                     ENDOPTION
                     OPTION 输入.name <> ""
-                             ( point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%" )
+                             ( point.point_code like 输入.name  or point.point_name like  输入.name  )
                     ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
index ac19f6afb..b16ee78a2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
@@ -18,6 +18,7 @@
 	输入.finished_type					         TYPEAS s_string
 	输入.task_type					             TYPEAS f_string
 	输入.in_area_id					             TYPEAS f_string
+	输入.lk					                     TYPEAS s_string
 	输入.point_code1					             TYPEAS s_string
 	输入.point_code2					             TYPEAS s_string
 	输入.task_code					             TYPEAS s_string
@@ -50,61 +51,53 @@
 	##########################################
 
     IF 输入.flag = "1"
-		PAGEQUERY
-            SELECT * FROM (
-                SELECT
-                    task.*,
-                    md.class_name task_type_name,
-                    user.person_name AS create_name1,
-                    dict.label task_status_name,
-                    case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area
-                FROM
-                    (select
-                            tas.*
-                        from
-                        sch_base_task tas
-                     where 1=1
-                    OPTION 输入.is_delete <> ""
-                        tas.is_delete = 输入.is_delete
-                    ENDOPTION
-                    OPTION 输入.finished_type <> ""
-                            tas.finished_type = 输入.finished_type
-                    ENDOPTION
-                    OPTION 输入.unFinish <> ""
-                            tas.task_status <> '07'
-                    ENDOPTION
-                    OPTION 输入.task_status <> ""
-                            find_in_set( tas.task_status, 输入.task_status)
-                    ENDOPTION
-                    OPTION 输入.vehicle_code <> ""
-                         (tas.vehicle_code like 输入.vehicle_code OR tas.material_code like 输入.vehicle_code OR tas.vehicle_code2 like 输入.vehicle_code)
-                    ENDOPTION
-                    OPTION 输入.task_code <> ""
-                         (tas.task_code like 输入.task_code)
-                    ENDOPTION
-                    OPTION 输入.point_code1 <> ""
-                         (tas.point_code1 like 输入.point_code1)
-                    ENDOPTION
-                    OPTION 输入.begin_time <> ""
-                       tas.create_time >= 输入.begin_time
-                   ENDOPTION
-                   OPTION 输入.end_time <> ""
-                       tas.create_time <= 输入.end_time
-                   ENDOPTION
-                    ) task
-                    LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
-                    LEFT JOIN sys_user user ON user.username = task.create_name
-                    LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
-                WHERE
-                    1=1
-                    OPTION 输入.task_type <> ""
-                            md.class_id in 输入.task_type
-                    ENDOPTION
-                 ) a
-             WHERE 1=1
-                OPTION 输入.in_area_id <> ""
-                    a.final_product_area IN 输入.in_area_id
+        PAGEQUERY
+            SELECT
+                task.*,
+                md.class_name task_type_name,
+                user.person_name AS create_name1,
+                dict.label task_status_name
+            FROM
+                sch_base_task task
+                LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
+                LEFT JOIN sys_user user ON user.username = task.create_name
+                LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
+            WHERE
+                1=1
+                OPTION 输入.is_delete <> ""
+                    task.is_delete = 输入.is_delete
                 ENDOPTION
+                OPTION 输入.task_type <> ""
+                        md.class_id in 输入.task_type
+                ENDOPTION
+                OPTION 输入.finished_type <> ""
+                        task.finished_type = 输入.finished_type
+                ENDOPTION
+                OPTION 输入.unFinish <> ""
+                        task.task_status <> '07'
+                ENDOPTION
+                OPTION 输入.task_status <> ""
+                        find_in_set( task.task_status, 输入.task_status)
+                ENDOPTION
+                OPTION 输入.vehicle_code <> ""
+                     (task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code)
+                ENDOPTION
+                OPTION 输入.task_code <> ""
+                     (task.task_code =  输入.task_code)
+                ENDOPTION
+                OPTION 输入.point_code1 <> ""
+                     (task.point_code1 like 输入.point_code1)
+                ENDOPTION
+                OPTION 输入.begin_time <> ""
+                   task.create_time >= 输入.begin_time
+               ENDOPTION
+               OPTION 输入.end_time <> ""
+                   task.create_time <= 输入.end_time
+               ENDOPTION
+               OPTION 输入.in_area_id <> ""
+                 IF(task_type like '0105%','LK',IF(task_type like '0107%','LK',ifnull(product_area,'LK')))
+                 IN 输入.in_area_id
+               ENDOPTION
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
index 54ac8813e..8fb2a5ff2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
@@ -205,7 +205,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
                 if (jsonTask.getString("task_type").equals("010104")) {
                     // 校验终点是否存在
                     JSONObject jsonIvt2 = point_tab.query("point_code ='" + point_code4 + "'").uniqueResult(0);
-                    if (ObjectUtil.isEmpty(jsonIvt)) {
+                    if (ObjectUtil.isEmpty(jsonIvt2)) {
                         throw new BadRequestException("终点未找到可用点位:" + point_code2);
                     }
 
@@ -217,22 +217,46 @@ public class CallEmpReelTask extends AbstractAcsTask {
                     cache_param.put("product_area", jsonIvt.getString("product_area"));
                     JSONObject cache_jo = WQL.getWO("PDA_COOLIN").addParamMap(cache_param).process().uniqueResult(0);
                     if (ObjectUtil.isEmpty(cache_jo) || ObjectUtil.isEmpty(cache_jo.getString("point_code"))) {
-                        throw new BadRequestException("未查询到可用的冷却区暂存位！");
-                    }
-                    JSONObject param = new JSONObject();
-                    param.put("point_code1", point_code4);
-                    param.put("point_code2", cache_jo.getString("point_code"));
-                    param.put("material_code", jsonTask.getString("material_code"));
-                    param.put("product_area", jsonTask.getString("product_area"));
-                    param.put("type", "3");
-                    InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
-                    inHotTask.createTask(param);
+                        // B1才创建半条任务
+                        if ("B1".equals(jsonTask.getString("product_area"))) {
+                            // 创建半条任务
+                            JSONObject jo = new JSONObject();
+                            jo.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
+                            jo.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
+                            jo.put("task_type", "010206");
+                            jo.put("task_status", TaskStatusEnum.SURE_START.getCode());
+                            jo.put("point_code1", point_code4);
+                            jo.put("point_code2", "");
+                            jo.put("material_code", jsonTask.getString("material_code"));
+                            jo.put("product_area", jsonTask.getString("product_area"));
+                            jo.put("handle_class", InHotTask.class.getName());
+                            jo.put("remark", cache_param);
+                            jo.put("type", "3");
+                            jo.put("priority", "1");
+                            jo.put("sort_seq", "1");
+                            jo.put("create_time", DateUtil.now());
+                            jo.put("acs_task_type", "6");
+                            taskTab.insert(jo);
+                        } else {
+                            throw new BadRequestException("找不到对应的半成品缓存位");
+                        }
 
+                    } else {
+                        JSONObject param = new JSONObject();
+                        param.put("point_code1", point_code4);
+                        param.put("point_code2", cache_jo.getString("point_code"));
+                        param.put("material_code", jsonTask.getString("material_code"));
+                        param.put("product_area", jsonTask.getString("product_area"));
+                        param.put("type", "3");
+                        InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
+                        inHotTask.createTask(param);
+                    }
                     // 更新点位库存状态
                     jsonIvt2.put("point_status", "2");
                     jsonIvt2.put("material_code", jsonTask.getString("material_code"));
                     point_tab.update(jsonIvt2);
                 } else if (jsonTask.getString("task_type").equals("010106")) {
+                    // B2生箔
                     BakingServiceImpl bean = SpringContextHolder.getBean(BakingServiceImpl.class);
                     WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表
                     JSONObject requestParam = jsonTask.getJSONObject("request_param");
@@ -268,34 +292,37 @@ public class CallEmpReelTask extends AbstractAcsTask {
                     // 创建桁架任务，入烘箱。
                     JSONObject hotPoint = bean.getJsonObject(jsonIvt2.getString("product_area"), jsonIvt2, temperature);
                     String container_name = jsonTask.getString("material_code");
-                    // 创建暂存位 --> 烘烤区任务
-                    JSONObject param = new JSONObject();
-                    param.put("type", "2");
-                    param.put("point_code1", point_code4);
-                    param.put("point_code2", hotPoint.getString("point_code"));
-                    param.put("material_code", container_name);
-                    param.put("product_area", hotPoint.getString("product_area"));
-                    param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60));
+                    //优化
+                    if (ObjectUtil.isNotEmpty(hotPoint)) {
+                        // 创建暂存位 --> 烘烤区任务
+                        JSONObject param = new JSONObject();
+                        param.put("type", "2");
+                        param.put("point_code1", point_code4);
+                        param.put("point_code2", hotPoint.getString("point_code"));
+                        param.put("material_code", container_name);
+                        param.put("product_area", hotPoint.getString("product_area"));
+                        param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60));
 
-                    InHotTask inHotTask = new InHotTask();
-                    String taskId = inHotTask.createTask(param);
-                    // 3.插入主表
-                    JSONObject jsonRawHot = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0);
-                    JSONObject jsonMater = materTab.query("material_code = '" + jsonRawHot.getString("product_name") + "'").uniqueResult(0);
+                        InHotTask inHotTask = new InHotTask();
+                        String taskId = inHotTask.createTask(param);
+                        // 3.插入主表
+                        JSONObject jsonRawHot = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0);
+                        JSONObject jsonMater = materTab.query("material_code = '" + jsonRawHot.getString("product_name") + "'").uniqueResult(0);
 
-                    JSONObject hotParam = new JSONObject();
-                    hotParam.put("container_name", container_name);
-                    hotParam.put("workorder_id", jsonRawHot.getString("workorder_id"));
-                    hotParam.put("material_id", jsonMater.getString("material_id"));
-                    hotParam.put("qty", jsonRawHot.get("productin_qty"));
-                    hotParam.put("io_type", "0");
-                    hotParam.put("qty_unit_id", jsonMater.getString("base_unit_id"));
-                    hotParam.put("task_id", taskId);
-                    hotParam.put("start_point_code", point_code1);
-                    hotParam.put("end_point_code", hotPoint.getString("point_code"));
-                    hotParam.put("temperature", temperature);
-                    hotParam.put("oven_time", hours);
-                    bean.createHotIoMst(hotParam);
+                        JSONObject hotParam = new JSONObject();
+                        hotParam.put("container_name", container_name);
+                        hotParam.put("workorder_id", jsonRawHot.getString("workorder_id"));
+                        hotParam.put("material_id", jsonMater.getString("material_id"));
+                        hotParam.put("qty", jsonRawHot.get("productin_qty"));
+                        hotParam.put("io_type", "0");
+                        hotParam.put("qty_unit_id", jsonMater.getString("base_unit_id"));
+                        hotParam.put("task_id", taskId);
+                        hotParam.put("start_point_code", point_code1);
+                        hotParam.put("end_point_code", hotPoint.getString("point_code"));
+                        hotParam.put("temperature", temperature);
+                        hotParam.put("oven_time", hours);
+                        bean.createHotIoMst(hotParam);
+                    }
                 } else {
                     // 校验终点是否存在
                     JSONObject jsonIvt2 = ivtTab.query("full_point_code ='" + point_code4 + "'").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 6c6c7db4f..27ca43c0e 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
@@ -362,16 +362,36 @@ public class CoolCutTask extends AbstractAcsTask {
 
             if ("010304".equals(jsonTask.getString("task_type"))) {
                 //更新分切区空轴库存
-
+                String container_name = "";
+                //若起点是ST_IVT_CutPointIvt表
                 JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0);
-                String container_name = cut_jo2.getString("container_name");
-                cut_jo2.put("full_point_status", "01");
-                cut_jo2.put("full_vehicle_code", "");
-                cut_jo2.put("container_name", "");
-                cut_jo2.put("update_optid", currentUserId);
-                cut_jo2.put("update_optname", currentUsername);
-                cut_jo2.put("update_time", DateUtil.now());
-                WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2);
+                if (ObjectUtil.isEmpty(cut_jo2)) {
+                    //B1车间支持从分切上料暂存位送回母卷
+                    if(point_code1.contains("B1_FQZC")){
+                        cut_jo2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0);
+                        if (ObjectUtil.isEmpty(cut_jo2)) {
+                            throw new BadRequestException("任务点位异常，st_ivt_coolpointivt表找不到满轴点位:"+point_code1);
+                        }
+                        container_name = cut_jo2.getString("container_name");
+                        cut_jo2.put("full_point_status", "01");
+                        cut_jo2.put("full_vehicle_code", "");
+                        cut_jo2.put("container_name", "");
+                        cut_jo2.put("update_optid", currentUserId);
+                        cut_jo2.put("update_optname", currentUsername);
+                        cut_jo2.put("update_time", DateUtil.now());
+                        WQLObject.getWQLObject("st_ivt_coolpointivt").update(cut_jo2);
+                    }
+                }else{
+                    container_name = cut_jo2.getString("container_name");
+                    cut_jo2.put("full_point_status", "01");
+                    cut_jo2.put("full_vehicle_code", "");
+                    cut_jo2.put("container_name", "");
+                    cut_jo2.put("update_optid", currentUserId);
+                    cut_jo2.put("update_optname", currentUsername);
+                    cut_jo2.put("update_time", DateUtil.now());
+                    WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2);
+                }
+
 
                 //更新冷却区空轴库存
                 JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0);
@@ -409,17 +429,21 @@ public class CoolCutTask extends AbstractAcsTask {
         String point_code2 = form.getString("point_code2");
         String point_code3 = form.getString("point_code3");
         String point_code4 = form.getString("point_code4");
-        if (isSingleTask(point_code1)) {
-            throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
+        JSONObject task1 = isSingleTask(point_code1);
+        if ( ObjectUtil.isNotEmpty(task1)) {
+            throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务:"+task1.getString("task_code"));
         }
-        if (isSingleTask(point_code2)) {
-            throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
+        JSONObject task2 = isSingleTask(point_code2);
+        if ( ObjectUtil.isNotEmpty(task2)) {
+            throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务:"+task2.getString("task_code"));
         }
-        if (isSingleTask(point_code3)) {
-            throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！");
+        JSONObject task3 = isSingleTask(point_code3);
+        if ( ObjectUtil.isNotEmpty(task3)) {
+            throw new BadRequestException("点位：" + point_code3 +"存在未完成的任务:"+task3.getString("task_code"));
         }
-        if (isSingleTask(point_code4)) {
-            throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务！");
+        JSONObject task4 = isSingleTask(point_code4);
+        if ( ObjectUtil.isNotEmpty(task4)) {
+            throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务:"+task4.getString("task_code"));
         }
         JSONObject json = new JSONObject();
         json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
@@ -473,17 +497,23 @@ public class CoolCutTask extends AbstractAcsTask {
     }
 
     //判断该点位是否存在未完成的任务
-    public boolean isSingleTask(String point_code) {
+    public JSONObject isSingleTask(String point_code) {
         JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
         JSONObject task2 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code2 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
         JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
         JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
 
-        if (ObjectUtil.isNotEmpty(task1) || ObjectUtil.isNotEmpty(task2) || ObjectUtil.isNotEmpty(task3) || ObjectUtil.isNotEmpty(task4)) {
-            return true;
-        } else {
-            return false;
+        if(ObjectUtil.isNotEmpty(task1)){
+            return task1;
+        }else  if(ObjectUtil.isNotEmpty(task2)){
+            return task2;
+        }else  if(ObjectUtil.isNotEmpty(task3)){
+            return task3;
+        }else  if(ObjectUtil.isNotEmpty(task4)){
+            return task4;
         }
+
+        return null;
     }
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java
index ef4b2eee3..b91bc38ea 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java
@@ -155,7 +155,6 @@ public class EmptyVehicleTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public String createTask(JSONObject form) {
 
         String task_type = form.getString("task_type");
@@ -200,7 +199,6 @@ public class EmptyVehicleTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void forceFinish(String task_id) {
         JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
         this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
index 7d83fe9a5..7a67af7ea 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
@@ -385,7 +385,6 @@ public class InHotTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void forceFinish(String task_id) {
         JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
         this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
index 35bbc12b0..c2da49502 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
@@ -68,7 +68,6 @@ public class InTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配表
         WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
index ed1256333..7febd0944 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
@@ -231,13 +231,19 @@ public class OutHotTask extends AbstractAcsTask {
 
         String point_code1 = form.getString("point_code1");
         String point_code2 = form.getString("point_code2");
+        String point_code3 = form.getString("point_code3");
         if (cutConveyorTask.isSingleTask(point_code1)) {
             throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
         }
         if (cutConveyorTask.isSingleTask(point_code2)) {
             throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
         }
-
+        //第三个点不空位时，判断是否存在任务
+        if (ObjectUtil.isNotEmpty(point_code3)) {
+            if (cutConveyorTask.isSingleTask(point_code3)) {
+                throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！");
+            }
+        }
         JSONObject json = new JSONObject();
         json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
@@ -272,7 +278,6 @@ public class OutHotTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void forceFinish(String task_id) {
         JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
         this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
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 9410e2a18..2c6da0385 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
@@ -1,11 +1,13 @@
 package org.nl.wms.st.inbill.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService;
+import org.nl.common.utils.MapOf;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -285,4 +287,13 @@ public class RawAssistIStorController {
     public void download(@RequestParam Map map, HttpServletResponse response) throws IOException {
         rawAssistIStorService.download(map, response);
     }
+
+
+    @Log("一期扩容接口")
+    @GetMapping(value = "/updateStructSect")
+    @SaIgnore
+    public ResponseEntity<Object> updateStructSect(String layer_num) throws IOException {
+        rawAssistIStorService.updateStructSect(layer_num);
+        return new ResponseEntity<>(MapOf.of("status","200","message","sucess"),HttpStatus.OK);
+    }
 }
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 f90e53fc5..0d1df8fbe 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
@@ -73,4 +73,10 @@ public interface RawAssistIStorService {
      * @throws IOException /
      */
     void download(Map map, HttpServletResponse response) throws IOException;
+
+    /**
+     * 一期仓库扩容
+     * @param layer_num
+     */
+     void updateStructSect(String layer_num);
 }
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 a046a991f..2a3f289ba 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
@@ -1868,7 +1868,15 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
 
         if (ObjectUtil.isEmpty(struct_jo)) {
             // 主存区类型更改成中转区类型：找一排主存区的更改中转区、把一排中转区的更改成主存区（只允许调用一次）
-            SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num);
+            String result = HttpUtil.get("http://127.0.0.1:8013/api/in/rawAssist/updateStructSect?layer_num=" + col_num);
+            if (StringUtils.isEmpty(result)){
+                throw new BadRequestException("扩容异常");
+            }
+            JSONObject toJSON = JSONObject.parseObject(result);
+            if (!toJSON.getString("status").equals("200")){
+                throw new BadRequestException(toJSON.getString("message"));
+            }
+//            SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num);
             struct_jo = autoDisMove2(whereJson);
         }
         return struct_jo;
@@ -2795,7 +2803,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
     /**
      * 新开事务，把当前事务挂起，（新开事务不回滚）
      */
-    @Transactional(propagation=Propagation.REQUIRES_NEW)
+    @Transactional()
     public void updateStructSect(String layer_num) {
         WQLObject attr = WQLObject.getWQLObject("st_ivt_structattr");
         WQLObject point = WQLObject.getWQLObject("sch_base_point");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java
index 9fa6e0714..92958aad5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java
@@ -13,6 +13,7 @@ import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
@@ -23,7 +24,7 @@ import java.util.List;
  * @Date:2023/12/12
  * @Description:立库空载具搬运任务
  */
-@Component
+@Service
 @RequiredArgsConstructor
 public class EmpMoveTask extends AbstractAcsTask {
     private final String THIS_CLASS = EmpMoveTask.class.getName();
@@ -188,7 +189,6 @@ public class EmpMoveTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void forceFinish(String task_id) {
         JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
         this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
index 175678610..46835cc6f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
@@ -15,13 +15,14 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.st.instor.service.impl.HandMoveStorServiceImpl;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-@Component
+@Service
 @RequiredArgsConstructor
 public class HandMoveStorAcsTask extends AbstractAcsTask {
     private final String THIS_CLASS = HandMoveStorAcsTask.class.getName();
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 2b31fc22f..6b3f5ad22 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
@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.sch.tasks.TwoSendOutTask;
 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.ios.service.iostorInv.IStIvtIostorinvService;
@@ -51,6 +52,8 @@ public class CheckOutBillController {
 
     private final OutBoxManageService outBoxManageService;
 
+    private final TwoSendOutTask twoSendOutTask;
+
 
     @GetMapping
     @Log("查询出库单")
@@ -437,6 +440,20 @@ public class CheckOutBillController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/testSendOut2")
+    @Log("发货区测试2")
+    @SaIgnore
+    public ResponseEntity<Object> testSendOut2(@RequestBody JSONObject whereJson) {
+            //创建任务
+            JSONObject task_jo = new JSONObject();
+            task_jo.put("point_code1", whereJson.getString("point1"));
+            task_jo.put("point_code2", whereJson.getString("point2"));
+            task_jo.put("vehicle_code", whereJson.getString("vehicle_code"));
+            task_jo.put("task_type", "010708");
+            twoSendOutTask.createTask(task_jo);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     @PostMapping("/testIn")
     @Log("申请入库")
     public ResponseEntity<Object> testIn(@RequestBody 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 ed889043c..8f09d98bf 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
@@ -1579,6 +1579,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         //库区表
         WQLObject wo_sect = WQLObject.getWQLObject("st_ivt_sectattr");
 
+        //定义需要更新的仓位集合
+        HashMap<String, JSONObject> Struct_map = new HashMap<String, JSONObject>();
         String iostorinv_id = whereJson.getString("iostorinv_id");
         //查询主表信息
         JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/util/IPUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/util/IPUtil.java
new file mode 100644
index 000000000..e2509bcc5
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/util/IPUtil.java
@@ -0,0 +1,32 @@
+package org.nl.wms.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.net.NetUtil;
+
+import java.net.*;
+import java.util.*;
+
+public class IPUtil {
+    public static void main(String[] args) throws SocketException {
+        List<String> localhostStrs = getLocalhostStrs();
+        System.out.println(localhostStrs);
+    }
+    public static List<String> getLocalhostStrs(){
+        List<String> ips = new ArrayList<>();
+        try {
+            Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+            while (interfaces.hasMoreElements()){
+                NetworkInterface nextElement = interfaces.nextElement();
+                for (InterfaceAddress address : nextElement.getInterfaceAddresses()) {
+                    InetAddress inetAddress = address.getAddress();
+                    if (inetAddress instanceof Inet4Address){
+                        ips.add(inetAddress.getHostAddress());
+                    }
+                }
+            }
+            return ips;
+        }catch (Exception ex){
+            return ips;
+        }
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java
index 3d143b01a..ff14f64c8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -46,18 +47,7 @@ public class TaskUtil {
      * 根据分切计划获取子卷长度
      */
     public static int getMaxNum(PdmBiSlittingproductionplan productionPlan, String paperDescription) {
-        String containerLength = productionPlan != null ? productionPlan.getPaper_tube_or_FRP().equals("1") ? productionPlan.getPaper_tube_description() : productionPlan.getFRP_description() : paperDescription;
-        int maxNum = 0;
-        for (String part : containerLength.split("\\|")) {
-            String numStr = part.replaceAll("\\D+", "");
-            if (!numStr.isEmpty()) {
-                int num = Integer.parseInt(numStr);
-                if (num > maxNum) {
-                    maxNum = num;
-                }
-            }
-        }
-        return maxNum;
+        return  SlitterTaskUtil.getPaperLengthInt(productionPlan);
     }
 
-}
\ No newline at end of file
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
index 1ddd0d44a..5ea258fdf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
@@ -3,6 +3,7 @@ package org.nl.wms.util;
 import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.ThrowableUtil;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
@@ -45,7 +46,7 @@ public class TranUtil {
             errTask = function.apply(request, allTransactionConsumer);
 
         } catch (Exception ex) {
-            log.error("一键设置异常:{}",ex);
+            log.error("一键设置异常:{}", ThrowableUtil.getStackTrace(ex));
             if (commits.size() > 0) {
                 TransactionStatus transactionStatus = commits.removeLast();
                 txManager.rollback(transactionStatus);
diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml
index 5514c6c14..66a8bd00e 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -1,57 +1,104 @@
 server:
-  port: 9999
+  port: 8013
 #配置数据源
 spring:
-  datasource:
-    druid:
-      db-type: com.alibaba.druid.pool.DruidDataSource
-      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
-      # 初始连接数
-      initial-size: 5
-      # 最小连接数
-      min-idle: 15
-      # 最大连接数
-      max-active: 30
-      # 超时时间(以秒数为单位)
-      remove-abandoned-timeout: 180
-      # 获取连接超时时间
-      max-wait: 3000
-      # 连接有效性检测时间
-      time-between-eviction-runs-millis: 60000
-      # 连接在池中最小生存的时间
-      min-evictable-idle-time-millis: 300000
-      # 连接在池中最大生存的时间
-      max-evictable-idle-time-millis: 900000
-      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
-      test-while-idle: true
-      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
-      test-on-borrow: true
-      # 是否在归还到池中前进行检验
-      test-on-return: false
-      # 检测连接是否有效
-      validation-query: select 1
-      # 配置监控统计
-      webStatFilter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-      filters:
-        DruidFilter,stat
-#      query-timeout: 1
-  #        stat:
-#          enabled: true
-#          # 记录慢SQL
-#          log-slow-sql: true
-#          slow-sql-millis: 1000
-#          merge-sql: true
-#        wall:
-#          config:
-#            multi-statement-allow: true
+  shardingsphere:
+    datasource:
+      names: master,slave
+      master:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        # 初始连接数
+        initial-size: 20
+        # 最小连接数
+        min-idle: 30
+        # 最大连接数
+        max-active: 300
+        # 是否自动回收超时连接
+        socket-timeout: 10
+        query-time-out: 7
+        transaction-query-timeout: 30
+        # 获取连接超时时间
+        max-wait: 4000
+        # 连接有效性检测时间
+        time-between-eviction-runs-millis: 60000
+        # 连接在池中最小生存的时间
+        min-evictable-idle-time-millis: 300000
+        # 连接在池中最大生存的时间
+        max-evictable-idle-time-millis: 900000
+        # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+        test-while-idle: true
+        # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+        test-on-borrow: true
+        # 是否在归还到池中前进行检验
+        test-on-return: false
+        # 检测连接是否有效
+        validation-query: select 1
+        # 配置监控统计
+        webStatFilter:
+          enabled: true
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+        filters:
+          DruidFilter,stat
+        url: jdbc:mysql://localhost:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+        username: root
+        password: 123456
+      slave:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        # 初始连接数
+        initial-size: 20
+        # 最小连接数
+        min-idle: 30
+        # 最大连接数
+        max-active: 300
+        # 是否自动回收超时连接
+        socket-timeout: 10
+        query-time-out: 7
+        transaction-query-timeout: 30
+        # 获取连接超时时间
+        max-wait: 4000
+        # 连接有效性检测时间
+        time-between-eviction-runs-millis: 60000
+        # 连接在池中最小生存的时间
+        min-evictable-idle-time-millis: 300000
+        # 连接在池中最大生存的时间
+        max-evictable-idle-time-millis: 900000
+        # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+        test-while-idle: true
+        # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+        test-on-borrow: true
+        # 是否在归还到池中前进行检验
+        test-on-return: false
+        # 检测连接是否有效
+        validation-query: select 1
+        # 配置监控统计
+        webStatFilter:
+          enabled: true
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+        filters:
+          DruidFilter,stat
+        url: jdbc:mysql://127.0.0.1:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+        username: root
+        password: 123456
+    rules:
+      readwrite-splitting:
+        data-sources:
+          db:
+            type: Static
+            props:
+              #接口有事务，读写分离不生效，默认全部使用主库
+              write-data-source-name: master
+              read-data-source-names: slave
+            #负载均衡算法名称
+            load-balancer-name: round-robin
+
   redis:
     #数据库索引
     database: ${REDIS_DB:15}
diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml
index d567b5f63..116aa3756 100644
--- a/lms/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml
@@ -1,63 +1,107 @@
 server:
-  port: 8011
+  port: 8013
 #配置数据源
 spring:
-  datasource:
-    druid:
-      db-type: com.alibaba.druid.pool.DruidDataSource
-      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_tb_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      #      username: ${DB_USER:root}
-      username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
-      #      password: ${DB_PWD:root}
-      # 初始连接数
-      initial-size: 5
-      # 最小连接数
-      min-idle: 15
-      # 最大连接数
-      max-active: 220
-      # 超时时间(以秒数为单位)
-      remove-abandoned-timeout: 180
-      # 获取连接超时时间
-      max-wait: 2000
-      # 连接有效性检测时间
-      time-between-eviction-runs-millis: 60000
-      # 连接在池中最小生存的时间
-      min-evictable-idle-time-millis: 300000
-      # 连接在池中最大生存的时间
-      max-evictable-idle-time-millis: 900000
-      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
-      test-while-idle: true
-      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
-      test-on-borrow: false
-      # 是否在归还到池中前进行检验
-      test-on-return: false
-      # 检测连接是否有效
-      validation-query: select 1
-      # 配置监控统计
-      webStatFilter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-      filters:
-        DruidFilter,stat
-  #        stat:
-  #          enabled: true
-  #          # 记录慢SQL
-  #          log-slow-sql: true
-  #          slow-sql-millis: 1000
-  #          merge-sql: true
-  #        wall:
-  #          config:
-  #            multi-statement-allow: true
+  shardingsphere:
+    datasource:
+      names: master,slave
+      master:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        # 初始连接数
+        initial-size: 20
+        # 最小连接数
+        min-idle: 30
+        # 最大连接数
+        max-active: 300
+        # 是否自动回收超时连接
+        socket-timeout: 10
+        query-time-out: 7
+        transaction-query-timeout: 30
+        # 获取连接超时时间
+        max-wait: 4000
+        # 连接有效性检测时间
+        time-between-eviction-runs-millis: 60000
+        # 连接在池中最小生存的时间
+        min-evictable-idle-time-millis: 300000
+        # 连接在池中最大生存的时间
+        max-evictable-idle-time-millis: 900000
+        # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+        test-while-idle: true
+        # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+        test-on-borrow: true
+        # 是否在归还到池中前进行检验
+        test-on-return: false
+        # 检测连接是否有效
+        validation-query: select 1
+        # 配置监控统计
+        webStatFilter:
+          enabled: true
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+        filters:
+          DruidFilter,stat
+        url: jdbc:mysql://10.1.3.87:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+        username: root
+        password: NLABC&hl123
+      slave:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        # 初始连接数
+        initial-size: 20
+        # 最小连接数
+        min-idle: 30
+        # 最大连接数
+        max-active: 300
+
+        socket-timeout: 10
+        query-time-out: 7
+        transaction-query-timeout: 30
+        # 获取连接超时时间
+        max-wait: 4000
+        # 连接有效性检测时间
+        time-between-eviction-runs-millis: 60000
+        # 连接在池中最小生存的时间
+        min-evictable-idle-time-millis: 300000
+        # 连接在池中最大生存的时间
+        max-evictable-idle-time-millis: 900000
+        # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+        test-while-idle: true
+        # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+        test-on-borrow: true
+        # 是否在归还到池中前进行检验
+        test-on-return: false
+        # 检测连接是否有效
+        validation-query: select 1
+        # 配置监控统计
+        webStatFilter:
+          enabled: true
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+        filters:
+          DruidFilter,stat
+        url: jdbc:mysql://10.1.3.89:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+        username: root
+        password: NLABC&hl123
+    rules:
+      readwrite-splitting:
+        data-sources:
+          db:
+            type: Static
+            props:
+              #接口有事务，读写分离不生效，默认全部使用主库
+              write-data-source-name: master
+              read-data-source-names: slave
+            #负载均衡算法名称
+            load-balancer-name: round-robin
   redis:
     #数据库索引
     database: ${REDIS_DB:11}
-    host: ${REDIS_HOST:10.1.3.93}
+    host: ${REDIS_HOST:10.1.3.91}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     redisson:
@@ -68,7 +112,7 @@ spring:
           connectionMinimumIdleSize: 8
           connectionPoolSize: 8
           database: 11
-          address: redis://10.1.3.93:6379
+          address: redis://10.1.3.91:6379
           idleConnectionTimeout: 10000
           timeout: 3000
 # 登录相关配置
@@ -160,6 +204,3 @@ sa-token:
   cookie:
     # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
     domain:
-lucene:
-  index:
-    path: D:\log\lms\lucene\index
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index 1aacdc663..a9fc87884 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:
@@ -126,6 +126,9 @@ security:
     - /api/param/getValueByCode
     - /plumelog/**
     - /api/esLog/**
+    - /api/s/**
+    - /api/codeDetail/getNewCode
+    - /api/in/rawAssist/updateStructSect
 # Sa-Token配置
 sa-token:
   # token 名称 (同时也是cookie名称)
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index 73fbb2be1..2c520ee34 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -58,7 +58,7 @@ https://juejin.cn/post/6844903775631572999
     <!--异步到文件-->
     <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
         <discardingThreshold>0</discardingThreshold>
-        <queueSize>500</queueSize>
+        <queueSize>512</queueSize>
         <appender-ref ref="FILE"/>
     </appender>
 
@@ -132,8 +132,8 @@ https://juejin.cn/post/6844903775631572999
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
         <root level="info">
-            <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="asyncLuceneAppender"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
diff --git a/lms/nladmin-system/src/test/java/org/nl/init/EventTest.java b/lms/nladmin-system/src/test/java/org/nl/init/EventTest.java
index 6e00c07a9..62e23540b 100644
--- a/lms/nladmin-system/src/test/java/org/nl/init/EventTest.java
+++ b/lms/nladmin-system/src/test/java/org/nl/init/EventTest.java
@@ -13,6 +13,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
 import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.mapper.BstIvtShafttubeivtMapper;
+import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
+import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
@@ -21,6 +23,8 @@ import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.first_floor_area.*;
+import org.nl.b_lms.sch.tasks.slitter.service.impl.SlitterServiceImpl;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService;
 import org.nl.common.enums.ContainerLevelEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
@@ -37,6 +41,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -73,6 +78,43 @@ public class EventTest {
     private PdmBiSubpackagerelationMapper pdmBiSubpackagerelationMapper;
     @Autowired
     private BstIvtShafttubeivtMapper bstIvtShafttubeivtMapper;
+    @Autowired
+    private SchBasePointMapper schBasePointMapper;
+    @Autowired
+    private IPdmBiSlittingproductionplanService slittingproductionplanService;
+    @Test
+    public void sss() {
+        System.out.println(schBasePointMapper.queryKZPoint());
+    }
+
+    @Test
+    public void getWeight() {
+        List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByQzzNos(Arrays.asList("B203-4"));
+        String weights = "";
+        SlitterTaskUtil.setPaperWeightStr(weights, plans);
+        slittingproductionplanService.updateBatchById(plans);
+        System.out.println(weights);
+    }
+
+    @Test
+    public void testValidate() {
+        // 示例数据
+        JSONArray jsonArray = JSONArray.parseArray(
+                "[{\"container_name\":\"A\", \"site\":\"1\"},{\"container_name\":\"B\", \"site\":\"2\"}]"
+        );
+
+        PdmBiSlittingproductionplan p1 = new PdmBiSlittingproductionplan();
+        PdmBiSlittingproductionplan p2 = new PdmBiSlittingproductionplan();
+        p1.setContainer_name("A");
+        p1.setUp_or_down("1");
+        p2.setContainer_name("B");
+        p2.setUp_or_down("2");
+        List<PdmBiSlittingproductionplan> plans = Arrays.asList(p1, p2);
+
+        // 执行校验
+        SlitterTaskUtil.validateConsistency(jsonArray, plans);
+    }
+
 
     @Autowired
     private IDeliverycachepointivtService deliverycachepointivtService;
diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development
index 3e1472584..79da18d26 100644
--- a/lms/nladmin-ui/.env.development
+++ b/lms/nladmin-ui/.env.development
@@ -1,8 +1,8 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:9999'
-VUE_APP_WS_API = 'ws://localhost:9999'
+VUE_APP_BASE_API  = 'http://127.0.0.1:8013'
+VUE_APP_WS_API = 'ws://127.0.0.1:8013'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/lms/nladmin-ui/package.json b/lms/nladmin-ui/package.json
index 47d2ec533..1c54f3758 100644
--- a/lms/nladmin-ui/package.json
+++ b/lms/nladmin-ui/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev2": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "build:prod": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
diff --git a/lms/nladmin-ui/public/config.js b/lms/nladmin-ui/public/config.js
index 5fc1438c5..a4c28810e 100644
--- a/lms/nladmin-ui/public/config.js
+++ b/lms/nladmin-ui/public/config.js
@@ -1,9 +1,9 @@
 window.g = {
   dev: {
-    VUE_APP_BASE_API: 'http://localhost:8020'
+    VUE_APP_BASE_API: 'http://localhost:8081'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://localhost:8020'
+    VUE_APP_BASE_API: 'http://localhost:8081'
 
   }
 
diff --git a/lms/nladmin-ui/src/assets/images/empty.png b/lms/nladmin-ui/src/assets/images/empty.png
new file mode 100644
index 000000000..ee838b670
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/empty.png differ
diff --git a/lms/nladmin-ui/src/assets/images/empty2.png b/lms/nladmin-ui/src/assets/images/empty2.png
new file mode 100644
index 000000000..fb9656491
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/empty2.png differ
diff --git a/lms/nladmin-ui/src/assets/images/showTube.png b/lms/nladmin-ui/src/assets/images/showTube.png
new file mode 100644
index 000000000..8120004c7
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/showTube.png differ
diff --git a/lms/nladmin-ui/src/components/Dict/Dict.js b/lms/nladmin-ui/src/components/Dict/Dict.js
index b6a9cc697..9e0421305 100644
--- a/lms/nladmin-ui/src/components/Dict/Dict.js
+++ b/lms/nladmin-ui/src/components/Dict/Dict.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { get as getDictDetail } from '@/views/system/dict/dictDetail'
+import { getDictDetails as getDictDetail } from '@/views/system/dict/dictDetail'
 
 export default class Dict {
   constructor(dict) {
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js
index bb77adce0..190917cac 100644
--- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js
@@ -24,4 +24,27 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function showDetail(data) {
+  return request({
+    url: 'api/bstIvtStockingivt/showDetail',
+    method: 'post',
+    data
+  })
+}
+
+export function showDetail2(params) {
+  return request({
+    url: 'api/bstIvtStockingivt/showDetail2',
+    method: 'get',
+    params
+  })
+}
+export function showBom2(params) {
+  return request({
+    url: 'api/bstIvtStockingivt/showBom2',
+    method: 'get',
+    params
+  })
+}
+
+export default { add, edit, del, showDetail, showDetail2, showBom2 }
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
index daaa66ac9..0555d498d 100644
--- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
@@ -83,12 +83,27 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        @selection-change="crud.selectionChangeHandler"
+      >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
+        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')"/>
+<!--          <template slot-scope="scope">
+            <el-link type="primary" @click="toView(scope.$index, scope.row)">{{ scope.row.point_code }}</el-link>
+          </template>
+        </el-table-column>-->
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
-        <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" />
-        <el-table-column prop="product_area" label="区域" :min-width="flexWidth('product_area',crud.data,'区域')" />
+        <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="toView2(scope.$index, scope.row)">{{ scope.row.vehicle_code }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')">
           <template slot-scope="scope">
             {{ dict.label.STOCK_POINT_TYPE[scope.row.point_type] }}
@@ -105,10 +120,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="sort_seq" label="顺序号" :min-width="flexWidth('sort_seq',crud.data,'顺序号')" />
-        <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')" />
+        <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
+          <template slot-scope="scope">
+            {{ scope.row.is_used === '1' ? '启用' : '禁用' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column prop="plan" label="规划" :min-width="flexWidth('plan',crud.data,'规划')" />
@@ -125,16 +142,17 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <tube-dialog2 :dialog-show.sync="showView2" :rowmst="mstrow" @AddChanged="querytable" />
   </div>
 </template>
 
 <script>
 import crudBstIvtStockingivt from './bstIvtStockingivt'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import TubeDialog2 from '@/views/b_lms/bst/ivt/stockingivt/tubeDialog2.vue'
 
 const defaultForm = {
   ivt_id: null,
@@ -159,7 +177,7 @@ const defaultForm = {
 export default {
   name: 'BstIvtStockingivt',
   dicts: ['STOCK_POINT_STATUS', 'STOCK_POINT_TYPE', 'point_location'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { TubeDialog2, pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -203,12 +221,26 @@ export default {
         create_time: [
           { required: true, message: '创建时间不能为空', trigger: 'blur' }
         ]
-      }}
+      },
+      showView: false,
+      vehicle_code: '',
+      showView2: false,
+      rows: [],
+      mstrow: {}
+    }
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    querytable() {
+      this.$refs.table.clearSelection()
+      this.crud.toQuery()
+    },
+    toView2(index, row) {
+      this.showView2 = true
+      this.mstrow = row
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog.vue b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog.vue
new file mode 100644
index 000000000..0798b8676
--- /dev/null
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog.vue
@@ -0,0 +1,125 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" title="托盘详情">
+    <div class="grid-container">
+      <div
+        v-for="(row, rowIndex) in grid"
+        :key="rowIndex"
+        class="grid-row"
+      >
+        <div
+          v-for="(cell, colIndex) in row"
+          :key="colIndex"
+          class="grid-cell"
+        >
+          <img
+            :src="cell.have_qzz == '0' ? imageC : cell.have_qzz == '1' ? imageA : imageB"
+            alt="方块"
+            class="grid-image"
+          >
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import crudBstIvtStockingivt from './bstIvtStockingivt'
+
+export default {
+  name: 'TubeDialog',
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rows: {
+      type: Object
+    },
+    vehicleCode: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      form: {},
+      imageA: require('@/assets/images/empty.png'), // 默认图片路径
+      imageC: require('@/assets/images/empty2.png'), // 默认图片路径
+      imageB: require('@/assets/images/showTube.png'), // 特殊状态图片路径
+      grid: Array(5).fill().map(() =>
+        Array(5).fill().map(() => ({
+          have_qzz: false
+        }))
+      )
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rows: {
+      handler(newValue) {
+        this.grid = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // this.queryTableDtl()
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.currentDis = {}
+      this.currentdtl = null
+      this.tableDtl = []
+      this.tabledis = []
+      this.$emit('AddChanged')
+    },
+    // toggleCell(row, col) {
+    //   console.log(this.grid)
+    //   this.$set(this.grid[row], col, {
+    //     ...this.grid[row][col],
+    //     have_qzz: !this.grid[row][col].have_qzz
+    //   })
+    // },
+    queryTableDtl() {
+      const param = {
+        vehicle_code: this.vehicle_code
+      }
+      crudBstIvtStockingivt.showDetail(param).then(res => {
+        this.grid = res
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.grid-container {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.grid-row {
+  display: flex;
+  gap: 5px;
+  justify-content: center;
+}
+
+.grid-cell {
+  width: 50px;
+  height: 50px;
+  cursor: pointer;
+  border: 1px solid #ddd;
+  transition: all 0.3s;
+}
+
+.grid-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+</style>
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog2.vue b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog2.vue
new file mode 100644
index 000000000..a5ee96653
--- /dev/null
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog2.vue
@@ -0,0 +1,114 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="托盘详情"
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <div class="grid-container">
+      <el-table
+        ref="table2"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column min-width="50" show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" />
+        <el-table-column min-width="50" show-overflow-tooltip prop="row_num" label="排" align="center" />
+        <el-table-column prop="material_code" label="物料号" align="center" width="150" />
+        <el-table-column prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="50" prop="qty" label="数量" align="center" :formatter="crud.formatNum0" />
+        <el-table-column prop="update_time" label="修改时间" align="center" />
+        <el-table-column prop="update_optname" label="修改人" align="center" />
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import crudBstIvtStockingivt from './bstIvtStockingivt'
+import { crud } from '@crud/crud'
+
+export default {
+  name: 'TubeDialog2',
+  components: { },
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableDtl: [],
+      form: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.queryTableDtl()
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.tableDtl = []
+      this.$emit('AddChanged')
+    },
+    queryTableDtl() {
+      crudBstIvtStockingivt.showDetail2({ 'vehicle_code': this.form.vehicle_code }).then(res => {
+        this.tableDtl = res
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.grid-container {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.grid-row {
+  display: flex;
+  gap: 5px;
+  justify-content: center;
+}
+
+.grid-cell {
+  width: 50px;
+  height: 50px;
+  cursor: pointer;
+  border: 1px solid #ddd;
+  transition: all 0.3s;
+}
+
+.grid-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+</style>
diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue
index 418d0c685..7b3de2254 100644
--- a/lms/nladmin-ui/src/views/login.vue
+++ b/lms/nladmin-ui/src/views/login.vue
@@ -162,53 +162,53 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.login {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-size: cover;
-}
-.title {
-  margin: 0 auto 30px auto;
-  text-align: center;
-  color: #006cb6;
-}
-.sidebar-logo2 {
-  width: 370px;
-  height: 56px;
-  position: absolute; /* 绝对定位 */
-  top: 8px; /* 顶部对齐 */
-  left: 8px; /* 左侧对齐 */
-}
-.login-form {
-  border-radius: 6px;
-  background-color: rgb(252, 247, 247, 0.5); /* 白色背景，50%透明度 */
-  width: 385px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
+  .login {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    background-size: cover;
+  }
+  .title {
+    margin: 0 auto 30px auto;
+    text-align: center;
+    color: #006cb6;
+  }
+  .sidebar-logo2 {
+    width: 370px;
+    height: 56px;
+    position: absolute; /* 绝对定位 */
+    top: 8px; /* 顶部对齐 */
+    left: 8px; /* 左侧对齐 */
+  }
+  .login-form {
+    border-radius: 6px;
+    background-color: rgb(252, 247, 247, 0.5); /* 白色背景，50%透明度 */
+    width: 385px;
+    padding: 25px 25px 5px 25px;
+    .el-input {
       height: 38px;
+      input {
+        height: 38px;
+      }
+    }
+    .input-icon{
+      height: 39px;width: 14px;margin-left: 2px;
     }
   }
-  .input-icon{
-    height: 39px;width: 14px;margin-left: 2px;
+  .login-tip {
+    font-size: 13px;
+    text-align: center;
+    color: #bfbfbf;
   }
-}
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.login-code {
-  width: 33%;
-  display: inline-block;
-  height: 38px;
-  float: right;
-  img{
-    cursor: pointer;
-    vertical-align:middle
+  .login-code {
+    width: 33%;
+    display: inline-block;
+    height: 38px;
+    float: right;
+    img{
+      cursor: pointer;
+      vertical-align:middle
+    }
   }
-}
 </style>
diff --git a/lms/nladmin-ui/src/views/loki/api/loki.js b/lms/nladmin-ui/src/views/loki/api/loki.js
index 8cc509d5a..039744d3f 100644
--- a/lms/nladmin-ui/src/views/loki/api/loki.js
+++ b/lms/nladmin-ui/src/views/loki/api/loki.js
@@ -22,5 +22,12 @@ export function clearLogs(param) {
     data: param
   })
 }
+export function downloadData(param) {
+  return request({
+    url: '/api/pdmBiSubpackagerelation/downloadData',
+    method: 'post',
+    responseType: 'blob'
+  })
+}
 
-export default { getLogData, labelsValues, clearLogs }
+export default { getLogData, labelsValues, clearLogs, downloadData }
diff --git a/lms/nladmin-ui/src/views/loki/view/index.vue b/lms/nladmin-ui/src/views/loki/view/index.vue
index 3b5987867..e33752bd1 100644
--- a/lms/nladmin-ui/src/views/loki/view/index.vue
+++ b/lms/nladmin-ui/src/views/loki/view/index.vue
@@ -7,7 +7,7 @@
           <el-select
             v-model="system"
             clearable
-            style="width: 100px; height: 35px;top: -5px;"
+            style="width: 100px; height: 35px;top: 0px;"
             placeholder="所属标签"
           >
             <el-option
@@ -22,7 +22,7 @@
           <el-select
             v-model="logLevelValue"
             clearable
-            style="width: 100px; height: 35px;top: -5px;"
+            style="width: 100px; height: 35px;top: 0px;"
             placeholder="日志级别"
           >
             <el-option
@@ -34,11 +34,26 @@
           </el-select>
         </el-form-item>
         <el-form-item label="接口">
+        <el-select
+          v-model="requestMethod"
+          clearable
+          filterable
+          style="width: 150px; height: 35px;top: 0px;"
+          placeholder="接口"
+        >
+          <el-option
+            v-for="item in interfaces"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        </el-form-item>
+        <el-form-item >
           <el-input
             v-model="requestMethod"
             size="mini"
-            placeholder="请输入内容"
-            clearable
+            placeholder="接口地址"
           />
         </el-form-item>
         <el-form-item label="关键字">
@@ -135,6 +150,7 @@
         </el-form-item>
         <el-form-item>
           <el-button @click="clearLogs">清空日志</el-button>
+          <el-button @click="downloadData">导出分切数据</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -180,6 +196,7 @@
 <script>
 
 import logOperation from '@/views/loki/api/loki'
+import { downloadFile } from '@/utils'
 
 let queryParam = {
   logLevel: null,
@@ -200,6 +217,7 @@ export default {
     return {
       labelsOptions: [], // 所有标签和对应所有值数据
       systemOptions: [], // 所有标签和对应所有值数据
+      interfaces: [], // 所有标签和对应所有值数据
       logLevelValue: '',
       system: '',
       timeRange: [],
@@ -274,7 +292,7 @@ export default {
   },
   created() {
     this.initLabelsValues('logLevel')
-    this.initLabelsValues('system')
+    this.initLabelsValues('interface')
   },
   methods: {
     fontType(level) {
@@ -294,8 +312,8 @@ export default {
         if (type === 'logLevel') {
           this.labelsOptions = res
         }
-        if (type === 'system') {
-          this.systemOptions = res
+        if (type === 'interface') {
+          this.interfaces = res
         }
       })
     },
@@ -376,6 +394,12 @@ export default {
     },
     changetype() {
 
+    },
+    downloadData() {
+      logOperation.downloadData().then(result => {
+        debugger
+        downloadFile(result, '导出数据', 'xlsx')
+      });
     },
     clearParam() {
       queryParam = {
diff --git a/lms/nladmin-ui/src/views/system/dict/dictDetail.js b/lms/nladmin-ui/src/views/system/dict/dictDetail.js
index b9f5ea31f..063c985d3 100644
--- a/lms/nladmin-ui/src/views/system/dict/dictDetail.js
+++ b/lms/nladmin-ui/src/views/system/dict/dictDetail.js
@@ -49,4 +49,12 @@ export function edit(data) {
   })
 }
 
-export default { get, add, edit, del, getDictMap }
+export function getDictDetails(data) {
+  return request({
+    url: 'api/dict/dictDetail/post',
+    method: 'post',
+    data
+  })
+}
+
+export default { get, add, edit, del, getDictMap, getDictDetails }
diff --git a/lms/nladmin-ui/src/views/system/notice/NoticeIcon.vue b/lms/nladmin-ui/src/views/system/notice/NoticeIcon.vue
index 4d5037190..4920c815d 100644
--- a/lms/nladmin-ui/src/views/system/notice/NoticeIcon.vue
+++ b/lms/nladmin-ui/src/views/system/notice/NoticeIcon.vue
@@ -1,36 +1,37 @@
 <template>
   <el-popover
+    v-model="visible"
     placement="top-end"
     width="900"
     trigger="manual"
-    v-model="visible">
+  >
     点击信息标识已读
-    <div style="margin: 5px" v-loading="loading">
-      <el-tabs v-model="activeName" @tab-click="handleClick" >
-        <el-tab-pane :label="d.label" :name="d.value" v-for="d in dict.notice_type" :key="d.id"  >
-          <el-empty v-if="notReadMsgList && notReadMsgList[d.value-1] && notReadMsgList[d.value-1].length === 0" description="暂无信息" ></el-empty>
+    <div v-loading="loading" style="margin: 5px">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane v-for="d in dict.notice_type" :key="d.id" :label="d.label" :name="d.value">
+          <el-empty v-if="notReadMsgList && notReadMsgList[d.value-1] && notReadMsgList[d.value-1].length === 0" description="暂无信息" />
           <div v-for="o in notReadMsgList[d.value-1]" :key="o.notice_id">
             <a href="javascript:" @click="showMessage(o)">
               <el-row @click="showMessage">
                 <el-col :span="2">
                   <el-tag type="danger">{{ dict.label.notice_type[o.notice_type] }}</el-tag>
                 </el-col>
-                <el-col :span="15" style="font-weight: bolder">{{o.notice_title}}</el-col>
-                <el-col :span="7" style="color: #cccccc">{{o.create_time}}</el-col>
+                <el-col :span="15" style="font-weight: bolder">{{ o.notice_title }}</el-col>
+                <el-col :span="7" style="color: #cccccc">{{ o.create_time }}</el-col>
               </el-row>
-              <el-divider ></el-divider>
+              <el-divider />
             </a>
           </div>
         </el-tab-pane>
       </el-tabs>
       <div style="text-align: right">
         <el-button type="text" @click="visible = !visible">取消</el-button>
-        <el-button type="text" @click="toSiteMessage" >查看更多>></el-button>
+        <el-button type="text" @click="toSiteMessage">查看更多>></el-button>
       </div>
     </div>
     <span slot="reference" @click="fetchNotice">
       <el-badge :value="notReadMsgCount" :hidden="notReadMsgCount==0">
-        <el-icon class="el-icon-bell" style="font-size: 22px;"></el-icon>
+        <el-icon class="el-icon-bell" style="font-size: 22px;" />
       </el-badge>
     </span>
   </el-popover>
@@ -57,6 +58,15 @@ export default {
   beforeMount() {
     this.getMessage()
   },
+  mounted() {
+    this.getMessage()
+    this.receivedCount()
+    this.initStageData()
+    this.$bus.on(NOTICE_MESSAGE_UPDATE, this.receivedCount) // 监听事件
+  },
+  destroyed() {
+    this.$bus.off(NOTICE_MESSAGE_UPDATE)
+  },
   methods: {
     /**
      * 打开列表页
@@ -94,7 +104,7 @@ export default {
     },
     // 定时获取消息数量
     initStageData() {
-      // todo: 定时器
+      // 定时器
       this.timer = setInterval(() => {
         console.log('定时器启动')
         this.receivedCount()
@@ -125,15 +135,6 @@ export default {
       // console.log(this.dict.notice_type)
       // console.log(tab, event)
     }
-  },
-  mounted() {
-    this.getMessage()
-    this.receivedCount()
-    this.initStageData()
-    this.$bus.on(NOTICE_MESSAGE_UPDATE, this.receivedCount) // 监听事件
-  },
-  destroyed() {
-    this.$bus.off(NOTICE_MESSAGE_UPDATE)
   }
 }
 </script>
diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue
index 5e4bfb0fa..b4206307b 100644
--- a/lms/nladmin-ui/src/views/system/user/index.vue
+++ b/lms/nladmin-ui/src/views/system/user/index.vue
@@ -260,7 +260,7 @@
           style="width: 100%;"
           @selection-change="getRows"
         >
-          <el-table-column  type="selection" width="55" />
+          <el-table-column type="selection" width="55" />
           <el-table-column prop="label" label="权限范围" />
           <el-table-column label="数据权限">
             <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js
index cdceb528e..b042aa4da 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js
@@ -31,5 +31,18 @@ export function confirmUpdate(data) {
     data
   })
 }
-
-export default { add, edit, del, confirmUpdate }
+export function getBoxTypes(params) {
+  return request({
+    url: 'api/boxtype/getBoxTypes',
+    method: 'get',
+    params
+  })
+}
+export function confirmBox(data) {
+  return request({
+    url: 'api/boxtype/confirmBox',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, confirmUpdate, getBoxTypes, confirmBox }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index 1062ac2fa..d47c4421f 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -178,6 +178,53 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
+      <el-dialog
+        title="子卷步序信息"
+        append-to-body
+        :visible.sync="dtlVisible"
+        destroy-on-close
+        width="1000px"
+      >
+        <!--表格渲染-->
+        <el-table
+          :data="childrenList"
+        >
+          <el-table-column prop="container_name" label="子卷号" show-overflow-tooltip width="210px" />
+          <el-table-column prop="spec" label="步序" show-overflow-tooltip width="120">
+            <template slot-scope="scope">
+              {{ dict.label.subSpec[scope.row.spec] }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="result" label="执行结果" show-overflow-tooltip width="120">
+            <template slot-scope="scope">
+              {{ scope.row.result.toString() }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="param" label="执行参数" show-overflow-tooltip width="150" />
+          <el-table-column prop="msg" label="备注" show-overflow-tooltip width="150" />
+          <el-table-column prop="create_time" label="创建时间">
+            <template slot-scope="scope">
+              {{ new Date(scope.row.create_time).toLocaleString() }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作">
+            <template scope="scope">
+              <el-button
+                v-if="scope.row.result==false && scope.row.url"
+                type="danger"
+                class="filter-item"
+                size="mini"
+                icon="el-icon-position"
+                @click.native.prevent="syncMes(scope.row)"
+              >同步</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!--分页组件-->
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dtlVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
@@ -445,7 +492,11 @@
           prop="container_name"
           label="子卷号"
           :min-width="flexWidth('container_name',crud.data,'子卷号')"
-        />
+        >
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.row.container_name)">{{ scope.row.container_name }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
         <el-table-column
           prop="product_description"
@@ -454,7 +505,7 @@
         />
         <el-table-column sortable prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
         <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
-        <el-table-column prop="width_standard" :formatter="crud.formatNum0" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
+        <el-table-column prop="width_standard" :formatter="crud.formatNum1" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
         <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
         <el-table-column
           prop="mass_per_unit_area"
@@ -595,7 +646,9 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
-import crudUserStor from "@/views/wms/basedata/st/userStor/userStor";
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+import crudPastivtquery from '@/views/wms/stat/pastivt/pastivtquery'
+import { format } from 'date-fns'
 
 const defaultForm = {
   workorder_id: null,
@@ -635,7 +688,7 @@ const defaultForm = {
 }
 export default {
   name: 'Subpackagerelation',
-  dicts: ['sub_package_relation', 'IS_OR_NOT'],
+  dicts: ['sub_package_relation', 'IS_OR_NOT', 'subSpec'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -650,6 +703,8 @@ export default {
   },
   data() {
     return {
+      dtlVisible: false,
+      childrenList: [],
       permission: {
         add: ['admin', 'sub:add'],
         edit: ['admin', 'sub:edit'],
@@ -739,6 +794,28 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    toView(data) {
+      crudPastivtquery.subRecord(data).then(res => {
+        if (res) {
+          this.dtlVisible = true
+          this.childrenList = res
+        }
+      })
+    },
+    async syncMes(row) {
+      const url = 'http://10.1.3.36:8081/' + row.url
+      const response = await fetch(url, {
+        method: 'POST', // *GET, POST, PUT, DELETE, etc.
+        headers: {
+          'Content-Type': 'application/json'
+          // 'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: row.param // body 数据类型必须与“Content-Type”头匹配
+      })
+      const data = await response.json()
+      window.alert(JSON.stringify(data))
+    },
+
     initQuery() {
       const end = new Date()
       const start = new Date()
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
index 02ceeef53..4988e3c48 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
@@ -21,6 +21,16 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="子卷编码">
+            <el-input
+              v-model="query.container_name"
+              clearable
+              placeholder="输入子卷编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="点位区域">
             <el-select
               v-model="query.packageinfo_area"
@@ -125,6 +135,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
+        :row-style="rowStyle"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
@@ -142,6 +153,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="container_name" label="子卷编号" width="140px" />
+        <el-table-column prop="weight" label="子卷毛重" width="100px" />
+        <el-table-column prop="paper_weight" label="纸管净重" width="100px" />
         <el-table-column prop="row_num" label="排" width="100px" />
         <el-table-column prop="col_num" label="列" width="100px" />
         <el-table-column prop="depth" label="深浅位" width="100px" />
@@ -184,7 +197,7 @@ const defaultForm = {
   qzzno: null,
   vehicle_code: null,
   point_status: null,
-  packageinfo_area: null,
+  packageinfo_area: '3',
   sch_packageinfo_status: null,
   sort_seq: null,
   is_used: null,
@@ -209,6 +222,10 @@ export default {
       idField: 'ivt_id',
       sort: 'ivt_id,desc',
       crudMethod: { ...crudDeliverypointivt },
+      query: {
+        packageinfo_area:'3',
+        size:100
+      },
       optShow: {
         add: false,
         edit: false,
@@ -239,6 +256,20 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    rowStyle({row,index}){
+      let backgroun = {}
+      if (row.container_name!=null && row.update_time!=null && row.update_time!=undefined){
+        let now = new Date()
+        let before = new Date(row.update_time)
+        const diff = now.getTime() - before.getTime();
+        let min = Math.floor(diff/(1000*60))
+        console.log(min)
+        if (min>120){
+          backgroun.background = 'red';
+        }
+      }
+      return backgroun;
+    },
     hand(value) {
       this.crud.toQuery()
     }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index f4b77ed34..8ba8d664e 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -488,7 +488,11 @@
         <el-table-column v-if="false" prop="workorder_id" label="分切计划标识" />
         <el-table-column prop="status" label="状态" :formatter="formatStatusName" />
         <el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName" />
-        <el-table-column prop="mfg_order_name" label="订单号" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="mfg_order_name" label="订单号" min-width="200"  >
+          <template slot-scope="scope">
+            <el-link type="primary" @click="toView2(scope.$index, scope.row)">{{ scope.row.mfg_order_name }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="container_name" label="子卷号" min-width="140" show-overflow-tooltip />
         <el-table-column prop="parent_container_name" label="母卷号" min-width="120" show-overflow-tooltip />
         <el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px" />
@@ -557,6 +561,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <tube-dialog2 :dialog-show.sync="showView2" :rowmst="mstrow" @AddChanged="querytable" />
   </div>
 </template>
 
@@ -565,8 +570,8 @@ import crudSlittingproductionplan from '@/views/wms/pdm/order/slittingplan/slitt
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import TubeDialog2 from '@/views/wms/pdm/order/slittingplan/tubeDialog2.vue'
 
 const defaultForm = {
   workorder_id: null,
@@ -619,7 +624,7 @@ const defaultForm = {
 export default {
   name: 'Slittingproductionplan',
   dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, TubeDialog2 },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -640,6 +645,8 @@ export default {
   data() {
     return {
       permission: {},
+      showView2: false,
+      mstrow: {},
       rules: {
         order_type: [
           { required: true, message: '分切订单类型不能为空', trigger: 'blur' }
@@ -679,6 +686,14 @@ export default {
     hand() {
       this.crud.toQuery()
     },
+    toView2(index, row) {
+      this.showView2 = true
+      this.mstrow = row
+    },
+    querytable() {
+      this.$refs.table.clearSelection()
+      this.crud.toQuery()
+    },
     upMaterFinish() {
       const _selectData = this.$refs.table.selection
       const data = {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue
new file mode 100644
index 000000000..8a84a1ab0
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue
@@ -0,0 +1,131 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="订单BOM信息"
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="600px"
+    @close="close"
+    @open="open"
+  >
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="100px" label-suffix=":">
+      <el-form-item label="id" prop="id">
+        <label slot="label">id:</label>
+        <el-input v-model="form.id" disabled placeholder="系统生成" clearable style="width: 300px" />
+      </el-form-item>
+      <el-form-item label="工单号" prop="mfgOrder">
+        <label slot="label">工单号:</label>
+        <el-input v-model="form.mfgOrder" disabled  clearable style="width: 300px" />
+      </el-form-item>
+      <el-form-item label="木箱编码" prop="productName">
+        <label slot="label">木箱编码:</label>
+        <el-input v-model="form.productName" disabled  clearable style="width: 300px" />
+      </el-form-item>
+      <el-form-item label="木箱描述" prop="description">
+        <el-select
+          v-model="form.description"
+          placeholder="木箱描述"
+          style="width: 400px"
+          class="filter-item"
+          clearable
+          filterable
+          @change="hand"
+        >
+          <el-option
+            v-for="item in typelist"
+            :key="item.box_type"
+            :label="item.box_name"
+            :value="item.box_type"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="管芯编码" prop="carrierName">
+        <label slot="label">管芯编码:</label>
+        <el-input v-model="form.carrierName" disabled clearable style="width: 300px" />
+      </el-form-item>
+      <el-form-item label="管芯描述" prop="carrierDescription">
+        <label slot="label">管芯描述:</label>
+        <el-input v-model="form.carrierDescription" disabled  clearable style="width: 300px" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="submit">保 存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudBstIvtStockingivt from '@/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt'
+import crudBoxtype from '@/views/wms/basedata/st/boxType/boxtype'
+import CRUD, { crud } from '@crud/crud'
+
+export default {
+  name: 'TubeDialog2',
+  components: {},
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      typelist: [],
+      form: {},
+      row: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.row = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.queryTableDtl()
+      this.getBoxTypes()
+    },
+    hand(value) {
+      this.form.productName = value
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.form = {}
+      this.$emit('AddChanged')
+    },
+    getBoxTypes() {
+      crudBoxtype.getBoxTypes().then(res => {
+        this.typelist = res
+      })
+    },
+    submit() {
+      crudBoxtype.confirmBox(this.form).then(res => {
+        this.typelist = res
+        this.crud.notify('保存成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.close()
+      })
+    },
+    queryTableDtl() {
+      crudBstIvtStockingivt.showBom2({ 'mfg_order_name': this.row.mfg_order_name }).then(res => {
+        this.form = res
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 39370fd29..c6d9b33c5 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -276,8 +276,9 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       if (this.query_flag) {
-        this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
-        this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+        const afterD = new Date(new Date().getTime() + 2 * 8.64E7)
+        this.crud.query.begin_time = (new Date().daysAgo(3)).strftime('%F', 'zh')
+        this.crud.query.end_time = (afterD).strftime('%F', 'zh')
         this.query_flag = false
       }
     },
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
index 184ad3321..cc529a231 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
@@ -396,6 +396,7 @@ export default {
       this.allDivBtn = true
       const data = {}
       data.sect_id = this.sect_id
+      data.stor_id = this.stor_id
       data.iostorinv_id = this.openParam[0].iostorinv_id
       crudRawAssist.allDivStruct(data).then(res => {
         crudRawAssist.getIODtl({ 'bill_code': this.openParam[0].bill_code, 'open_flag': '1' }).then(res => {
diff --git a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
index d625b3867..f74242a65 100644
--- a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
@@ -167,17 +167,14 @@
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker/index'
 import crudOutchargefrom from '@/views/wms/st/outcharge/outcharge'
-import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Outcharge',
-  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker, ViewDialog },
+  components: { crudOperation, rrOperation, pagination, ViewDialog },
   cruds() {
     return CRUD({
       title: '出库冲销',
@@ -245,9 +242,6 @@ export default {
       this.$set(this.query, 'createTime', [startDate, endDate])
       this.crud.toQuery()
     },
-    // [CRUD.HOOK.beforeRefresh]() {
-    //   return false
-    // },
     toView(index, row) {
       this.mstrow = row
       this.viewShow = true
diff --git a/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js b/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js
index 37698e6eb..b107a4a78 100644
--- a/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js
+++ b/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js
@@ -24,4 +24,11 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function subRecord(code) {
+  return request({
+    url: '/api/pdmProductSpec/subSpec/'+code,
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, subRecord }
diff --git a/lms/nladmin-ui/vue.config.js b/lms/nladmin-ui/vue.config.js
index 9cea9e1b6..43e738a3d 100644
--- a/lms/nladmin-ui/vue.config.js
+++ b/lms/nladmin-ui/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 }
 
 const name = defaultSettings.title // 网址标题
-const port = 8013 // 端口配置
+const port = 8081 // 端口配置
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {