From ce84f2ce50a87f970000a29e7b69bea1f515115c Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Fri, 27 Dec 2024 16:14:11 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=A5=BC?=
 =?UTF-8?q?=E5=86=85=E5=8C=85=E9=97=B4=E7=82=B9=E4=BD=8D=E7=A7=BB=E5=BA=93?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PdmBiSubpackagerelationServiceImpl.java   |  74 ++--
 .../mapper/BstIvtPackageinfoivtMapper.java    |   2 +-
 .../dao/mapper/BstIvtPackageinfoivtMapper.xml |  32 +-
 .../service/IbstIvtPackageinfoivtService.java |  18 +-
 .../impl/BstIvtPackageinfoivtServiceImpl.java | 336 +++++++++++++----
 .../service/impl/SchBaseTaskServiceImpl.java  |   3 +-
 .../sch/tasks/first_floor_area/DjqTask.java   |  67 ++--
 .../first_floor_area/DjqToKzjhcwTask.java     |  59 ++-
 .../sch/tasks/first_floor_area/GzqTask.java   |  55 ++-
 .../first_floor_area/GzqToKzjhcwTask.java     |  52 +--
 .../sch/tasks/first_floor_area/MzhcwTask.java |  41 +-
 .../first_floor_area/SendDjqKzjTask.java      |   8 +-
 .../first_floor_area/SendGzqKzjTask.java      |   8 +-
 .../tasks/first_floor_area/ShiftingTask.java} |  98 ++---
 .../tasks/first_floor_area/SsxDjwTask.java    |  16 +-
 .../sch/tasks/first_floor_area/ZxDjwTask.java |  19 +-
 .../sch/tasks/first_floor_area/ZxqTask.java   |  12 +-
 .../auto/AutoExecuteShiftingTask.java         | 107 ++++++
 .../auto/AutoExecuteWaitTask.java             |  10 +-
 .../auto/AutoSendDjqToGzq.java                | 185 +++++++--
 .../auto/AutoSendGzqToDjq.java                | 117 +++---
 .../auto/AutoSendMzToDjq.java                 | 206 ++++------
 .../first_floor_area/auto/AutoSendToZxq.java  |  16 +-
 .../auto/AutoSendVehicleToDjq.java            | 170 +++++----
 .../auto/AutoSendVehicleToKzj.java            | 301 ++++++++-------
 .../auto/AutoSendZxToDjw.java                 | 352 +++++-------------
 .../auto/ManualSendToZxq.java                 |  54 ---
 .../first_floor_area/auto/TaskQueue.java      | 140 ++++++-
 .../acs/service/impl/AcsToWmsServiceImpl.java |  27 +-
 .../mes/service/impl/MesToLmsServiceImpl.java |   5 +-
 .../src/views/wms/pdm/sub/DivDialog.vue       |   4 +-
 .../src/views/wms/sch/task/index.vue          |  29 +-
 .../first_floor_area/auto/AutoSendToZxq.java  |  40 --
 .../auto/AutoSendVehicleToDjq.java            |  65 ----
 34 files changed, 1528 insertions(+), 1200 deletions(-)
 rename lms/{test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java => nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java} (61%)
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java
 delete mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/ManualSendToZxq.java
 delete mode 100644 lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
 delete mode 100644 lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java

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 399594ea5..1ccdd7d7e 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
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j;
-import org.apache.commons.collections4.CollectionUtils;
+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;
@@ -94,9 +94,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     @Resource
     private IPdmBiOrderbominfoService iPdmBiOrderbominfoService;
 
-
-
-
     @Resource
     private OutBoxManageService outBoxManageService;
 
@@ -178,7 +175,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                 throw new BadRequestException("子卷号不能为空!");
             }
             List<BstIvtPackageinfoivt> ivtList = packageinfoivtService.list(new QueryWrapper<BstIvtPackageinfoivt>().eq("container_name", whereJson.get("container_name").toString()).eq("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("合格品")));
-            if (CollectionUtils.isEmpty(ivtList)) {
+            if (ObjectUtils.isEmpty(ivtList)) {
                 throw new BadRequestException("该子卷未质检或品质不符合要求，请扫码质检!");
             }
             if (ivtList.stream().noneMatch(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")))) {
@@ -247,12 +244,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         //子卷信息校验
         checkEntityList(whereJson, packagerelationList);
         //均衡获取木箱出库装箱区对接位
-        String deviceCode = getPointCode();
-        Integer taskCount = bstIvtPackageinfoivtMapper.getZxqTaskCount(deviceCode.substring(deviceCode.lastIndexOf("_") + 1));
-        //每个装箱区只能搬10个子卷
-        if (taskCount + packagerelationList.size() > 10) {
-            throw new BadRequestException("子卷搬运任务数已达上限!");
-        }
+        String deviceCode = getPointCode(packagerelationList.size());
         try {
             List<String> workIdList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class).stream()
                     .map(PdmBiSubpackagerelation::getWorkorder_id)
@@ -267,7 +259,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                     .eq(PdmBiSlittingproductionplan::getIs_delete,IOSEnum.IS_NOTANDYES.code("否"))
             );
 
-            if (CollectionUtils.isEmpty(planList)) {
+            if (ObjectUtils.isEmpty(planList)) {
                 throw new BadRequestException("子卷查询不到分切计划，请检查!");
             }
             BigDecimal totalWeight;
@@ -300,7 +292,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         if (jsonArray == null || jsonArray.size() == 0) {
             throw new BadRequestException("无选中子卷信息");
         }
-        if (CollectionUtils.isEmpty(packagerelationList)) {
+        if (ObjectUtils.isEmpty(packagerelationList)) {
             throw new BadRequestException("无选中子卷信息");
         }
         //检查是否存在已分配规格的子卷号
@@ -436,43 +428,53 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     }
 
 
-
-    private String getPointCode() {
-        //均衡获取木箱出库装箱区对接位
-        List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_status, "5").eq(BstIvtPackageinfoivt::getIs_used, "1").orderByAsc(BstIvtPackageinfoivt::getPoint_code));
-        if (CollectionUtils.isEmpty(bstIvtPackageinfoivtList)) {
+    private String getPointCode(Integer entitySize) {
+        //装箱区对接位
+        List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱位")).eq(BstIvtPackageinfoivt::getIs_used, IOSEnum.IS_NOTANDYES.code("是")).orderByAsc(BstIvtPackageinfoivt::getPoint_code));
+        if (ObjectUtils.isEmpty(bstIvtPackageinfoivtList)) {
             throw new BadRequestException("没有可用的装箱区对接位");
         }
         Map<String, Integer> resultMap = new LinkedHashMap<>();
-        //获取装箱位任务数量
-        List<Map<String, Object>> taskCount = bstIvtPackageinfoivtMapper.getPointTaskCount();
-        if (taskCount != null) {
-            for (Map<String, Object> map : taskCount) {
-                Object pointCode2Obj = map.get("point_code2");
+        Set<String> zxIvtSet = bstIvtPackageinfoivtList.stream().map(BstIvtPackageinfoivt::getBlock).collect(Collectors.toSet());
+        //装箱区任务数
+        List<Map<String, Object>> zxTaskCount = bstIvtPackageinfoivtMapper.getZxqTaskCount(zxIvtSet);
+        if (ObjectUtils.isNotEmpty(zxTaskCount)) {
+            for (Map<String, Object> map : zxTaskCount) {
+                String pointCode = map.get("point_code2").toString();
                 Object countObj = map.get("count");
-                if (pointCode2Obj != null && countObj != null) {
-                    String pointCode2 = pointCode2Obj.toString();
+                if (pointCode != null && countObj != null) {
                     Long countLong = (Long) countObj;
-                    Integer count = countLong.intValue();
-                    resultMap.merge(pointCode2, count, Integer::sum);
+                    List<BstIvtPackageinfoivt> pointList = bstIvtPackageinfoivtList.stream().filter(r -> r.getBlock().equals(pointCode) || r.getPoint_code().equals(pointCode)).collect(Collectors.toList());
+                    if (ObjectUtils.isNotEmpty(pointList)) {
+                        pointList.forEach(r -> {
+                            if (r.getPoint_code().equals(pointCode) || r.getBlock().equals(pointCode)) {
+                                resultMap.merge(pointList.get(0).getPoint_code(), countLong.intValue(), Integer::sum);
+                            }
+                        });
+                    }
                 }
             }
         }
+        //装箱位有木箱也计算任务数
         bstIvtPackageinfoivtList.stream()
                 .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq))
                 .forEach(p -> {
-                    String key = p.getPoint_code();
                     int value = StringUtils.isNotBlank(p.getContainer_name()) ? 1 : 0;
-                    resultMap.merge(key, value, Integer::sum);
+                    resultMap.merge(p.getPoint_code(), value, Integer::sum);
                 });
         List<Map<String, Integer>> result = resultMap.entrySet().stream()
                 .map(entry -> Collections.singletonMap(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toList());
+        //任务数量超过10个不满足装箱任务创建
+        result.removeIf(map -> {
+            Map.Entry<String, Integer> entry = map.entrySet().iterator().next();
+            return entry.getValue() + entitySize > 10;
+        });
         //获取数量最少的点位
         Optional<String> minPointCode = result.stream()
                 .min(Comparator.comparingInt(map -> map.entrySet().iterator().next().getValue()))
                 .map(map -> map.keySet().iterator().next());
-        return minPointCode.orElseGet(() -> bstIvtPackageinfoivtList.get(0).getPoint_code());
+        return minPointCode.orElseThrow(() -> new BadRequestException("装箱区任务已满，请等待装箱任务完成再操作"));
     }
 
 
@@ -512,9 +514,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             throw new BadRequestException("输入的子卷号不能为空！");
         }
         List<PdmBiSubpackagerelation> subList = this.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getContainer_name, jo.getString("container_name")));
-        if (CollectionUtils.isEmpty(subList)) {
-            List<PdmBiSlittingproductionplan>  planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
-            if (CollectionUtils.isEmpty(planList)) {
+        if (ObjectUtils.isEmpty(subList)) {
+            List<PdmBiSlittingproductionplan> planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
+            if (ObjectUtils.isEmpty(planList)) {
                 throw new BadRequestException("未查询到可用的分切计划！");
             }
             PdmBiSlittingproductionplan plan = planList.get(0);
@@ -564,7 +566,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                 .filter(r -> containerNameList.contains(r.getContainer_name()))
                 .collect(Collectors.toList());
         //任务组id
-        String groupId = deviceCode.substring(deviceCode.lastIndexOf("_") + 1);
+        String groupId = deviceCode.substring(deviceCode.indexOf("_") + 1, deviceCode.indexOf("_", deviceCode.indexOf("_") + 1));
         RLock lock = redissonClient.getLock(groupId);
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
@@ -575,7 +577,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                     //校验重复任务
                     List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, r.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)) {
+                    if (ObjectUtils.isEmpty(taskList)) {
                         JSONObject jo = new JSONObject();
                         //确定搬运任务不执行
                         jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"));
@@ -595,7 +597,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                         schBaseTaskList.add(task);
                     }
                 });
-                if (CollectionUtils.isNotEmpty(schBaseTaskList)) {
+                if (ObjectUtils.isNotEmpty(schBaseTaskList)) {
                     taskQueue.addTasksToQueue(groupId, schBaseTaskList);
                 }
             } else {
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 b19d72e27..b4dd5b081 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
@@ -26,7 +26,7 @@ public interface BstIvtPackageinfoivtMapper extends BaseMapper<BstIvtPackageinfo
     /**
      * 获取待检区到装箱区的任务数量
      */
-    Integer getZxqTaskCount(String groupId);
+    List<Map<String, Object>> getZxqTaskCount(Set<String> groupIds);
 
 
     /**
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 bce455291..b42c76402 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
@@ -10,16 +10,29 @@
           AND t.task_status <![CDATA[ < ]]> '07'
         GROUP BY t.point_code2
     </select>
-    <select id="getZxqTaskCount" resultType="java.lang.Integer">
-        SELECT COUNT(1)
+    <select id="getZxqTaskCount" resultType="java.util.Map">
+        SELECT
+        CASE
+        WHEN t.task_type = '010704' THEN t.point_code2
+        WHEN t.task_type = '010908' THEN t.vehicle_code2
+        END AS point_code2,
+        COUNT(*) AS count
         FROM sch_base_task t
-        WHERE t.task_type = '010908'
-          AND t.vehicle_code2 = #{groupId}
-          AND t.task_status <![CDATA[ < ]]> '07'
-          AND t.create_time >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%s')
+        WHERE
+        t.task_type IN ('010704', '010908')
+        AND t.create_time >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%s')
+        AND t.task_status <![CDATA[ < ]]> '07'
+        <if test="groupIds != null and groupIds.size() > 0">
+            AND (t.task_type != '010908' OR t.vehicle_code2 IN
+            <foreach item="code" collection="groupIds" open="(" separator="," close=")">#{code}</foreach>
+            )
+        </if>
+        GROUP BY
+        CASE
+        WHEN t.task_type = '010704' THEN t.point_code2
+        WHEN t.task_type = '010908' THEN t.vehicle_code2
+        END
     </select>
-
-
     <select id="getTaskList1" resultType="org.nl.b_lms.sch.task.dao.SchBaseTask">
         SELECT
         TASK_CODE
@@ -42,9 +55,8 @@
         )
         AND (task_status <![CDATA[ < ]]> '07')
     </select>
-
     <select id="getTaskList" resultType="org.nl.b_lms.sch.task.dao.SchBaseTask">
-        SELECT point_code1, point_code2, point_code3, point_code4
+        SELECT task_type,task_id,point_code1, point_code2, point_code3, point_code4
         FROM SCH_BASE_TASK
         WHERE
         <trim prefix="(" suffix=")" prefixOverrides="OR">
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 376cbc309..44b80f90d 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
@@ -6,6 +6,7 @@ import java.util.List;
 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;
 
 
@@ -63,7 +64,7 @@ public interface IbstIvtPackageinfoivtService extends IService<BstIvtPackageinfo
      *  @param ivtStatus 库存状态
       * @param sortType 排序
      */
-     List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtType, String ivtStatus, String sortType);
+     List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtType, String ivtStatus, String sortType,boolean isQueryGroup);
 
 
     /**
@@ -90,6 +91,21 @@ public interface IbstIvtPackageinfoivtService extends IService<BstIvtPackageinfo
      */
     JSONObject update(JSONObject whereJson);
 
+
+
+    /**
+     * 获取移库任务目标点位
+     @param shallowIvt 浅货位
+     @param  isDjqShifting 是否获取待检区移库位
+     */
+     String getDjqShiftingPoint(BstIvtPackageinfoivt shallowIvt, boolean isDjqShifting);
+
+
+      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 f32ca51ec..4ecf682ce 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
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.SneakyThrows;
 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.pda.service.PrintTableTwoService;
@@ -28,6 +27,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.PackageInfoIvtEnum;
 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;
@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -59,6 +60,8 @@ import java.util.stream.Stream;
 public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackageinfoivtMapper, BstIvtPackageinfoivt> implements IbstIvtPackageinfoivtService {
     @Resource
     private RedissonClient redissonClient;
+    @Resource
+    private LmsToMesService lmsToMesService;
 
     @Resource
     private IschBaseTaskService taskService;
@@ -69,9 +72,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     @Resource
     private IpdmBiSubpackagerelationService subpackagerelationService;
 
-    @Resource
-    private LmsToMesService lmsToMesService;
-
     @Resource
     private IPdmBiContainerinfoService iPdmBiContainerinfoService;
 
@@ -209,13 +209,13 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     updateWrapper.set(SchBaseTask::getPoint_code1, newPoint.getPoint_code());
                     if (StringUtils.isNotBlank(newPoint.getContainer_name())) {
                         //更新子卷号
-                        updateWrapper.set(SchBaseTask::getVehicle_code, newPoint.getContainer_name());
+                        updateWrapper.set(SchBaseTask::getVehicle_code,newPoint.getContainer_name());
                     }
                 } else if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货分配").equals(actionType)) {
-                    updateWrapper.set(SchBaseTask::getPoint_code2, newPoint.getPoint_code());
+                    updateWrapper.set(SchBaseTask::getPoint_code2,newPoint.getPoint_code());
                 }
                 //标记二次分配已分配过点位
-                updateWrapper.set(SchBaseTask::getResponse_param, IOSEnum.IS_NOTANDYES.code("是"));
+                updateWrapper.set(SchBaseTask::getResponse_param,IOSEnum.IS_NOTANDYES.code("是"));
                 taskService.update(null, updateWrapper);
                 log.info("一楼装箱区二次分配" + taskCode + ",接口返回最新点位：---------------------------------------------" + newPoint.getPoint_code());
                 return newPoint.getPoint_code();
@@ -244,12 +244,25 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     public List<BstIvtPackageinfoivt> checkEndPointTask(String ivtType, String ivtStatus, String pointCode, String sortType, String taskType) {
         List<SchBaseTask> taskList;
         Set<String> pointSets;
+        boolean isQueryGroup = false;
         List<BstIvtPackageinfoivt> returList = new ArrayList<>();
-        List<BstIvtPackageinfoivt> packageinfoivtList = getBstIvtPackageinfoivts(ivtType, ivtStatus, sortType);
+        //移库任务返回点位处理
+        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("管制区->待检区"),
+                PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")));
+        if (taskTypes.contains(taskType)) {
+            //是否查询相同组的库位
+            isQueryGroup = true;
+        }
+        List<BstIvtPackageinfoivt> packageinfoivtList = getBstIvtPackageinfoivts(ivtType, ivtStatus, sortType, isQueryGroup);
         Set<String> pointIds = packageinfoivtList.stream()
                 .map(BstIvtPackageinfoivt::getPoint_code)
                 .collect(Collectors.toSet());
-        if (CollectionUtils.isEmpty(pointIds)) {
+        if (ObjectUtils.isEmpty(pointIds)) {
             return returList;
         }
         if (pointCode == null) {
@@ -262,7 +275,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"))) {
             taskList = bstIvtPackageinfoivtMapper.getTaskList(pointIds, pointIds, null, pointIds);
         } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务分配"))) {
-            // taskList = bstIvtPackageinfoivtMapper.getTaskList(pointIds, null, null, null);
             //四个点任务取货分配条件为取货完成信号即刻更新库存，所以不判断是否有起点任务
             taskList = new ArrayList<>();
         } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务取货"))) {
@@ -272,18 +284,16 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("空载具放货分配"))) {
             List<BstIvtPackageinfoivt> pointList = new ArrayList<>();
             List<BstIvtPackageinfoivt> ivtList = packageinfoivtList.stream().filter(r -> r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具"))).sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq)).collect(Collectors.toList());
+            List<BstIvtPackageinfoivt> vehicleList = packageinfoivtList.stream().filter(r -> r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))).sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq).reversed()).collect(Collectors.toList());
             //有空载具
-            if (CollectionUtils.isNotEmpty(ivtList)) {
-                //                BstIvtPackageinfoivt bstIvtPackageinfoivt = new BstIvtPackageinfoivt();
-                //                bstIvtPackageinfoivt.setPoint_code(ivtList.get(0).getPoint_code());
-                //                returList.add(bstIvtPackageinfoivt);
-                //                return returList;
+            if (ObjectUtils.isNotEmpty(ivtList)) {
                 BstIvtPackageinfoivt bstIvtPackageinfoivt = new BstIvtPackageinfoivt();
                 bstIvtPackageinfoivt.setPoint_code(ivtList.get(0).getPoint_code());
                 bstIvtPackageinfoivt.setSort_seq(ivtList.get(0).getSort_seq());
+                bstIvtPackageinfoivt.setIvt_status(ivtList.get(0).getIvt_status());
                 returList.add(bstIvtPackageinfoivt);
                 //判断是否有空载具阻挡
-                pointList.add(getBstIvtPackageinfoivt(returList, packageinfoivtList));
+                pointList.add(getSecondaryIvt(vehicleList, returList));
                 return pointList;
             } else {
                 BstIvtPackageinfoivt bstIvtPackageinfoivt = packageinfoivtList.stream().filter(r -> r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))).sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq).reversed()).collect(Collectors.toList()).get(0);
@@ -319,9 +329,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     ))
                     .filter(point -> point != null && !point.trim().isEmpty() && !point.equals("ZXQ_01_1") && !point.equals("ZXQ_01_2"))
                     .collect(Collectors.toSet());
+            //限制补空任务数量
             List<BstIvtPackageinfoivt> ivtList = packageinfoivtList.stream().filter(r -> r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具"))).collect(Collectors.toList());
             Set<String> ivtpointSets = ivtList.stream().map(BstIvtPackageinfoivt::getPoint_code).collect(Collectors.toSet());
-            if (CollectionUtils.isNotEmpty(ivtpointSets)) {
+            if (ObjectUtils.isNotEmpty(ivtpointSets)) {
                 //存在任务数量+已有库存数量大于3，不创建任务
                 if (pointSets.size() + ivtpointSets.size() >= 3) {
                     return returList;
@@ -346,44 +357,76 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     .filter(point -> point != null && !point.trim().isEmpty())
                     .collect(Collectors.toSet());
         }
+        //移库任务返回点位处理
+        if (isQueryGroup) {
+            return getBstIvtPackageinfoivts(ivtStatus, pointSets, packageinfoivtList);
+        }
         //符合条件的库存点位过滤掉已存在任务的点位
-        List<BstIvtPackageinfoivt> ivtList = packageinfoivtList.stream()
-                .filter(p -> !pointSets.contains(p.getPoint_code()))
+        List<BstIvtPackageinfoivt> planTaskList = packageinfoivtList.stream()
+                .filter(p -> !pointSets.contains(p.getPoint_code()) && p.getIvt_status().equals(ivtStatus))
                 .collect(Collectors.toList());
         //送空载具到空载具缓存位任务，需要判断是否存在已分配的且未完成的送空载具任务，如果存在，判断存在是否阻挡
         if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) || taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"))) {
-            return getNoBlockIvt(pointCode, taskList, ivtList);
+            return getNoBlockIvt(pointCode, taskList, planTaskList);
         } else {
-            return ivtList;
+            return planTaskList;
         }
     }
 
+
+    /**
+     * 过滤不符合移库条件的同组库位
+     */
+    private static List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtStatus, Set<String> pointSets, List<BstIvtPackageinfoivt> packageinfoivtList) {
+        //查询相同分组的库位
+        Map<String, List<String>> ivtLists = packageinfoivtList.stream()
+                .collect(Collectors.groupingBy(
+                        BstIvtPackageinfoivt::getCol_num,
+                        LinkedHashMap::new,
+                        Collectors.mapping(BstIvtPackageinfoivt::getPoint_code, Collectors.toList())
+                ));
+        ivtLists.entrySet().removeIf(r -> {
+            String key = r.getKey();
+            List<String> points = r.getValue();
+            return !"0".equals(key) && points.stream().anyMatch(pointSets::contains);
+        });
+        Set<String> ivtPointCodes = ivtLists.values().stream()
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+        ivtPointCodes.removeAll(pointSets);
+        return packageinfoivtList.stream()
+                .filter(r -> ivtPointCodes.contains(r.getPoint_code()) && r.getIvt_status().equals(ivtStatus))
+                .collect(Collectors.toList());
+    }
+
     /**
      * 获取没有阻挡的点位
-     * ivtList 没分配任务的点位
+     * planTaskList 存在的空载具点位
      * taskList 已分配任务的点位
      */
-    private List<BstIvtPackageinfoivt> getNoBlockIvt(String pointCode, List<SchBaseTask> taskList, List<BstIvtPackageinfoivt> ivtList) {
+    private List<BstIvtPackageinfoivt> getNoBlockIvt(String pointCode, List<SchBaseTask> taskList, List<BstIvtPackageinfoivt> planTaskList) {
         Set<String> taskPointSet = null;
-        if (CollectionUtils.isNotEmpty(taskList)) {
+        List<BstIvtPackageinfoivt> pointList = new ArrayList<>();
+        //无符合创建任务条件的点位
+        if (ObjectUtils.isEmpty(planTaskList)) {
+            return pointList;
+        }
+        //筛选出完成分配的进行中的补空任务
+        if (ObjectUtils.isNotEmpty(taskList)) {
             taskPointSet = taskList.stream().map(SchBaseTask::getPoint_code2).filter(pointCode2 -> !pointCode2.equals("ZXQ_01_1") && !pointCode2.equals("ZXQ_01_2")).collect(Collectors.toSet());
         }
-        List<BstIvtPackageinfoivt> pointList = new ArrayList<>();
         //存在补空载具任务已分配却未完成的任务
-        if (CollectionUtils.isEmpty(taskPointSet)) {
-            List<BstIvtPackageinfoivt> vehicleList = ivtList.stream()
-                    .filter(n -> n.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具")))
-                    .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq))
-                    .collect(Collectors.toList());
-            pointList.add(getBstIvtPackageinfoivt(vehicleList, ivtList));
-            return pointList;
-        } else {
+        if (ObjectUtils.isNotEmpty(taskPointSet)) {
             List<BstIvtPackageinfoivt> existPointList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().in(BstIvtPackageinfoivt::getPoint_code, taskPointSet));
             existPointList = existPointList.stream().peek(r -> r.setIvt_status(PackageInfoIvtEnum.IVT_STATUS.code("空载具"))).collect(Collectors.toList());
             if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"))) {
                 return existPointList;
             }
-            pointList.add(getBstIvtPackageinfoivt(existPointList, ivtList));
+            pointList.add(getBstIvtPackageinfoivt(existPointList, planTaskList));
+            return pointList;
+        } else {
+            List<BstIvtPackageinfoivt> notEmptyivtList = getBstIvtPackageinfoivts(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), false);
+            pointList.add(getBstIvtPackageinfoivt(planTaskList, notEmptyivtList));
             return pointList;
         }
     }
@@ -410,7 +453,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     ));
             //是否有执行中已分配补空载具任务
             List<SchBaseTask> taskList1 = taskList.stream().filter(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) || r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(taskList1)) {
+            if (ObjectUtils.isNotEmpty(taskList1)) {
                 List<SchBaseTask> taskList2 = taskList1.stream().filter(r -> StringUtils.isNotBlank(r.getResponse_param())).collect(Collectors.toList());
                 if (taskList2.size() == 1) {
                     //校验已分配的补空载具任务是否为当前请求的任务，是可重新分配，否不允许重新分配
@@ -426,7 +469,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             //是否有执行中的行架任务，有等待取空载具任务完成再分配
             List<SchBaseTask> taskList3 = taskList.stream().filter(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"))
                     || r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(taskList3)) {
+            if (ObjectUtils.isNotEmpty(taskList3)) {
                 if (taskList3.stream().allMatch(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")))) {
                     if (taskList3.get(0).getTask_status().equals(TaskStatusEnum.SURE_END.getCode())) {
                         return;
@@ -449,15 +492,15 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区")));
             //满轴缓存位->待检区agv任务如果分配了起点，是否发送取货完成信息，否，则需等待此任务发送取货完成信号才能分配第2个任务的起点
             List<SchBaseTask> taskList1 = taskList.stream().filter(r -> StringUtils.isNotBlank(r.getResponse_param())).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(taskList1)) {
+            if (ObjectUtils.isNotEmpty(taskList1)) {
                 //多个已分配的未完成的取满轴任务，需要全部取货完成才能继续分配
                 List<SchBaseTask> taskList2 = taskList1.stream().filter(r -> StringUtils.isBlank(r.getRequest_param())).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(taskList2)) {
+                if (ObjectUtils.isNotEmpty(taskList2)) {
                     log.info("一楼装箱区取货分配" + baseTask.getTask_code() + ",分配失败，存在已分配的取满轴任务编号为:" + taskList2.get(0).getTask_code() + "的任务未完成，请检查！");
                     throw new BadRequestException("一楼装箱区取货分配" + baseTask.getTask_code() + ",分配失败，存在已分配的取满轴任务编号为:" + taskList2.get(0).getTask_code() + "的任务未完成，请检查！");
                 }
                 List<SchBaseTask> taskList3 = taskList1.stream().filter(r -> StringUtils.isNotBlank(r.getRequest_param())).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(taskList3)) {
+                if (ObjectUtils.isNotEmpty(taskList3)) {
                     if (taskList3.stream().anyMatch(r -> !r.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成")))) {
                         log.info("一楼装箱区取货分配" + baseTask.getTask_code() + ",分配失败，存在已分配的取满轴任务编号为:" + taskList3.get(0).getTask_code() + "的任务未完成，请检查！");
                         throw new BadRequestException("一楼装箱区取货分配" + baseTask.getTask_code() + ",分配失败，存在已分配的取满轴任务编号为:" + taskList3.get(0).getTask_code() + "的任务未完成，请检查！");
@@ -471,11 +514,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     /**
      * 根据点位类型查询库存
      *
-     * @param ivtType   点位类型
-     * @param ivtStatus 库存状态
-     * @param sortType  排序
+     * @param ivtType      点位类型
+     * @param ivtStatus    库存状态
+     * @param sortType     排序
+     * @param isQueryGroup 是否查询相同组的库位
      */
-    public List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtType, String ivtStatus, String sortType) {
+    public List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtType, String ivtStatus, String sortType, boolean isQueryGroup) {
         LambdaQueryWrapper<BstIvtPackageinfoivt> queryWrapper = new LambdaQueryWrapper<BstIvtPackageinfoivt>()
                 .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
                 .eq(BstIvtPackageinfoivt::getPoint_status, ivtType);
@@ -489,7 +533,17 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         } else {
             queryWrapper.orderByAsc(BstIvtPackageinfoivt::getSort_seq);
         }
-        return bstIvtPackageinfoivtMapper.selectList(queryWrapper);
+        List<BstIvtPackageinfoivt> ivtList = bstIvtPackageinfoivtMapper.selectList(queryWrapper);
+        if (isQueryGroup && ObjectUtils.isNotEmpty(ivtList)) {
+            Set<String> colNumSet = ivtList.stream().map(BstIvtPackageinfoivt::getCol_num).collect(Collectors.toSet());
+            //无分组点位
+            if (colNumSet.contains("0")) {
+                return ivtList;
+            }
+            return bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_status, ivtType).eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用")).in(BstIvtPackageinfoivt::getCol_num, colNumSet));
+        } else {
+            return ivtList;
+        }
     }
 
 
@@ -502,17 +556,19 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
                 .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("等待点"))
                 .eq(BstIvtPackageinfoivt::getBlock, block));
-        if (CollectionUtils.isEmpty(waitPointList)) {
+        if (ObjectUtils.isEmpty(waitPointList)) {
             throw new BadRequestException("找不到等待点！");
         }
         List<BstIvtPackageinfoivt> waitPoints = waitPointList.stream().filter(r -> r.getPoint_location().equals(waitPointType)).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(waitPoints)) {
+        if (ObjectUtils.isEmpty(waitPoints)) {
             throw new BadRequestException("找不到等待点！");
         }
         return waitPoints.get(0).getPoint_code();
     }
 
 
+
+
     /**
      * 更新点位状态
      *
@@ -530,14 +586,14 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         }
         //取货任务
         if (actionType.equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
+            if (StringUtils.isNotBlank(baseTask.getRequest_param())) {
+                if (baseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
+                    throw new BadRequestException(baseTask.getTask_code() + "取货完成失败" + ",该任务已发送过取货完成信号请勿频繁发送！");
+                }
+            }
             if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区")) ||
                     baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")) ||
                     baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))) {
-                if (StringUtils.isNotBlank(baseTask.getRequest_param())) {
-                    if (baseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
-                        throw new BadRequestException(baseTask.getTask_code() + "取货完成失败" + ",该任务已发送过取货完成信号请勿频繁发送！");
-                    }
-                }
                 //取满轴
                 if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"))) {
                     BstIvtPackageinfoivt ivtInfo = packageinfoivtService.getOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
@@ -554,13 +610,34 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     if (baseTask.getVehicle_code().equals(ivtInfo.getContainer_name())) {
                         upDateIvtOrTask(baseTask, baseTask.getPoint_code1());
                     }
+                    handleGroupTask(baseTask);
                 } else if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")) || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"))) {
                     String pointCode = baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")) ? baseTask.getPoint_code3() : baseTask.getPoint_code1();
                     upDateIvtOrTask(baseTask, pointCode);
-
                 }
             }
+            //            else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ||
+            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) ||
+            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区")) ||
+            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区")) ||
+            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) ||
+            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
+            //                    || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
+            //            )) {
+            //                //取货完成信号
+            //                upDateIvtOrTask(baseTask, baseTask.getPoint_code1());
+            //                handleGroupTask(baseTask);
+            //            }
+            else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) ||
+                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
+                    || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
+            )) {
+                //取货完成信号
+                upDateIvtOrTask(baseTask, baseTask.getPoint_code1());
+                handleGroupTask(baseTask);
+            }
         } else {
+            //放货完成信号请求
             if (StringUtils.isNotBlank(baseTask.getCar_no())) {
                 if (baseTask.getCar_no().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货完成"))) {
                     throw new BadRequestException(baseTask.getTask_code() + "放货完成失败" + ",该任务已发送过放货完成信号请勿频繁发送！");
@@ -570,7 +647,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             List<BstIvtPackageinfoivt> ivtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
                     .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
                     .eq(BstIvtPackageinfoivt::getPoint_code, baseTask.getPoint_code2()));
-            if (CollectionUtils.isEmpty(ivtList)) {
+            if (ObjectUtils.isEmpty(ivtList)) {
                 throw new BadRequestException("任务编号为：" + baseTask.getTask_code() + "放货完成的目标点位不存在！");
             }
             if (ivtList.get(0).getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))) {
@@ -591,6 +668,63 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         }
     }
 
+    public void handleGroupTask(SchBaseTask baseTask) {
+        if (StringUtils.isNotBlank(baseTask.getTask_group_id())) {
+            //存在关联的未完成的任务组任务
+            SchBaseTask groupTask = taskService.getOne(new LambdaQueryWrapper<SchBaseTask>()
+                    .eq(SchBaseTask::getTask_id, baseTask.getTask_group_id())
+                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_SEND.code("否"))
+                    .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
+            if (groupTask != null) {
+                switch (groupTask.getTask_type()) {
+                    //待检区->装箱区
+                    case "010908":
+                        //groupTask.setPoint_code1(baseTask.getPoint_code1());
+                        sendTask(groupTask);
+                        break;
+                    //待检，管制移库任务
+                    case "010914":
+                    case "010915":
+                        if (groupTask.getTask_status().equals(TaskStatusEnum.SURE_START.getCode())) {
+                            BstIvtPackageinfoivt shallowIvt = packageinfoivtService.getOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, groupTask.getPoint_code1()));
+                            String pointCode2 = groupTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")) ? packageinfoivtService.getDjqShiftingPoint(shallowIvt, true) : packageinfoivtService.getDjqShiftingPoint(shallowIvt, false);
+                            if (StringUtils.isNotBlank(pointCode2)) {
+                                groupTask.setPoint_code2(pointCode2);
+                                sendTask(groupTask);
+                            }
+                        } else {
+                            sendTask(groupTask);
+                        }
+                        break;
+                    default:
+                        sendTask(groupTask);
+                }
+                //清除起点库存,标记任务已接收取货信号
+                upDateIvtOrTask(baseTask, baseTask.getPoint_code1());
+                //清除任务组标记
+                UpdateWrapper<SchBaseTask> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("task_id", baseTask.getTask_id());
+                updateWrapper.set("task_group_id", null);
+                taskService.update(null, updateWrapper);
+            }
+        }
+    }
+
+    /**
+     * 任务下发
+     */
+    @SneakyThrows
+    private void sendTask(SchBaseTask groupTask) {
+        if (StringUtils.isBlank(groupTask.getPoint_code1()) || StringUtils.isBlank(groupTask.getPoint_code2())) {
+            log.info("装箱区->待检区任务下发失败：" + groupTask.getTask_code() + "，任务类型：" + groupTask.getTask_type() + "，起点或终点为空，请检查！");
+        }
+        groupTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+        taskService.updateById(groupTask);
+        Object obj = SpringContextHolder.getBean(Class.forName(groupTask.getHandle_class()));
+        Method m = obj.getClass().getMethod("immediateNotifyAcs", String.class);
+        m.invoke(obj, groupTask.getTask_id());
+    }
+
 
     /**
      * 取货完成更新点位或任务标识
@@ -603,12 +737,14 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         updateWrapper.set("container_name", null);
         bstIvtPackageinfoivtMapper.update(null, updateWrapper);
         log.info("一楼装箱区二次分配清空库存" + baseTask.getTask_code() + ",执行成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code());
-        //标记agv取满轴或四个点或两个点放满轴任务取空载具完成
+        //标记agv取货完成
         UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
         updateWrapper1.eq("task_id", baseTask.getTask_id());
         updateWrapper1.set("request_param", PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"));
-        taskService.update(null, updateWrapper1);
+        taskService.update(null,updateWrapper1);
         log.info("一楼装箱区二次分配取货完成" + baseTask.getTask_code() + ",取货完成信号接收成功，点位：" + pointCode + "子卷号：" + baseTask.getVehicle_code());
+
+
     }
 
     /**
@@ -639,7 +775,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         //根据任务类型返回点位分配规则
         BstIvtPackageinfoivt ivtInfo = getIvtInfoFromRegion(baseTask.getTask_type(), actionType);
         List<BstIvtPackageinfoivt> newPointList = packageinfoivtService.checkEndPointTask(bstIvtPackageinfoivt.getPoint_status(), ivtInfo.getIvt_status(), targetPoint, ivtInfo.getSort_seq().toString(), "");
-        if (CollectionUtils.isEmpty(newPointList)) {
+        if (ObjectUtils.isEmpty(newPointList)) {
             log.info("一楼装箱区二次分配任务编号为:" + baseTask.getTask_code() + ",分配失败，暂无点位资源或点位外层有载具阻挡！");
             throw new BadRequestException("一楼装箱区二次分配任务编号为:" + baseTask.getTask_code() + ",分配失败，暂无点位资源或点位外层有载具阻挡！");
         }
@@ -653,7 +789,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     public BstIvtPackageinfoivt checkIvtSBlock(SchBaseTask baseTask) {
         BstIvtPackageinfoivt newPoint = new BstIvtPackageinfoivt();
         List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), null, (PackageInfoIvtEnum.TASK_POINT_TYPE.code("空载具放货分配")), PackageInfoIvtEnum.SORT_TYPE.code("降序"), baseTask.getTask_type());
-        if (CollectionUtils.isNotEmpty(kzjIvtList)) {
+        if (ObjectUtils.isNotEmpty(kzjIvtList)) {
             return kzjIvtList.get(0);
         } else {
             return newPoint;
@@ -664,29 +800,41 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     /**
      * 判断点位是否有外层阻挡
      */
-    private static BstIvtPackageinfoivt getBstIvtPackageinfoivt(List<BstIvtPackageinfoivt> vehicleList, List<BstIvtPackageinfoivt> kzjIvtList) {
+    private static BstIvtPackageinfoivt getBstIvtPackageinfoivt(List<BstIvtPackageinfoivt> vehicleList,List<BstIvtPackageinfoivt> kzjIvtList) {
         boolean hasEmptyVehicle;
         BstIvtPackageinfoivt newPoint = new BstIvtPackageinfoivt();
-        if (CollectionUtils.isNotEmpty(vehicleList)) {
-            BigDecimal sortSeq = vehicleList.get(0).getSort_seq();
+        if (ObjectUtils.isNotEmpty(vehicleList)) {
             hasEmptyVehicle = kzjIvtList.stream()
-                    .noneMatch(r -> r.getSort_seq().compareTo(sortSeq) < 0 &&
+                    .noneMatch(r -> r.getSort_seq().compareTo(vehicleList.get(0).getSort_seq()) < 0 &&
                             r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具")));
             //有阻挡
             if (!hasEmptyVehicle) {
                 return newPoint;
             } else {
-                List<BstIvtPackageinfoivt> pointCodeList = kzjIvtList.stream()
-                        .filter(r -> r.getSort_seq().compareTo(sortSeq) < 0)
-                        .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq).reversed())
-                        .collect(Collectors.toList());
-                if (CollectionUtils.isEmpty(pointCodeList)) {
-                    return newPoint;
-                }
-                return pointCodeList.get(0);
+                return vehicleList.get(0);
             }
         } else {
-            return kzjIvtList.get(0);
+            return newPoint;
+        }
+    }
+
+    /**
+     * 根据库存和空载具返回空点位
+     */
+    private static BstIvtPackageinfoivt getSecondaryIvt(List<BstIvtPackageinfoivt> vehicleList, List<BstIvtPackageinfoivt> kzjIvtList) {
+        List<BstIvtPackageinfoivt>  emptyVehicleList;
+        BstIvtPackageinfoivt newPoint = new BstIvtPackageinfoivt();
+        if (ObjectUtils.isNotEmpty(vehicleList)) {
+            emptyVehicleList = vehicleList.stream()
+                    .filter(r -> r.getSort_seq().compareTo(kzjIvtList.get(0).getSort_seq()) < 0 ).collect(Collectors.toList());
+            //有空位匹配
+            if (ObjectUtils.isNotEmpty(emptyVehicleList)) {
+                return emptyVehicleList.get(0);
+            } else {
+                return newPoint;
+            }
+        } else {
+            return newPoint;
         }
     }
 
@@ -775,6 +923,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     }
 
 
+
+
     /**
      * 创建
      *
@@ -805,6 +955,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
      * 手持子卷质检
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public JSONObject update(JSONObject whereJson) {
         JSONObject result = new JSONObject();
         if (StringUtils.isBlank(whereJson.getString("ivt_status"))) {
@@ -918,6 +1069,51 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         return result;
     }
 
+    /**
+     * 获取移库任务目标点位
+     *
+     * @param shallowIvt    浅货位
+     * @param isDjqShifting 是否获取待检区移库位
+     */
+    @Override
+    public String getDjqShiftingPoint(BstIvtPackageinfoivt shallowIvt, boolean isDjqShifting) {
+        if (isDjqShifting) {
+            List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(
+                    PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
+                    PackageInfoIvtEnum.IVT_STATUS.code("空"),
+                    PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"),
+                    PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
+            if (ObjectUtils.isNotEmpty(djqPackageinfoivtList)) {
+                return djqPackageinfoivtList.get(0).getPoint_code();
+            } else if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具"))) {
+                List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(
+                        PackageInfoIvtEnum.POINT_STATUS.code("管制区"),
+                        PackageInfoIvtEnum.IVT_STATUS.code("空"),
+                        PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"),
+                        PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
+                return gzqPackageinfoivtList.get(0).getPoint_code();
+            }
+        } else {
+            List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(
+                    PackageInfoIvtEnum.POINT_STATUS.code("管制区"),
+                    PackageInfoIvtEnum.IVT_STATUS.code("空"),
+                    PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"),
+                    PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
+            if (ObjectUtils.isNotEmpty(djqPackageinfoivtList)) {
+                return djqPackageinfoivtList.get(0).getPoint_code();
+            } else if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具"))) {
+                List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(
+                        PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
+                        PackageInfoIvtEnum.IVT_STATUS.code("空"),
+                        PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"),
+                        PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
+                return gzqPackageinfoivtList.get(0).getPoint_code();
+            }
+        }
+        return null;
+    }
+
+
     /**
      * 多选删除
      *
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 bbb8379e0..2cff1f339 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
@@ -7,6 +7,7 @@ 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.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
@@ -139,7 +140,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         LambdaQueryWrapper<SchBaseTask> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
         queryWrapper.eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"));
-        if (CollectionUtils.isNotEmpty(taskTypes)) {
+        if (ObjectUtils.isNotEmpty(taskTypes)) {
             queryWrapper.in(SchBaseTask::getTask_type, taskTypes);
         }
         return this.list(queryWrapper);
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 0e9db40a6..1bc87ccb1 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
@@ -6,11 +6,12 @@ import cn.hutool.core.util.BooleanUtil;
 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.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 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.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
@@ -29,7 +30,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -52,7 +52,8 @@ public class DjqTask extends AbstractAcsTask {
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
-
+    @Resource
+    private ShiftingTask shiftingTask;
     @Resource
     private TaskQueueManager taskQueueManager;
 
@@ -101,18 +102,18 @@ public class DjqTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + DateUtil.now() + "被调用---------------------------------------------");
             //1.校验agv任务取货完成信号
             if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
                 if (!schBaseTask.getRequest_param().equals("98") && !schBaseTask.getRequest_param().equals("99")) {
                     //agv取货完成信号未发送
                     if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
-                        log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！！！");
+                        log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！已通过任务完成自动清空点位:"+schBaseTask.getPoint_code1()+"的库存，子卷号为:"+schBaseTask.getVehicle_code());
                     }
                 }
             } else {
                 //agv取货完成信号未发送
-                log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！！！");
+                log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！已通过任务完成自动清空点位:"+schBaseTask.getPoint_code1()+"的库存，子卷号为:"+schBaseTask.getVehicle_code());
             }
             //2.改变起点点位状态，满轴位->待检区，二次分配取货完成信号发送就改起点库存,检查起点库存是否清空
             BstIvtPackageinfoivt ivtPoint = packageinfoivtService.getOne(new LambdaUpdateWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, schBaseTask.getPoint_code1()));
@@ -128,40 +129,35 @@ 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("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("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("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
             //4.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
-            //5.清除首次分配目标点位
+            //5.更新并清除预分配位
+            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
+                    .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"))
+                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_SEND.code("否"))
+                    .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
+            List<SchBaseTask> SamePointtaskList = taskList.stream().filter(r -> r.getPoint_code3().equals(schBaseTask.getPoint_code1())&&!r.getTask_id().equals(schBaseTask.getTask_id())).collect(Collectors.toList());
+            if (ObjectUtils.isNotEmpty(SamePointtaskList)) {
+                UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.eq("task_id", SamePointtaskList.get(0).getTask_id());
+                updateWrapper1.set("point_code3", schBaseTask.getPoint_code3());
+                taskService.update(null, updateWrapper1);
+            }
             updateWrapper.set(SchBaseTask::getPoint_code3, "");
-            //6.判断是否存在确定起点的输送线->满轴缓存位任务,存在就下发任务
-            //            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
-            //                    //确定起点未下发
-            //                    .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())
-            //                    .eq(SchBaseTask::getPoint_code1, "NBJ1002")
-            //                    .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))
-            //                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
-            //            );
-            //            if (CollectionUtils.isNotEmpty(taskList)) {
-            //                SchBaseTask task = taskList.get(0);
-            //                task.setPoint_code2(schBaseTask.getPoint_code1());
-            //                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
-            //                taskService.update(task);
-            //                //任务下发
-            //                mzhcwTask.immediateNotifyAcs(task.getTask_id().toString());
-            // }
-            //5搬运装箱区
-            //sendDjqToZxq(schBaseTask);
+            //6.判断是否存在任务组任务
+            packageinfoivtService.handleGroupTask(schBaseTask);
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
@@ -171,11 +167,17 @@ public class DjqTask extends AbstractAcsTask {
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-            updateWrapper.set(SchBaseTask::getRemark,"任务被ACS在:" + schBaseTask.getUpdate_time() + "调用接口强制取消。");
+            updateWrapper.set(SchBaseTask::getRemark, "任务被ACS在:" + schBaseTask.getUpdate_time() + "调用接口强制取消。");
         }
         taskService.update(null, updateWrapper);
     }
 
+    private void sendTask(SchBaseTask groupTask) {
+        groupTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+        taskService.updateById(groupTask);
+        shiftingTask.immediateNotifyAcs(null);
+        log.info("移库任务编号为：" + groupTask.getTask_code() + ",任务状态为：" + groupTask.getTask_status() + "下发完成。");
+    }
 
 
     @Override
@@ -211,6 +213,7 @@ public class DjqTask extends AbstractAcsTask {
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .request_param(form.getString("request_param"))
                 .handle_class(THIS_CLASS)
+                .task_group_id(form.getString("task_group_id"))
                 .create_id(SecurityUtils.getCurrentUserId())
                 .create_name(SecurityUtils.getCurrentUsername())
                 .create_time(DateUtil.now())
@@ -232,7 +235,7 @@ public class DjqTask extends AbstractAcsTask {
     public void sendDjqToZxq(SchBaseTask schBaseTask) {
         //装箱区有空位
         List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-        if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
+        if (ObjectUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
             Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream()
                     .collect(Collectors.groupingBy(
                             BstIvtPackageinfoivt::getPoint_code,
@@ -269,8 +272,8 @@ public class DjqTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
-        taskService.update(null,updateWrapper);
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + DateUtil.now() + "强制取消。");
+        taskService.update(null, updateWrapper);
     }
 
 
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 c13c6b196..1c2c253b6 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
@@ -6,10 +6,12 @@ import cn.hutool.core.util.BooleanUtil;
 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.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 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;
@@ -26,10 +28,10 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 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.stream.Collectors;
 
 
 /**
@@ -96,23 +98,26 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + DateUtil.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("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("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
                 //3.更改任务状态为完成
                 updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
-                //4.清除首次分配目标点位
+                //4.更新并清除预分配位
+                exchangeTaskPoint(schBaseTask);
                 updateWrapper.set(SchBaseTask::getPoint_code4, "");
-                //3.待检区或管制区搬运空载具到空载具缓存位完毕，判断是否存在确定终点的空载具缓存位->输送线任务,存在就下发任务
+                //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 (CollectionUtils.isNotEmpty(taskList)) {
+                //            if (ObjectUtils.isNotEmpty(taskList)) {
                 //                SchBaseTask task = taskList.get(0);
                 //                task.setPoint_code1(schBaseTask.getPoint_code2());
                 //                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
@@ -134,6 +139,25 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
         taskService.update(null, updateWrapper);
     }
 
+    public void exchangeTaskPoint(SchBaseTask schBaseTask) {
+        List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
+                .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
+                .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
+                .and(
+                        r -> r.eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"))
+                                .or()
+                                .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))
+                                .or()
+                ));
+        List<SchBaseTask> SamePointtaskList = taskList.stream().filter(r -> r.getPoint_code4().equals(schBaseTask.getPoint_code2())&&!r.getTask_id().equals(schBaseTask.getTask_id())).collect(Collectors.toList());
+        if (ObjectUtils.isNotEmpty(SamePointtaskList)) {
+            UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
+            updateWrapper1.eq("task_id", SamePointtaskList.get(0).getTask_id());
+            updateWrapper1.set("point_code4", schBaseTask.getPoint_code4());
+            taskService.update(null, updateWrapper1);
+        }
+    }
+
     @Override
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
@@ -163,6 +187,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
                 .point_code2(pointCode2)
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
+                .task_group_id(form.getString("task_group_id"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)
@@ -211,8 +236,8 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
-        taskService.update(null,updateWrapper);
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + DateUtil.now() + "强制取消。");
+        taskService.update(null, updateWrapper);
     }
 
 
@@ -230,14 +255,14 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     //        } else {
     //            //待检区有空载具且过滤未完成任务
     //            List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务取货分配"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-    //            if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
+    //            if (ObjectUtils.isNotEmpty(djqPackageinfoivtList)) {
     //                //无二次分配
     //                List<BstIvtPackageinfoivt> notNeedAllocation = djqPackageinfoivtList.stream().filter(r -> !r.getWait_point_type().equals(PackageInfoIvtEnum.WAIT_POINT_TYPE.code("待检区等待点"))).collect(Collectors.toList());
-    //                if (CollectionUtils.isNotEmpty(notNeedAllocation)) {
+    //                if (ObjectUtils.isNotEmpty(notNeedAllocation)) {
     //                    pointCode1 = notNeedAllocation.get(0).getPoint_code();
     //                    task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
     //                } else {
-    //                    if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
+    //                    if (ObjectUtils.isNotEmpty(djqPackageinfoivtList)) {
     //                        pointCode1 = packageinfoivtService.getWaitPoint(djqPackageinfoivtList.get(0).getBlock(), djqPackageinfoivtList.get(0).getWait_point_type());
     //                        task.put("vehicle_code1", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
     //                        task.put("point_code3", djqPackageinfoivtList.get(0).getPoint_code());
@@ -246,7 +271,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     //            } else {
     //                //管制区有空位
     //                List<BstIvtPackageinfoivt> gzqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货分配"), "", "");
-    //                if (CollectionUtils.isNotEmpty(gzqList)) {
+    //                if (ObjectUtils.isNotEmpty(gzqList)) {
     //                    //需要二次分配，起点分配等待点
     //                    pointCode1 = packageinfoivtService.getWaitPoint(gzqList.get(0).getBlock(), gzqList.get(0).getWait_point_type());
     //                    task.put("point_code3", gzqList.get(0).getPoint_code());
@@ -254,7 +279,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     //                }
     //            }
     //            //去待检区或管制区搬运空载具
-    //            if (CollectionUtils.isNotEmpty(kzjIvtList) && pointCode1 != null) {
+    //            if (ObjectUtils.isNotEmpty(kzjIvtList) && pointCode1 != null) {
     //                task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
     //                task.put("point_code1", pointCode1);
     //                //送空二次分配，目标点分配等待点
@@ -276,18 +301,18 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     //            //查询装箱区有空载具
     //            List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
     //            //装箱区有空载具
-    //            if (CollectionUtils.isNotEmpty(zxqPointList)) {
+    //            if (ObjectUtils.isNotEmpty(zxqPointList)) {
     //                pointCode1 = zxqPointList.get(0).getPoint_code();
     //            } else {
     //                //待检区有空载具
     //                List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-    //                if (CollectionUtils.isNotEmpty(djqPointList)) {
+    //                if (ObjectUtils.isNotEmpty(djqPointList)) {
     //                    pointCode1 = djqPointList.get(0).getPoint_code();
     //                }
     //            }
     //        }
     //        //去装箱区搬运空载具
-    //        if (CollectionUtils.isNotEmpty(kzjIvtList) && pointCode1 != null) {
+    //        if (ObjectUtils.isNotEmpty(kzjIvtList) && pointCode1 != null) {
     //            toKzjHcwTask.put("point_code1", pointCode1);
     //            //送到到任意空载具缓存位
     //            toKzjHcwTask.put("point_code2", kzjIvtList.get(0).getPoint_code());
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 ddda262d9..bca51e491 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
@@ -18,7 +18,6 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -27,7 +26,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +46,8 @@ public class GzqTask extends AbstractAcsTask {
     private IschBaseTaskService taskService;
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
-
+    @Resource
+    private ShiftingTask shiftingTask;
     @Override
     public List<AcsTaskDto> addTask() {
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
@@ -95,31 +94,16 @@ public class GzqTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             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()));
-            //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()));
-            //3.更改任务状态为完成
-           updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
-           //3.判断是否存在确定起点的输送线->满轴缓存位任务,存在就下发任务
-            //            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
-            //                    //确定起点未下发
-            //                    .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())
-            //                    .eq(SchBaseTask::getPoint_code1, "NBJ1002")
-            //                    .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))
-            //                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
-            //            );
-            //            if (CollectionUtils.isNotEmpty(taskList)) {
-            //                SchBaseTask task = taskList.get(0);
-            //                task.setPoint_code2(schBaseTask.getPoint_code1());
-            //                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
-            //                taskService.update(task);
-            //                //任务下发
-            //                mzhcwTask.immediateNotifyAcs(task.getTask_id().toString());
-            //            }
-        }
+                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.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.更新库存记录
+                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()));
+                //3.更改任务状态为完成
+                updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
+                //4.判断是否存在任务组任务
+                packageinfoivtService.handleGroupTask(schBaseTask);
+            }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
@@ -133,6 +117,18 @@ public class GzqTask extends AbstractAcsTask {
         taskService.update(null,updateWrapper);
     }
 
+    private void sendTask(SchBaseTask schBaseTask, SchBaseTask groupTask) {
+        groupTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+        taskService.updateById(groupTask);
+        shiftingTask.immediateNotifyAcs(null);
+        log.info("移库任务编号为：" + groupTask.getTask_code() + ",任务状态为：" + groupTask.getTask_status() + "下发完成。");
+        //清除任务组标记
+        UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("task_id", schBaseTask.getTask_id());
+        updateWrapper1.set("task_group_id", null);
+        taskService.update(null, updateWrapper1);
+    }
+
     @Override
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
@@ -163,6 +159,7 @@ public class GzqTask extends AbstractAcsTask {
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
                 .request_param(form.getString("request_param"))
+                .task_group_id(form.getString("task_group_id"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)
@@ -211,7 +208,7 @@ public class GzqTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
+        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
         taskService.update(null,updateWrapper);
     }
 
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 b6c50eac0..90b24fa54 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
@@ -26,7 +26,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +47,9 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     @Resource
     private IschBaseTaskService taskService;
 
+    @Resource
+    private DjqToKzjhcwTask djqToKzjhcwTask;
+
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
@@ -98,26 +100,29 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             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()));
-            //2.更新库存记录
-            packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
-            //3.更改任务状态为完成
-            updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
-            //4.清除首次分配目标点位
-            updateWrapper.set(SchBaseTask::getPoint_code4, "");
-            //3.待检区或管制区搬运空载具到空载具缓存位完毕，判断是否存在确定终点的空载具缓存位->输送线任务,存在就下发任务
-            //            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 (CollectionUtils.isNotEmpty(taskList)) {
-            //                SchBaseTask task = taskList.get(0);
-            //                task.setPoint_code1(schBaseTask.getPoint_code2());
-            //                task.setTask_status(TaskStatusEnum.START_AND_POINT.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()));
+                //2.更新库存记录
+                packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
+                //3.更改任务状态为完成
+                updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
+                //4.更新并清除预分配位
+                djqToKzjhcwTask.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());
@@ -167,6 +172,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
                 .point_code4(form.getString("point_code4"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
+                .task_group_id(form.getString("task_group_id"))
                 .handle_class(THIS_CLASS)
                 .create_id(SecurityUtils.getCurrentUserId())
                 .create_name(SecurityUtils.getCurrentUsername())
@@ -213,8 +219,8 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
-        taskService.update(null,updateWrapper);
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + DateUtil.now() + "强制取消。");
+        taskService.update(null, updateWrapper);
     }
 
 
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 94a58cbf1..59635c86b 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
@@ -7,9 +7,10 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 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.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
@@ -30,7 +31,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -124,28 +124,32 @@ public class MzhcwTask extends AbstractAcsTask {
         }
         // 完成
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+                log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + DateUtil.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("放货完成"))) {
-                        log.info(schBaseTask.getTask_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()));
+                        log.info(schBaseTask.getTask_code() + "检查检查->输送线点位-满轴缓存位，桁架放货完成信号未发送！已在手动点击完成时增加满轴位:" + schBaseTask.getPoint_code2() + "的库存，子卷号为："+schBaseTask.getVehicle_code());
                     }
                 } else {
-                    //桁架取货完成信号未发送
-                    log.info(schBaseTask.getTask_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()));
+                    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("取货完成"))) {
-                            log.info(schBaseTask.getTask_code() + "检查检查->四个点任务，桁架取货完成信号未发送！！！");
+                            packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().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 {
                         //桁架取货完成信号未发送
-                        log.info(schBaseTask.getTask_code() + "检查检查->四个点任务，桁架取货完成信号未发送！！！");
+                        packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().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.更新库存记录
@@ -159,7 +163,7 @@ public class MzhcwTask extends AbstractAcsTask {
                 //校验任务是否存在
                 //                List<String> taskTypes = new ArrayList<>(Collections.singletonList(PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")));
                 //                List<SchBaseTask> existTask = taskService.getExistTasks(taskTypes);
-                //                if (CollectionUtils.isEmpty(existTask)) {
+                //                if (ObjectUtils.isEmpty(existTask)) {
                 //                    List<BstIvtPackageinfoivt> kzjPointList = packageinfoivtService
                 //                            .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
                 //                                    .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
@@ -205,7 +209,7 @@ public class MzhcwTask extends AbstractAcsTask {
                         r -> r.in(SchBaseTask::getPoint_code2, packageinfoivtList)
                 ));
         //没有正在搬运空载具过来的任务，创建搬运空载具任务
-        if (CollectionUtils.isEmpty(taskList)) {
+        if (ObjectUtils.isEmpty(taskList)) {
             //查询待检区或管制区有空载具的
             List<BstIvtPackageinfoivt> djqOrGzqPointList = packageinfoivtService
                     .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
@@ -213,14 +217,14 @@ public class MzhcwTask extends AbstractAcsTask {
                             .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空载具")).orderByAsc(BstIvtPackageinfoivt::getSort_seq));
             List<BstIvtPackageinfoivt> djqPointList = djqOrGzqPointList.stream().filter(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区"))).collect(Collectors.toList());
             //待检区库位有空载具
-            if (CollectionUtils.isNotEmpty(djqPointList)) {
+            if (ObjectUtils.isNotEmpty(djqPointList)) {
                 List<BstIvtPackageinfoivt> kzjPoint = packageinfoivtList.stream()
                         .filter(r -> PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status()))
                         .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq))
                         .collect(Collectors.toList());
                 //创建搬运空载具任务
                 JSONObject toKzjHcwTask = new JSONObject();
-                if (CollectionUtils.isNotEmpty(djqPointList)) {
+                if (ObjectUtils.isNotEmpty(djqPointList)) {
                     //优先去待检区取空载具
                     toKzjHcwTask.put("point_code1", djqPointList.get(0).getPoint_code());
                 } else {
@@ -257,7 +261,7 @@ public class MzhcwTask extends AbstractAcsTask {
         List<BstIvtPackageinfoivt> djqPointList = bstIvtPackageinfoivtList.stream()
                 .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("待检区").equals(r.getPoint_status())
                         && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(djqPointList)) {
+        if (ObjectUtils.isEmpty(djqPointList)) {
             throw new BadRequestException("待检区暂无空余库位!");
         }
         toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
@@ -294,7 +298,7 @@ public class MzhcwTask extends AbstractAcsTask {
             List<BstIvtPackageinfoivt> djqPointList = bstIvtPackageinfoivtList.stream()
                     .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("待检区").equals(r.getPoint_status())
                             && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(djqPointList)) {
+            if (ObjectUtils.isEmpty(djqPointList)) {
                 throw new BadRequestException("待检区暂无空余库位!");
             }
             toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
@@ -305,7 +309,7 @@ public class MzhcwTask extends AbstractAcsTask {
             List<BstIvtPackageinfoivt> gkqPointList = bstIvtPackageinfoivtList.stream()
                     .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status())
                             && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(gkqPointList)) {
+            if (ObjectUtils.isEmpty(gkqPointList)) {
                 throw new BadRequestException("管控区暂无空余库位!");
             }
             toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->管制区"));
@@ -347,6 +351,7 @@ public class MzhcwTask extends AbstractAcsTask {
                 .point_code4(form.getString("point_code4"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
+                .task_group_id(form.getString("task_group_id"))
                 .handle_class(THIS_CLASS)
                 .create_id(SecurityUtils.getCurrentUserId())
                 .create_name(SecurityUtils.getCurrentUsername())
@@ -394,8 +399,8 @@ public class MzhcwTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
-        taskService.update(null,updateWrapper);
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + DateUtil.now() + "强制取消。");
+        taskService.update(null, updateWrapper);
     }
 
 
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 17a226619..43a04d0be 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
@@ -26,7 +26,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -94,13 +93,15 @@ 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() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.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.更新库存记录
             packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
+            //4.判断是否存在任务组任务
+            packageinfoivtService.handleGroupTask(schBaseTask);
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
@@ -144,6 +145,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
                 .point_code2(pointCode2)
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
+                .task_group_id(form.getString("task_group_id"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)
@@ -191,7 +193,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
         taskService.update(null, updateWrapper);
     }
 
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 35a8a0187..38b952f66 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
@@ -26,7 +26,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -93,13 +92,15 @@ public class SendGzqKzjTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.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.更新库存记录
             packageinfoivtService.update(null, new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
+            //4.判断是否存在任务组任务
+            packageinfoivtService.handleGroupTask(schBaseTask);
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
@@ -143,6 +144,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
                 .point_code2(pointCode2)
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
+                .task_group_id(form.getString("task_group_id"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)
@@ -190,7 +192,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
         taskService.update(null, updateWrapper);
     }
 
diff --git a/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
similarity index 61%
rename from lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java
rename to lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
index fd84e82af..8db165063 100644
--- a/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
@@ -22,16 +22,16 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 7 目标待检区， 装箱区 ->  待检区或管制区送空载具，agv任务
+ * 7 agv移库任务
  *
  * @author gbx
  * @since 2024-01-24
@@ -39,14 +39,14 @@ import java.util.List;
 @Service()
 @RequiredArgsConstructor
 @Slf4j
-public class SendKzjTask extends AbstractAcsTask {
+public class ShiftingTask extends AbstractAcsTask {
+
+    private final String THIS_CLASS = ShiftingTask.class.getName();
     @Resource
     private IschBaseTaskService taskService;
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
-    private final String THIS_CLASS = SendKzjTask.class.getName();
-
     @Override
     public List<AcsTaskDto> addTask() {
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
@@ -63,12 +63,12 @@ public class SendKzjTask extends AbstractAcsTask {
                     .next_device_code(r.getPoint_code2())
                     .start_device_code2(r.getPoint_code3())
                     .next_device_code2(r.getPoint_code4())
-                    .vehicle_code(r.getVehicle_code())
+                    //.vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())
+                    .agv_action_type(r.getVehicle_code2())
                     .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务"))
-                    .interaction_json(JSON.parseObject(r.getRequest_param()))
                     .build();
             resultList.add(dto);
         });
@@ -79,33 +79,37 @@ public class SendKzjTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (schBaseTask == null) {
-            throw new BadRequestException("装箱区->待检区或管制区送空载具完成接口任务号为空！");
-        }
+        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());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
-            schBaseTask.setTask_status(TaskStatusEnum.EXECUTING.getCode());
+            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())) {
-            //1.更改任务状态为完成
-            schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode());
-            //2.改变起点点位状态
-            packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
-            //3.更新库存记录
-            packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).eq("point_code", schBaseTask.getPoint_code2()));
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.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()));
+            //3.更改任务状态为完成
+            updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
                 throw new BadRequestException("任务已执行不能取消");
             }
-            //更新任务表删除字段
-            schBaseTask.setIs_delete(IOSEnum.IS_NOTANDYES.code("是"));
+            //任务被标记为取消
+            updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
+            updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
+            updateWrapper.set(SchBaseTask::getRemark, "任务被ACS在:" + schBaseTask.getUpdate_time() + "调用接口强制取消。");
         }
-        schBaseTask.setUpdate_time(DateUtil.now());
-        schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId());
-        schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName());
-        taskService.update(schBaseTask);
+        taskService.update(null, updateWrapper);
     }
 
     @Override
@@ -116,26 +120,28 @@ public class SendKzjTask extends AbstractAcsTask {
             throw new BadRequestException("业务类型不能为空");
         }
         String vehicleCode = form.getString("vehicle_code");
-        if (StrUtil.isBlank(vehicleCode)) {
-            throw new BadRequestException("载具号不能为空");
-        }
+        //        if (StrUtil.isBlank(vehicleCode)) {
+        //            throw new BadRequestException("载具号不能为空");
+        //        }
         String pointCode1 = form.getString("point_code1");
         if (StrUtil.isBlank(pointCode1)) {
             throw new BadRequestException("起点不能为空");
         }
         String pointCode2 = form.getString("point_code2");
-        if (StrUtil.isBlank(pointCode2)) {
-            throw new BadRequestException("下一点不能为空");
-        }
+        //        if (StrUtil.isBlank(pointCode2)) {
+        //            throw new BadRequestException("下一点不能为空");
+        //        }
         //是否立即下发
         boolean isSend = !StrUtil.isNotBlank(form.getString("is_send")) || BooleanUtil.toBoolean(form.getString("is_send"));
         SchBaseTaskVO schBaseTaskVo = SchBaseTaskVO.builder()
                 .task_type(taskType)
                 .vehicle_code(vehicleCode)
+                .vehicle_code2(form.getString("vehicle_code2"))
                 .point_code1(pointCode1)
                 .point_code2(pointCode2)
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
+                .request_param(form.getString("request_param"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)
@@ -143,9 +149,11 @@ public class SendKzjTask extends AbstractAcsTask {
                 .create_name(SecurityUtils.getCurrentUsername())
                 .create_time(DateUtil.now())
                 .is_send(isSend ? "1" : "0")
+                .task_group_id(form.getString("task_group_id"))
+                .material_code(form.getString("material_code"))
                 .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
                 .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
-                .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+                .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
                 .build();
         SchBaseTask task = new SchBaseTask();
         BeanUtils.copyProperties(schBaseTaskVo, task);
@@ -157,33 +165,33 @@ public class SendKzjTask extends AbstractAcsTask {
         return task.getTask_id();
     }
 
-
     @Override
+    @Transactional
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (schBaseTask == null) {
-            throw new BadRequestException("装箱区->待检区或管制区送空载具强制完成接口任务号为空！");
-        }
-        schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode());
-        schBaseTask.setUpdate_time(DateUtil.now());
-        schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId());
-        schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName());
-        taskService.update(schBaseTask);
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
+        updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 
+
     @Override
     public void cancel(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
         if (schBaseTask == null) {
-            throw new BadRequestException("装箱区->待检区或管制区送空载具取消接口任务号为空！");
+            throw new BadRequestException("agv移库任务号为空！");
         }
-        schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消"));
-        schBaseTask.setUpdate_time(DateUtil.now());
-        schBaseTask.setUpdate_optid(SecurityUtils.getCurrentUserId());
-        schBaseTask.setUpdate_optname(SecurityUtils.getCurrentNickName());
-        taskService.update(schBaseTask);
+        LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
+                .eq(SchBaseTask::getTask_id, taskId)
+                .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
+                .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
+                .set(SchBaseTask::getUpdate_time, DateUtil.now());
+        //任务被标记为取消
+        updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
+        updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
+        taskService.update(null, updateWrapper);
     }
 
 
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 a33e4786d..79f711aff 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
@@ -7,9 +7,11 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+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.dto.SchBaseTaskVO;
@@ -25,7 +27,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -95,18 +96,20 @@ public class SsxDjwTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.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("取货完成"))) {
-                    log.info(schBaseTask.getTask_code() + "检查检查->空载具缓存位-输送线，桁架取货完成信号未发送！！！");
+                    packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().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 {
                 //桁架取货完成信号未发送
-                log.info(schBaseTask.getTask_code() + "检查检查->空载具缓存位-输送线，桁架取货完成信号未发送！！！");
+                packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().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.改变起点点位状态
             //packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
@@ -118,7 +121,7 @@ public class SsxDjwTask extends AbstractAcsTask {
             //                            .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
             //                            .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
             //            //有空载具,创建搬运空载具任务
-            //            if (CollectionUtils.isNotEmpty(zxqPointList)) {
+            //            if (ObjectUtils.isNotEmpty(zxqPointList)) {
             //                JSONObject toKzjhcwTask = new JSONObject();
             //                toKzjhcwTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
             //                toKzjhcwTask.put("point_code1", zxqPointList.get(0).getPoint_code());
@@ -171,6 +174,7 @@ public class SsxDjwTask extends AbstractAcsTask {
                 .point_code4(form.getString("point_code4"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
+                .task_group_id(form.getString("task_group_id"))
                 .handle_class(THIS_CLASS)
                 .create_id(SecurityUtils.getCurrentUserId())
                 .create_name(SecurityUtils.getCurrentUsername())
@@ -217,7 +221,7 @@ public class SsxDjwTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
+        updateWrapper.set(SchBaseTask::getRemark,"任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
         taskService.update(null,updateWrapper);
     }
 
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 04692b36a..c41be0580 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
@@ -35,7 +35,6 @@ import org.springframework.beans.BeanUtils;
 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.ArrayList;
 import java.util.List;
@@ -71,9 +70,6 @@ public class ZxDjwTask extends AbstractAcsTask {
     @Resource
     private IPdmBiSlittingproductionplanService productionPlanService;
 
-    @Resource
-    private RedisUtils redisUtils;
-    private static final String NUM_KEY = "AutoSendZxToDjw:NUM";
     private final String THIS_CLASS = ZxDjwTask.class.getName();
 
     @Override
@@ -124,7 +120,7 @@ public class ZxDjwTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.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) {
@@ -148,10 +144,10 @@ public class ZxDjwTask extends AbstractAcsTask {
                 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()));
-                //清除最后一个子卷计数
-                //redisUtils.set(NUM_KEY, 0);
+                //装箱位所在区域
+                String block =  packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code,schBaseTask.getPoint_code2())).get(0).getBlock();
                 //6.创建装箱区->待检区或管制区补空任务
-                callingVehicleToDjqOrGzq(Integer.parseInt(packagerelationList.get(0).getQuanlity_in_box().toString()));
+                callingVehicleToDjqOrGzq(Integer.parseInt(packagerelationList.get(0).getQuanlity_in_box().toString()),block);
             }
             //7.改变子卷包装状态为已装箱：1
             PdmBiSubpackagerelation pdmBiSubpackagerelation = subpackageRelationService
@@ -176,14 +172,14 @@ public class ZxDjwTask extends AbstractAcsTask {
      * 装箱任务完成，异步间隔调用装箱区->待检区补空任务
      * <a href="https://maimai.cn/article/detail?fid=1481325336&efid=HqBFR_5bjNMzuqkNhfwv0g">...</a>
      */
-    public void callingVehicleToDjqOrGzq(Integer callingNum) {
+    public void callingVehicleToDjqOrGzq(Integer callingNum,String block) {
         CompletableFuture.runAsync(() -> {
             try {
                     for (int i = 0; i < callingNum; i++) {
                         try {
                             //9秒执行一次
                             TimeUnit.SECONDS.sleep(9L);
-                            autoSendVehicleToDjq.sendVehicleToDjqOrGzq1(IOSEnum.IS_NOTANDYES.code("是"));
+                            autoSendVehicleToDjq.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("是"),block);
                         } catch (InterruptedException e) {
                             Thread.currentThread().interrupt();
                             e.printStackTrace();
@@ -228,6 +224,7 @@ public class ZxDjwTask extends AbstractAcsTask {
                 .request_param(form.getString("request_param"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
+                .task_group_id(form.getString("task_group_id"))
                 .handle_class(THIS_CLASS)
                 .create_id(SecurityUtils.getCurrentUserId())
                 .create_name(SecurityUtils.getCurrentUsername())
@@ -273,7 +270,7 @@ public class ZxDjwTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
         taskService.update(null, updateWrapper);
     }
 
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 a6d6519cb..806ccf157 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
@@ -34,7 +34,6 @@ import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -121,7 +120,7 @@ public class ZxqTask extends AbstractAcsTask {
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
-            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
+            log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" +DateUtil.now() + "被调用---------------------------------------------");
             //            PdmBiSlittingproductionplan containerInfo = productionPlanService.getOne(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
             //                    .eq(PdmBiSlittingproductionplan::getContainer_name, schBaseTask.getVehicle_code()));
             //            if (containerInfo == null) {
@@ -130,12 +129,16 @@ public class ZxqTask extends AbstractAcsTask {
             //                throw new BadRequestException("子卷号不能为空!");
             //            }
             //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()));
             //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()));
             //3.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
-            //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务,否,什么都不做
+            //4.判断是否存在任务组任务
+            //提交检查，后续需要acs反馈取货完成信号，在二次分配中处理任务组逻辑
+            packageinfoivtService.handleGroupTask(schBaseTask);
+            //5.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务,否,什么都不做
             //zxqToZxw(schBaseTask);
         }
         // 取消
@@ -315,6 +318,7 @@ public class ZxqTask extends AbstractAcsTask {
                 .point_code2(pointCode2)
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
+                .task_group_id(form.getString("task_group_id"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)
@@ -364,7 +368,7 @@ public class ZxqTask extends AbstractAcsTask {
         //任务被标记为取消
         updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
         updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
-        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" + schBaseTask.getUpdate_time() + "强制取消。");
+        updateWrapper.set(SchBaseTask::getRemark, "任务被用户:" + schBaseTask.getUpdate_optname() + "在:" +DateUtil.now() + "强制取消。");
         taskService.update(null, updateWrapper);
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java
new file mode 100644
index 000000000..8d6fc7dc4
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java
@@ -0,0 +1,107 @@
+package org.nl.b_lms.sch.tasks.first_floor_area.auto;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+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.sch.tasks.first_floor_area.ShiftingTask;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
+import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AutoExecuteShiftingTask {
+    private final String THIS_CLASS = AutoExecuteShiftingTask.class.getName();
+
+    @Resource
+    private RedissonClient redissonClient;
+    @Resource
+    private ShiftingTask shiftingTask;
+    @Resource
+    private IschBaseTaskService taskService;
+    @Resource
+    private IbstIvtPackageinfoivtService packageinfoivtService;
+
+    //自动执行等待的桁架任务
+    public void run() {
+        this.executeShiftingTask();
+    }
+
+    /**
+     * 执行不满足条件的移库任务
+     */
+    @SneakyThrows
+    public void executeShiftingTask() {
+        log.info(THIS_CLASS + "-移库任务定时任务开始执行扫描。");
+        RLock lock = redissonClient.getLock(THIS_CLASS);
+        boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
+        try {
+            if (tryLock) {
+                List<SchBaseTask> taskList = taskService.list(
+                        new LambdaQueryWrapper<SchBaseTask>()
+                                .or(r -> r.eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())
+                                        .and(w -> w.eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
+                                                .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))))
+                                .or(r -> r.eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())
+                                        .and(w -> w.eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
+                                                .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))))
+                );
+                for (SchBaseTask task : taskList) {
+                    if (task != null) {
+                        SchBaseTask groupTask = taskService.getOne(new LambdaQueryWrapper<SchBaseTask>()
+                                .eq(SchBaseTask::getTask_group_id, task.getTask_id())
+                                .eq(SchBaseTask::getIs_delete, IOSEnum.IS_SEND.code("否"))
+                                .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
+                        //前置任务完成，才执行移库任务
+                        if (groupTask != null) {
+                            return;
+                        }
+                        String taskType = task.getTask_type();
+                        String pointCode2;
+                        BstIvtPackageinfoivt newIvt = packageinfoivtService.getOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, task.getPoint_code1()));
+                        if (PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务").equals(taskType)) {
+                            pointCode2 = packageinfoivtService.getDjqShiftingPoint(newIvt, true);
+                            task.setPoint_code2(pointCode2);
+                            if (StringUtils.isNotBlank(pointCode2)) {
+                                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+                                taskService.updateById(task);
+                                shiftingTask.immediateNotifyAcs(null);
+                                log.info("待检区移库任务编号为：" + task.getTask_code() + ",任务状态为：" + task.getTask_status() + "下发完成。");
+                            }
+                        } else if (PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务").equals(taskType)) {
+                            pointCode2 = packageinfoivtService.getDjqShiftingPoint(newIvt, false);
+                            task.setPoint_code2(pointCode2);
+                            if (StringUtils.isNotBlank(pointCode2)) {
+                                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+                                taskService.updateById(task);
+                                shiftingTask.immediateNotifyAcs(null);
+                                log.info("管制区移库任务编号为：" + task.getTask_code() + ",任务状态为：" + task.getTask_status() + "下发完成。");
+                            }
+                        }
+                    }
+                }
+            } else {
+                log.info("执行不满足条件的移库任务正在创建被锁住。");
+            }
+        } finally {
+            if (tryLock) {
+                lock.unlock();
+            }
+        }
+    }
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java
index dfe48fe73..868572799 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 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.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
@@ -88,7 +88,7 @@ public class AutoExecuteWaitTask {
                                             ).eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"))
                                             .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空"))
                                             .orderByDesc(BstIvtPackageinfoivt::getSort_seq));
-                            if (CollectionUtils.isEmpty(mzPointList)) {
+                            if (ObjectUtils.isEmpty(mzPointList)) {
                                 return;
                             }
                             task.setPoint_code2(mzPointList.get(0).getPoint_code());
@@ -101,12 +101,12 @@ public class AutoExecuteWaitTask {
                             List<SchBaseTask> existTask = taskService.getExistTasks(taskTypes);
                             //先发输送线->满轴位任务，如果有输送线->满轴位任务未完成任务，暂不下发放空(空载具缓存位->输送线)任务
                             List<SchBaseTask> existTask1 = existTask.stream().filter(r -> r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))).collect(Collectors.toList());
-                            if (CollectionUtils.isNotEmpty(existTask1)) {
+                            if (ObjectUtils.isNotEmpty(existTask1)) {
                                 return;
                             }
                             //过滤未分配的补空载具任务
                             List<SchBaseTask> existTask2 = existTask.stream().filter(r -> StringUtils.isNotBlank(r.getResponse_param())).collect(Collectors.toList());
-                            if (CollectionUtils.isNotEmpty(existTask2)) {
+                            if (ObjectUtils.isNotEmpty(existTask2)) {
                                 //已二次分配过的任务未完成
                                 if (existTask.stream().anyMatch(r -> r.getResponse_param().equals(IOSEnum.IS_NOTANDYES.code("是")))) {
                                     throw new BadRequestException("存在已二次分配过点位的补空载具任务未完成!");
@@ -118,7 +118,7 @@ public class AutoExecuteWaitTask {
                                             ).eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"))
                                             .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空载具"))
                                             .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
-                            if (CollectionUtils.isEmpty(kzjPointList)) {
+                            if (ObjectUtils.isEmpty(kzjPointList)) {
                                 return;
                             }
                             task.setPoint_code1(kzjPointList.get(0).getPoint_code());
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 4dcc54837..78478be7c 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
@@ -1,20 +1,29 @@
 package org.nl.b_lms.sch.tasks.first_floor_area.auto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 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.sch.point.dao.BstIvtPackageinfoivt;
+import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper;
 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.GzqTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -29,9 +38,14 @@ public class AutoSendDjqToGzq {
     private RedissonClient redissonClient;
     @Resource
     private GzqTask gzqTask;
-
+    @Resource
+    private ShiftingTask shiftingTask;
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
+    @Resource
+    private BstIvtPackageinfoivtMapper bstIvtPackageinfoivtMapper;
+    @Resource
+    private IschBaseTaskService taskService;
 
     //待检区->管制区agv自动搬运任务
     public void run() {
@@ -50,28 +64,27 @@ public class AutoSendDjqToGzq {
         try {
             if (tryLock) {
                 //待检区有管制品且过滤未完成任务
-                List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("管制品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-                if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
+                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)) {
                     return;
                 }
                 //管制区有空位且过滤未完成任务
-                List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
+                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，只取空不补空
                 List<BstIvtPackageinfoivt> ivtLists =
                         gzqPackageinfoivtList.stream()
                                 .filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136"))
                                 .collect(Collectors.toList());
-                if (CollectionUtils.isEmpty(ivtLists)) {
-                    return;
+                if (ObjectUtils.isEmpty(ivtLists)) {
+                    log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name());
+                    throw new BadRequestException("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name());
                 }
                 JSONObject task = new JSONObject();
-                task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
-                task.put("vehicle_code", djqPackageinfoivtList.get(0).getContainer_name());
-                task.put("point_code1", djqPackageinfoivtList.get(0).getPoint_code());
                 task.put("point_code2", ivtLists.get(0).getPoint_code());
-                gzqTask.createTask(task);
+                task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
+                createTask(djqPackageinfoivtList, task);
             } else {
-                log.info("放满与取空桁架任务正在创建被锁住。");
+                log.info("待检区->管制区任务正在创建被锁住。");
             }
         } finally {
             if (tryLock) {
@@ -81,35 +94,127 @@ public class AutoSendDjqToGzq {
     }
 
 
+
+
     /**
-     * 二次分配任务
+     * 创建任务
      */
-    void sendDjqToGzq1() {
-        JSONObject task = new JSONObject();
-        String pointCode1;
-        //待检区有管制品且过滤未完成任务
-        List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("管制品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务取货分配"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-        if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-            return;
-        }
-        //无需二次分配
-        List<BstIvtPackageinfoivt> notNeedAllocation = djqPackageinfoivtList.stream().filter(r -> !r.getWait_point_type().equals(PackageInfoIvtEnum.WAIT_POINT_TYPE.code("待检区等待点"))).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(notNeedAllocation)) {
-            pointCode1 = notNeedAllocation.get(0).getPoint_code();
-            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
-        } else {
-            pointCode1 = packageinfoivtService.getWaitPoint(djqPackageinfoivtList.get(0).getBlock(), djqPackageinfoivtList.get(0).getWait_point_type());
-            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
-            task.put("point_code3", djqPackageinfoivtList.get(0).getPoint_code());
-        }
-        List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"), "", "");
-        if (pointCode1 != null && CollectionUtils.isNotEmpty(gzqPackageinfoivtList)) {
-            task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
-            task.put("point_code1", pointCode1);
-            //需要二次分配，起点分配等待点
-            task.put("point_code2", packageinfoivtService.getWaitPoint(gzqPackageinfoivtList.get(0).getBlock(), gzqPackageinfoivtList.get(0).getWait_point_type()));
-            task.put("point_code4", gzqPackageinfoivtList.get(0).getPoint_code());
-            gzqTask.createTask(task);
+    private void createTask(List<BstIvtPackageinfoivt> djqPackageinfoivtList, JSONObject task) {
+        // 浅货位和深货位
+        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);
+        if (ObjectUtils.isNotEmpty(shallowIvtList)) {
+            // 优先处理浅货位
+            handleTaskForShallow(task, shallowIvtList.get(0));
+        } else if (ObjectUtils.isNotEmpty(deepIvtList)) {
+            // 处理深货位
+            handleTaskForDeep(task, deepIvtList.get(0));
         }
     }
+
+    /**
+     * 处理浅货位
+     */
+    private void handleTaskForShallow(JSONObject task, BstIvtPackageinfoivt shallowIvt) {
+        task.put("vehicle_code", shallowIvt.getContainer_name());
+        task.put("point_code1", shallowIvt.getPoint_code());
+        gzqTask.createTask(task);
+    }
+
+    /**
+     * 处理深货位
+     */
+    private void handleTaskForDeep(JSONObject task, BstIvtPackageinfoivt deepIvt) {
+        String pointCode1 = deepIvt.getPoint_code();
+        List<BstIvtPackageinfoivt> groupIvtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
+                        .eq(BstIvtPackageinfoivt::getCol_num, deepIvt.getCol_num()))
+                .stream()
+                .filter(r -> r.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位")))
+                .collect(Collectors.toList());
+        if (ObjectUtils.isNotEmpty(groupIvtList)) {
+            BstIvtPackageinfoivt shallowIvt = groupIvtList.get(0);
+            //处理深货位对应浅货位的状态
+            handleShallowIvtStatus(task, deepIvt, shallowIvt, pointCode1);
+        }
+    }
+
+
+    /**
+     * 处理深货位对应浅货位的状态
+     */
+    private void handleShallowIvtStatus(JSONObject task, BstIvtPackageinfoivt deepIvt, BstIvtPackageinfoivt shallowIvt, String pointCode1) {
+        Set<String> pointCodes2 = Collections.singleton(shallowIvt.getPoint_code());
+        //浅货位状态为空,查询该货位是否存在运行中的放货任务
+        //如果不存在，则直接创建主任务
+        //如果存在，则1.建立确定起点的主任务，2.运行中的放货任务完成后，再让下发执行主任务
+        //浅货位状态不为空,查询该货位是否存在运行中的取货任务
+        //如果不存在,1.创建主任务不下发；2.创建移库任务，绑定主任务关联关系task_group_id，等待移库任务完成后，再下发主任务
+        //如果存在，不需要移库，绑定与主任务关联关系task_group_id，等待运行中的取货任务完成后，再让下发执行主任务
+        List<SchBaseTask> existTaskList = shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))
+                ? bstIvtPackageinfoivtMapper.getTaskList(null, pointCodes2, null, null)
+                : bstIvtPackageinfoivtMapper.getTaskList(pointCodes2, null, null, null);
+        //创建搬运任务
+        task.put("vehicle_code", deepIvt.getContainer_name());
+        task.put("point_code1", pointCode1);
+        //不存在搬运任务
+        if (ObjectUtils.isEmpty(existTaskList)) {
+            //浅库位状态为空
+            if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))) {
+                gzqTask.createTask(task);
+            } else {
+                createMainTask(task, deepIvt, shallowIvt, pointCode1, null);
+            }
+            //存在搬运任务
+        } else {
+            //浅库位状态为空
+            if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))) {
+                createMainTask(task, deepIvt, shallowIvt, pointCode1, existTaskList.get(0));
+            } else {
+                //浅库位状态不为空
+                task.put("task_status", TaskStatusEnum.SURE_END.getCode());
+                LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, existTaskList.get(0).getTask_id());
+                updateWrapper.set(SchBaseTask::getTask_group_id, gzqTask.createTask(task));
+                taskService.update(null, updateWrapper);
+            }
+        }
+    }
+
+    /**
+     * 创建搬运和移库任务
+     */
+    private void createMainTask(JSONObject task, BstIvtPackageinfoivt deepIvt, BstIvtPackageinfoivt shallowIvt, String pointCode1, SchBaseTask existTask) {
+        String taskId;
+        String shiftingTaskId;
+        task.put("vehicle_code", deepIvt.getContainer_name());
+        task.put("point_code1", pointCode1);
+        task.put("task_status", TaskStatusEnum.SURE_END.getCode());
+        taskId = gzqTask.createTask(task);
+        //获取移库任务目标点
+        String pointCode4 = packageinfoivtService.getDjqShiftingPoint(shallowIvt,true);
+        JSONObject task1 = new JSONObject();
+        if (existTask != null) {
+            task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.SURE_END.getCode());
+        } else {
+            task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode());
+        }
+        task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务"));
+        task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
+        task1.put("vehicle_code", shallowIvt.getContainer_name());
+        task1.put("point_code1", shallowIvt.getPoint_code());
+        task1.put("point_code2", pointCode4);
+        task1.put("task_group_id", taskId);
+        task1.put("material_code", shallowIvt.getIvt_status());
+        shiftingTaskId = shiftingTask.createTask(task1);
+        if (existTask != null) {
+            LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
+                    .eq(SchBaseTask::getTask_id, existTask.getTask_id());
+            updateWrapper.set(SchBaseTask::getTask_group_id, shiftingTaskId);
+            taskService.update(null, updateWrapper);
+        }
+    }
+
+
+
 }
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 f936a363a..c1da94ac2 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
@@ -1,21 +1,26 @@
 package org.nl.b_lms.sch.tasks.first_floor_area.auto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 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.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.b_lms.sch.tasks.first_floor_area.DjqTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -30,7 +35,8 @@ public class AutoSendGzqToDjq {
     private RedissonClient redissonClient;
     @Resource
     private DjqTask djqTask;
-
+    @Resource
+    private ShiftingTask shiftingTask;
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
@@ -53,14 +59,13 @@ public class AutoSendGzqToDjq {
                 //临时管制区135、136->待检区送空载具任务
                 JSONObject task1 = new JSONObject();
                 String pointCode3;
-                String pointCode4;
                 List<BstIvtPackageinfoivt> gzqIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
                 //todo 新增NG卷放置临时管制区135136，只取空不补空
                 List<BstIvtPackageinfoivt> ivtLists =
                         gzqIvtList.stream()
                                 .filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136"))
                                 .collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(ivtLists)) {
+                if (ObjectUtils.isNotEmpty(ivtLists)) {
                     pointCode3 = ivtLists.get(0).getPoint_code();
                     if (StringUtils.isNotBlank(pointCode3)) {
                         List<BstIvtPackageinfoivt> packageList;
@@ -71,37 +76,36 @@ public class AutoSendGzqToDjq {
                                 PackageInfoIvtEnum.SORT_TYPE.code("升序"),
                                 ""
                         );
-                        if (CollectionUtils.isNotEmpty(packageList)) {
-                            pointCode4 = packageList.get(0).getPoint_code();
+                        if (ObjectUtils.isNotEmpty(packageList)) {
                             task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
-                            task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
+                            task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
                             task1.put("point_code1", pointCode3);
-                            task1.put("point_code2", pointCode4);
                             task1.put("request_param", "98");
-                            djqTask.createTask(task1);
+                            createTask(packageList, task1);
                         }
                     }
                 }
                 //管制区->待检区送合格品任务
                 List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-                if (CollectionUtils.isEmpty(gzqPackageinfoivtList)) {
+                if (ObjectUtils.isEmpty(gzqPackageinfoivtList)) {
                     return;
                 }
                 //待检区有空位且过滤未完成任务
-                List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
-                if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-                    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自动搬运任务暂无可用空位,子卷号为：" + gzqPackageinfoivtList.get(0).getContainer_name());
+                    throw new BadRequestException("管制区->待检区agv自动搬运任务暂无可用空位,子卷号为：" + gzqPackageinfoivtList.get(0).getContainer_name());
                 }
                 JSONObject task = new JSONObject();
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
+                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
                 //区分管制品重新检测为合格品
                 task.put("request_param", "99");
                 task.put("vehicle_code", gzqPackageinfoivtList.get(0).getContainer_name());
                 task.put("point_code1", gzqPackageinfoivtList.get(0).getPoint_code());
-                task.put("point_code2", djqPackageinfoivtList.get(0).getPoint_code());
-                djqTask.createTask(task);
+                createTask(djqPackageinfoivtList, task);
             } else {
-                log.info("放满与取空桁架任务正在创建被锁住。");
+                log.info("管制区->待检区任务正在创建被锁住。");
             }
         } finally {
             if (tryLock) {
@@ -111,40 +115,65 @@ public class AutoSendGzqToDjq {
     }
 
 
-    /**
-     * 二次分配逻辑
-     */
-
-    void sendGzqToDjq1() {
-        JSONObject task = new JSONObject();
-        String pointCode2;
-        //管制区有合格品且过滤未完成任务
-        List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货分配"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
-        if (CollectionUtils.isEmpty(gzqPackageinfoivtList)) {
-            return;
+    private void createTask(List<BstIvtPackageinfoivt> djqPackageinfoivtList, JSONObject task) {
+        String pointCode2 = null;
+        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);
+        //如果浅库位和深库位都有空位，且为一组，优先深库位
+        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();
+            }
         }
-        //待检区有空位且过滤未完成任务
-        List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务放货分配"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-        if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-            return;
+        //如果只有浅库位有空位，则直接取浅库位的编号为终点
+        else if (ObjectUtils.isNotEmpty(shallowIvtList)) {
+            pointCode2 = shallowIvtList.get(0).getPoint_code();
         }
-        //无需二次分配
-        List<BstIvtPackageinfoivt> notNeedAllocation = djqPackageinfoivtList.stream().filter(r -> !r.getWait_point_type().equals(PackageInfoIvtEnum.WAIT_POINT_TYPE.code("待检区等待点"))).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(notNeedAllocation)) {
-            pointCode2 = notNeedAllocation.get(0).getPoint_code();
-            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取货二次分配"));
-        } else {
-            pointCode2 = packageinfoivtService.getWaitPoint(djqPackageinfoivtList.get(0).getBlock(), djqPackageinfoivtList.get(0).getWait_point_type());
-            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
-            task.put("point_code4", djqPackageinfoivtList.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("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
-            //需要二次分配，起点分配等待点
-            task.put("point_code1", packageinfoivtService.getWaitPoint(gzqPackageinfoivtList.get(0).getBlock(), gzqPackageinfoivtList.get(0).getWait_point_type()));
-            task.put("point_code3", gzqPackageinfoivtList.get(0).getPoint_code());
             task.put("point_code2", pointCode2);
             djqTask.createTask(task);
         }
     }
+
+
 }
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 0e4559e48..23d0db0f0 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
@@ -1,16 +1,20 @@
 package org.nl.b_lms.sch.tasks.first_floor_area.auto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 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.sch.tasks.first_floor_area.DjqTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
@@ -19,6 +23,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -36,38 +41,22 @@ public class AutoSendMzToDjq {
     @Resource
     private DjqTask djqTask;
 
+    @Resource
+    private ShiftingTask shiftingTask;
+
+
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
     //满轴->待检区agv自动搬运任务
     public void run() {
-        this.sendMzqToDjq2();
+        this.sendMzqToDjq();
     }
 
-    /**
-     * 普通任务
-     */
-    void sendMzqToDjq() {
-        //满轴有子卷且没有未完成任务
-        List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1", "2", "");
-        if (CollectionUtils.isEmpty(bstIvtPackageinfoivtList)) {
-            return;
-        }
-        List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", "1", "");
-        if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-            return;
-        }
-        JSONObject toDjqTask = new JSONObject();
-        toDjqTask.put("vehicle_code", bstIvtPackageinfoivtList.get(0).getContainer_name());
-        toDjqTask.put("point_code1", bstIvtPackageinfoivtList.get(0).getPoint_code());
-        toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
-        toDjqTask.put("point_code2", djqPackageinfoivtList.get(0).getPoint_code());
-        djqTask.createTask(toDjqTask);
 
-    }
 
     @SneakyThrows
-    public void sendMzqToDjq2() {
+    public void sendMzqToDjq() {
         log.info(THIS_CLASS+"-满轴->待检区定时任务开始执行扫描。");
         RLock lock = redissonClient.getLock(THIS_CLASS);
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
@@ -78,26 +67,81 @@ public class AutoSendMzToDjq {
                 if (existTask.size() > 2) {
                     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("降序"), "");
-                if (CollectionUtils.isEmpty(mzqPackageinfoivtList)) {
+                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("降序"), "");
-                if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-                    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());
                 }
-                String pointCode2;
-                JSONObject task = new JSONObject();
-                pointCode2 = djqPackageinfoivtList.get(0).getPoint_code();
+                // 获取浅库位为空的库位和深库位为空的库位
+                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());
-                task.put("point_code2", pointCode2);
-                djqTask.createTask(task);
+                //如果浅库位和深库位都有空位，且为一组，优先深库位
+                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);
+                }
             } else {
                 log.info("满轴->待检区agv自动搬运任务正在创建被锁住。");
             }
@@ -108,100 +152,4 @@ public class AutoSendMzToDjq {
         }
 
     }
-
-    /**
-     * 二次分配任务
-     */
-    void sendMzqToDjq1() {
-        try {
-            String pointCode2 = null;
-            JSONObject task = new JSONObject();
-            //满轴有子卷且过滤未完成任务
-            List<BstIvtPackageinfoivt> mzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货分配"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
-            if (CollectionUtils.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("降序"), "");
-            if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-                return;
-            }
-            //无需二次分配
-            List<BstIvtPackageinfoivt> notNeedAllocation = djqPackageinfoivtList.stream().filter(r -> !r.getWait_point_type().equals(PackageInfoIvtEnum.WAIT_POINT_TYPE.code("待检区等待点"))).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(notNeedAllocation)) {
-                pointCode2 = notNeedAllocation.get(0).getPoint_code();
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取货二次分配"));
-            } else {
-                pointCode2 = packageinfoivtService.getWaitPoint(djqPackageinfoivtList.get(0).getBlock(), djqPackageinfoivtList.get(0).getWait_point_type());
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
-                task.put("point_code4", djqPackageinfoivtList.get(0).getPoint_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());
-            task.put("point_code2", pointCode2);
-            djqTask.createTask(task);
-
-        } catch (Exception ex) {
-            log.error("sendMzqToDjq1 error:{}", ex.getMessage());
-        }
-
-    }
-    //    void sendMzqToDjq() {
-    //        //满轴位有子卷
-    //        List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper
-    //                .selectList(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("有子卷"))
-    //                        .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
-    //        if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
-    //            String containerName = bstIvtPackageinfoivtList.get(0).getContainer_name();
-    //            String pointCode = bstIvtPackageinfoivtList.get(0).getPoint_code();
-    //            //查询子卷信息，去分切计划表查找定级数据，桁架任务完成根据子卷定级创建AGV任务将满轴搬运至质检区或管制区
-    //            PdmBiSlittingproductionplan containerInfo = productionPlanService.getOne(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
-    //                    .eq(PdmBiSlittingproductionplan::getContainer_name, containerName));
-    //            if (containerInfo == null) {
-    //                throw new BadRequestException("找不到子卷信息!");
-    //            }
-    //            //子卷等级
-    //            String level = containerInfo.getLevel() == null ? "1" : containerInfo.getLevel();
-    //            String finalLevel = level;
-    //            if (Arrays.stream(ContainerLevelEnum.values()).noneMatch(enumItem -> enumItem.getCode().equals(finalLevel))) {
-    //                throw new BadRequestException("非法的子卷等级!");
-    //            }
-    //            level = "1";
-    //            JSONObject task = new JSONObject();
-    //            task.put("vehicle_code", containerName);
-    //            // 判断子卷等级属于待检区还是管制区,创建满轴缓存位到待检区或管制区的agv任务
-    //            String finalLevel1 = level;
-    //            if (Stream.of(ContainerLevelEnum.BEST, ContainerLevelEnum.WELL, ContainerLevelEnum.COMMON).anyMatch(enumItem -> enumItem.getCode().equals(finalLevel1))) {
-    //                List<BstIvtPackageinfoivt> djqPointList = bstIvtPackageinfoivtList.stream()
-    //                        .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("待检区").equals(r.getPoint_status())
-    //                                && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-    //                if (CollectionUtils.isEmpty(djqPointList)) {
-    //                    throw new BadRequestException("待检区暂无空余库位!");
-    //                }
-    //                task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
-    //                task.put("point_code1", pointCode);
-    //                task.put("point_code2", djqPointList.get(0).getPoint_code());
-    //                djqTask.createTask(task);
-    //            } else {
-    //                String finalLevel2 = level;
-    //                if (Stream.of(ContainerLevelEnum.REWORK, ContainerLevelEnum.CONTROL).anyMatch(enumItem -> enumItem.getCode().equals(finalLevel2))) {
-    //                    List<BstIvtPackageinfoivt> gkqPointList = bstIvtPackageinfoivtList.stream()
-    //                            .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status())
-    //                                    && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-    //                    if (CollectionUtils.isEmpty(gkqPointList)) {
-    //                        throw new BadRequestException("管控区暂无空余库位!");
-    //                    }
-    //                    task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->管制区"));
-    //                    task.put("point_code1", pointCode);
-    //                    task.put("point_code2", gkqPointList.get(0).getPoint_code());
-    //                    gzqTask.createTask(task);
-    //                }
-    //            }
-    //        }
-    //    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
index f126deec7..8295f45f1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
@@ -3,17 +3,19 @@ package org.nl.b_lms.sch.tasks.first_floor_area.auto;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 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.sch.tasks.first_floor_area.ZxqTask;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +39,8 @@ public class AutoSendToZxq extends Prun{
     private TaskQueueManager taskQueueManager;
     @Resource
     private TaskQueue taskQueue;
+    @Resource
+    private IschBaseTaskService taskService;
 
     //待检区->装箱区agv自动搬运任务
     @Autowired
@@ -45,7 +49,6 @@ public class AutoSendToZxq extends Prun{
     }
 
 
-
     /**
      * 二次分配任务
      */
@@ -56,12 +59,17 @@ public class AutoSendToZxq extends Prun{
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
+                //存子卷号为合格品的移库任务，则让移库任务先完成，再创建搬运任务
+                List<SchBaseTask> existTask = taskService.getExistTasks(Collections.singletonList(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")));
+                if (existTask.stream().anyMatch(r -> r.getMaterial_code().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品")))) {
+                    return;
+                }
                 //装箱区有空位,去待检区消费合格品子卷
                 List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(
                         PackageInfoIvtEnum.POINT_STATUS.code("装箱区"),
                         PackageInfoIvtEnum.IVT_STATUS.code("空"),
                         PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), "", "");
-                if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
+                if (ObjectUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
                     Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream()
                             .collect(Collectors.groupingBy(
                                     BstIvtPackageinfoivt::getBlock,
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 1580f2d2c..e2be40348 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
@@ -5,16 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 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.sch.tasks.first_floor_area.SendDjqKzjTask;
 import org.nl.b_lms.sch.tasks.first_floor_area.SendGzqKzjTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -22,6 +24,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -40,10 +43,8 @@ public class AutoSendVehicleToDjq {
     private SendDjqKzjTask sendDjqKzjTask;
     @Resource
     private SendGzqKzjTask sendGzqKzjTask;
-
     @Resource
-    private IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService;
-
+    private ShiftingTask shiftingTask;
 
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
@@ -51,33 +52,37 @@ public class AutoSendVehicleToDjq {
     //装箱区->待检区或管制区补空载具
 
     public void run() {
-        this.sendVehicleToDjqOrGzq1(IOSEnum.IS_NOTANDYES.code("否"));
+        this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"),null);
     }
 
     @SneakyThrows
-    public void sendVehicleToDjqOrGzq1(String isCalling) {
+    public void sendVehicleToDjqOrGzq(String isCalling, String block) {
         log.info(THIS_CLASS + "-装箱区->待检区或管制区补空任务开始执行扫描。");
         RLock lock = redissonClient.getLock(THIS_CLASS);
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
-                String pointCode2;
-                JSONObject task = new JSONObject();
                 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"));
-                    if (CollectionUtils.isNotEmpty(taskList)) {
+                    if (ObjectUtils.isNotEmpty(taskList)) {
                         return;
                     }
                 }
                 //存在装箱区有空载具的点位
                 List<BstIvtPackageinfoivt> zxqIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-                if (CollectionUtils.isEmpty(zxqIvtList)) {
+                if (ObjectUtils.isEmpty(zxqIvtList)) {
                     return;
                 }
+                //按块执行取空任务
+                if (isCalling.equals(IOSEnum.IS_NOTANDYES.code("是"))) {
+                    if (StringUtils.isNotBlank(block)) {
+                        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("补空(装箱区->管制区)"));
@@ -85,17 +90,9 @@ public class AutoSendVehicleToDjq {
                 //                    pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
                 //                }
                 //todo 新增NG卷放置临时管制区135136，优先去补管制区
-                pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
-                //去装箱区搬运空载具
-                if (pointCode2 != null) {
-                    task.put("point_code2", pointCode2);
-                    task.put("point_code1", zxqIvtList.get(0).getPoint_code());
-                    if (task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"))) {
-                        sendDjqKzjTask.createTask(task);
-                    } else {
-                        sendGzqKzjTask.createTask(task);
-                    }
-                }
+                JSONObject task = new JSONObject();
+                task.put("point_code1", zxqIvtList.get(0).getPoint_code());
+                getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
             } else {
                 log.info("装箱区->待检区或管制区补空载具任务正在创建被锁住。");
             }
@@ -107,16 +104,13 @@ public class AutoSendVehicleToDjq {
     }
 
 
-
-
-    private String getPointCode(JSONObject task, String taskType) {
-        String pointCode2 = null;
+    private void getPointCode(JSONObject task, String taskType) {
         List<BstIvtPackageinfoivt> packageList;
         if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"))) {
-            packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-            if (CollectionUtils.isEmpty(packageList)) {
+            packageList = 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(packageList)) {
                 //todo 新增NG卷放置临时管制区135136，只取空不补空
-                packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
+                packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
                 packageList = packageList.stream()
                         .filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136"))
                         .collect(Collectors.toList());
@@ -125,75 +119,89 @@ public class AutoSendVehicleToDjq {
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
             }
         } else {
-            packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
+            packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
             packageList = packageList.stream()
                     .filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136"))
                     .collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(packageList)) {
-                packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
+            if (ObjectUtils.isEmpty(packageList)) {
+                packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
             } else {
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
             }
         }
-        if (CollectionUtils.isNotEmpty(packageList)) {
-            pointCode2 = packageList.get(0).getPoint_code();
-            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
+        if (ObjectUtils.isNotEmpty(packageList)) {
+            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
+            createTask(packageList, task);
+        } else {
+            log.info("装箱区->待检区或管制区自动搬运空载具任务，待检区或管制区暂无可用空位");
+            throw new BadRequestException("装箱区->待检区或管制区自动搬运空载具任务，待检区或管制区暂无可用空位");
         }
-        return pointCode2;
     }
 
 
-
-
-
-
-
-    /**
-     * 二次分配任务
-     */
-    public void sendVehicleToDjqOrGzq() {
-        //存在装箱区有空载具的点位
+    private void createTask(List<BstIvtPackageinfoivt> packageList, JSONObject task) {
         String pointCode2 = null;
-        JSONObject task = new JSONObject();
-        List<BstIvtPackageinfoivt> zxqIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-        if (CollectionUtils.isEmpty(zxqIvtList)) {
+        Map<Boolean, List<BstIvtPackageinfoivt>> ivtMap = packageList.stream()
+                .collect(Collectors.partitioningBy(r -> r.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位"))));
+        List<BstIvtPackageinfoivt> shallowIvtList = ivtMap.get(true);
+        List<BstIvtPackageinfoivt> deepIvtList = ivtMap.get(false);
+        //如果浅库位和深库位都有空位，且为一组，优先深库位
+        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;
+            //移库任务
+            JSONObject task1 = new JSONObject();
+            if (task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"))) {
+                taskId = sendDjqKzjTask.createTask(task);
+                task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
+            } else {
+                taskId = sendGzqKzjTask.createTask(task);
+                task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"));
+            }
+            task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_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;
         }
-        //待检区有空位且过滤未完成任务
-        List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
-        if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
-            //无二次分配
-            List<BstIvtPackageinfoivt> notNeedAllocation = djqPackageinfoivtList.stream().filter(r -> !r.getWait_point_type().equals(PackageInfoIvtEnum.WAIT_POINT_TYPE.code("待检区等待点"))).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(notNeedAllocation)) {
-                pointCode2 = notNeedAllocation.get(0).getPoint_code();
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
-            } else {
-                if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
-                    pointCode2 = packageinfoivtService.getWaitPoint(djqPackageinfoivtList.get(0).getBlock(), djqPackageinfoivtList.get(0).getWait_point_type());
-                    task.put("vehicle_code1", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
-                    task.put("point_code4", djqPackageinfoivtList.get(0).getPoint_code());
-                }
-            }
-            task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
-        } else {
-            //管制区有空位
-            List<BstIvtPackageinfoivt> gzqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-            if (CollectionUtils.isNotEmpty(gzqList)) {
-                //需要二次分配，起点分配等待点
-                pointCode2 = packageinfoivtService.getWaitPoint(gzqList.get(0).getBlock(), gzqList.get(0).getWait_point_type());
-                task.put("point_code4", gzqList.get(0).getPoint_code());
-                //agv二次分配类型
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
-                task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
-            }
-        }
-        //去装箱区搬运空载具
         if (pointCode2 != null) {
             task.put("point_code2", pointCode2);
-            //送空二次分配，目标点分配等待点
-            task.put("point_code3", zxqIvtList.get(0).getPoint_code());
-            task.put("point_code1", packageinfoivtService.getWaitPoint(zxqIvtList.get(0).getBlock(), zxqIvtList.get(0).getWait_point_type()));
             if (task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"))) {
                 sendDjqKzjTask.createTask(task);
             } else {
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 7a7f8db8d..a6c5f3b75 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
@@ -1,26 +1,29 @@
 package org.nl.b_lms.sch.tasks.first_floor_area.auto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 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.sch.point.dao.BstIvtPackageinfoivt;
+import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper;
 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.DjqToKzjhcwTask;
 import org.nl.b_lms.sch.tasks.first_floor_area.GzqToKzjhcwTask;
+import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask;
 import org.nl.common.enums.PackageInfoIvtEnum;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -37,47 +40,18 @@ public class AutoSendVehicleToKzj {
     private DjqToKzjhcwTask djqToKzjhcwTask;
     @Resource
     private GzqToKzjhcwTask gzqToKzjhcwTask;
-
+    @Resource
+    private BstIvtPackageinfoivtMapper bstIvtPackageinfoivtMapper;
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
-
+    @Resource
+    private ShiftingTask shiftingTask;
     @Resource
     private IschBaseTaskService taskService;
 
     //待检区或管制区->空载具缓存位补空
     public void run() {
-        this.toKzjHcw2();
-    }
-
-
-    @SneakyThrows
-    public void toKzjHcw() {
-        //存在空载具缓存位无空载具的点位
-        List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
-        if (CollectionUtils.isEmpty(kzjIvtList)) {
-            return;
-        }
-        String pointCode1 = null;
-        JSONObject task = new JSONObject();
-        //待检区有空载具
-        List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-        if (CollectionUtils.isNotEmpty(djqPointList)) {
-            pointCode1 = djqPointList.get(0).getPoint_code();
-        } else {
-            //查询装箱区有空载具
-            List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-            if (CollectionUtils.isNotEmpty(zxqPointList)) {
-                pointCode1 = zxqPointList.get(0).getPoint_code();
-            }
-        }
-        //去装箱区搬运空载具
-        if (pointCode1 != null) {
-            task.put("point_code1", pointCode1);
-            //送到到任意空载具缓存位
-            task.put("point_code2", kzjIvtList.get(0).getPoint_code());
-            task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
-            djqToKzjhcwTask.createTask(task);
-        }
+        this.toKzjHcw();
     }
 
 
@@ -85,14 +59,13 @@ public class AutoSendVehicleToKzj {
      * 二次分配任务
      */
     @SneakyThrows
-    public void toKzjHcw2() {
-        log.info(THIS_CLASS+"-待检区或管制区->空载具缓存位补空任务开始执行扫描。");
+    public void toKzjHcw() {
+        log.info(THIS_CLASS + "-待检区或管制区->空载具缓存位补空任务开始执行扫描。");
         RLock lock = redissonClient.getLock(THIS_CLASS);
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
                 JSONObject task = new JSONObject();
-                String pointCode1;
                 String pointCode2;
                 //todo 只允许2个补空任务,后期需要根据区域动态获取任务数量
                 List<String> taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"), PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")));
@@ -100,8 +73,9 @@ public class AutoSendVehicleToKzj {
                 if (existTask.size() > 1) {
                     return;
                 }
-                List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), null, PackageInfoIvtEnum.TASK_POINT_TYPE.code("空载具放货"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
-                if (CollectionUtils.isNotEmpty(kzjIvtList)) {
+                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;
@@ -109,27 +83,19 @@ public class AutoSendVehicleToKzj {
                 } else {
                     return;
                 }
-                List<BstIvtPackageinfoivt> packageinfoivtList = packageinfoivtService.getBstIvtPackageinfoivts(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), null);
+                //存在补空的缓存位数量
+                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) {
-                    pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
+                    getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
                 } else {
                     if (existTask.size() % 2 != 0) {
-                        pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
+                        getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
                     } else {
                         //优先去待检区
-                        pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
-                    }
-                }
-                //去待检区或管制区搬运空载具
-                if (pointCode1 != null) {
-                    task.put("point_code1", pointCode1);
-                    //送空二次分配，目标点分配等待点
-                    task.put("point_code4", pointCode2);
-                    task.put("point_code2", packageinfoivtService.getWaitPoint(kzjIvtList.get(0).getBlock(), kzjIvtList.get(0).getWait_point_type()));
-                    if (task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) {
-                        djqToKzjhcwTask.createTask(task);
-                    } else {
-                        gzqToKzjhcwTask.createTask(task);
+                        getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
                     }
                 }
             } else {
@@ -143,108 +109,163 @@ public class AutoSendVehicleToKzj {
     }
 
 
-    private String getPointCode(JSONObject task, String taskType) {
-        String pointCode1 = null;
-        List<BstIvtPackageinfoivt> packageList ;
+    private void getPointCode(JSONObject task, String taskType) {
+        List<BstIvtPackageinfoivt> packageList;
         if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) {
-            packageList = packageinfoivtService.checkEndPointTask(
-                    PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
-                    PackageInfoIvtEnum.IVT_STATUS.code("空载具"),
-                    PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"),
-                    PackageInfoIvtEnum.SORT_TYPE.code("升序"),
-                    ""
-            );
-            if (CollectionUtils.isEmpty(packageList)) {
-                packageList = packageinfoivtService.checkEndPointTask(
-                        PackageInfoIvtEnum.POINT_STATUS.code("管制区"),
-                        PackageInfoIvtEnum.IVT_STATUS.code("空载具"),
-                        PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"),
-                        PackageInfoIvtEnum.SORT_TYPE.code("降序"),
-                        ""
-                );
+            packageList = 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(packageList)) {
+                packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
             } else {
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
             }
         } else {
-            packageList = packageinfoivtService.checkEndPointTask(
-                    PackageInfoIvtEnum.POINT_STATUS.code("管制区"),
-                    PackageInfoIvtEnum.IVT_STATUS.code("空载具"),
-                    PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"),
-                    PackageInfoIvtEnum.SORT_TYPE.code("降序"),
-                    ""
-            );
-            if (CollectionUtils.isEmpty(packageList)) {
-                packageList = packageinfoivtService.checkEndPointTask(
-                        PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
-                        PackageInfoIvtEnum.IVT_STATUS.code("空载具"),
-                        PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"),
-                        PackageInfoIvtEnum.SORT_TYPE.code("升序"),
-                        ""
-                );
+            packageList = 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(packageList)) {
+                packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区"));
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
             } else {
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
             }
         }
-        if (CollectionUtils.isNotEmpty(packageList)) {
-            pointCode1 = packageList.get(0).getPoint_code();
-            task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
+        if (ObjectUtils.isNotEmpty(packageList)) {
+            createTask(packageList, task);
+        } else {
+            log.info("待检区或管制区->空载具缓存位补空任务创建失败,暂无空载具。");
+            throw new BadRequestException("待检区或管制区->空载具缓存位补空任务创建失败,暂无空载具。");
+        }
+    }
+
+    /**
+     * 创建任务
+     */
+    private void createTask(List<BstIvtPackageinfoivt> djqPackageinfoivtList, JSONObject task) {
+        // 浅货位和深货位
+        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);
+        if (ObjectUtils.isNotEmpty(shallowIvtList)) {
+            // 优先处理浅货位
+            handleTaskForShallow(task, shallowIvtList.get(0));
+        } else if (ObjectUtils.isNotEmpty(deepIvtList)) {
+            // 处理深货位
+            handleTaskForDeep(task, deepIvtList.get(0));
+        }
+    }
+
+    /**
+     * 处理浅货位
+     */
+    private void handleTaskForShallow(JSONObject task, BstIvtPackageinfoivt shallowIvt) {
+        task.put("point_code1", shallowIvt.getPoint_code());
+        createTask(task);
+    }
+
+    /**
+     * 处理深货位
+     */
+    private void handleTaskForDeep(JSONObject task, BstIvtPackageinfoivt deepIvt) {
+        String pointCode1 = deepIvt.getPoint_code();
+        List<BstIvtPackageinfoivt> groupIvtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
+                        .eq(BstIvtPackageinfoivt::getCol_num, deepIvt.getCol_num()))
+                .stream()
+                .filter(r -> r.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位")))
+                .collect(Collectors.toList());
+        if (ObjectUtils.isNotEmpty(groupIvtList)) {
+            BstIvtPackageinfoivt shallowIvt = groupIvtList.get(0);
+            //处理深货位对应浅货位的状态
+            handleShallowIvtStatus(task, deepIvt, shallowIvt, pointCode1);
         }
-        return pointCode1;
     }
 
 
     /**
-     * 二次分配任务
+     * 处理深货位对应浅货位的状态
      */
-    public void toKzjHcw1() {
-        //存在空载具缓存位无空载具的点位
-        String pointCode1 = null;
-        JSONObject task = new JSONObject();
-        List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"), "", "");
-        if (CollectionUtils.isEmpty(kzjIvtList)) {
-            return;
-        }
-        //待检区有空载具且过滤未完成任务
-        List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务取货分配"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-        if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
-            //无需二次分配
-            List<BstIvtPackageinfoivt> notNeedAllocation = djqPackageinfoivtList.stream().filter(r -> !r.getWait_point_type().equals(PackageInfoIvtEnum.WAIT_POINT_TYPE.code("待检区等待点"))).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(notNeedAllocation)) {
-                pointCode1 = djqPackageinfoivtList.get(0).getPoint_code();
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"));
+    private void handleShallowIvtStatus(JSONObject task, BstIvtPackageinfoivt deepIvt, BstIvtPackageinfoivt shallowIvt, String pointCode1) {
+        Set<String> pointCodes2 = Collections.singleton(shallowIvt.getPoint_code());
+        //浅货位状态为空,查询该货位是否存在运行中的放货任务
+        //如果不存在，则直接创建主任务
+        //如果存在，则1.建立确定起点的主任务，2.运行中的放货任务完成后，再让下发执行主任务
+        //浅货位状态不为空,查询该货位是否存在运行中的取货任务
+        //如果不存在,1.创建主任务不下发；2.创建移库任务，绑定主任务关联关系task_group_id，等待移库任务完成后，再下发主任务
+        //如果存在，不需要移库，绑定与主任务关联关系task_group_id，等待运行中的取货任务完成后，再让下发执行主任务
+        List<SchBaseTask> existTaskList = shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))
+                ? bstIvtPackageinfoivtMapper.getTaskList(null, pointCodes2, null, null)
+                : bstIvtPackageinfoivtMapper.getTaskList(pointCodes2, null, null, null);
+        //创建搬运任务
+        task.put("point_code1", pointCode1);
+        //不存在搬运任务
+        if (ObjectUtils.isEmpty(existTaskList)) {
+            //浅库位状态为空
+            if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))) {
+                createTask(task);
             } else {
-                if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
-                    pointCode1 = packageinfoivtService.getWaitPoint(djqPackageinfoivtList.get(0).getBlock(), djqPackageinfoivtList.get(0).getWait_point_type());
-                    task.put("vehicle_code1", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
-                    task.put("point_code3", djqPackageinfoivtList.get(0).getPoint_code());
-                }
+                //浅库位状态不为为空
+                createMainTask(task, deepIvt, shallowIvt, pointCode1, null);
             }
-            task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
+            //存在搬运任务
         } else {
-            //管制区有空位
-            List<BstIvtPackageinfoivt> gzqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货分配"), "", "");
-            if (CollectionUtils.isNotEmpty(gzqList)) {
-                //需要二次分配，起点分配等待点
-                pointCode1 = packageinfoivtService.getWaitPoint(gzqList.get(0).getBlock(), gzqList.get(0).getWait_point_type());
-                task.put("point_code3", gzqList.get(0).getPoint_code());
-                //agv二次分配类型
-                task.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("取放货二次分配"));
-                task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
-            }
-        }
-        //去待检区或管制区搬运空载具
-        if (pointCode1 != null) {
-            task.put("point_code1", pointCode1);
-            //送空二次分配，目标点分配等待点
-            task.put("point_code4", kzjIvtList.get(0).getPoint_code());
-            task.put("point_code2", packageinfoivtService.getWaitPoint(kzjIvtList.get(0).getBlock(), kzjIvtList.get(0).getWait_point_type()));
-            if (task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) {
-                djqToKzjhcwTask.createTask(task);
+            //浅库位状态为空
+            if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))) {
+                createMainTask(task, deepIvt, shallowIvt, pointCode1, existTaskList.get(0));
             } else {
-                gzqToKzjhcwTask.createTask(task);
+                //浅库位状态不为空
+                task.put("task_status", TaskStatusEnum.SURE_END.getCode());
+                LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, existTaskList.get(0).getTask_id());
+                updateWrapper.set(SchBaseTask::getTask_group_id, createTask(task));
+                taskService.update(null, updateWrapper);
             }
         }
     }
+
+    /**
+     * 创建搬运和移库任务
+     */
+    private void createMainTask(JSONObject task, BstIvtPackageinfoivt deepIvt, BstIvtPackageinfoivt shallowIvt, String pointCode1, SchBaseTask existTask) {
+        //主任务id
+        String taskId;
+        //主任务类型
+        String taskType;
+        //移库任务id
+        String shiftingTaskId;
+        //获取移库任务目标点
+        String pointCode4;
+        task.put("vehicle_code", deepIvt.getContainer_name());
+        task.put("point_code1", pointCode1);
+        task.put("task_status", TaskStatusEnum.SURE_END.getCode());
+        taskId = createTask(task);
+        pointCode4 = task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ? packageinfoivtService.getDjqShiftingPoint(shallowIvt, true) : packageinfoivtService.getDjqShiftingPoint(shallowIvt, false);
+        taskType = task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ? PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务") : PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务");
+        JSONObject task1 = new JSONObject();
+        task1.put("task_type", taskType);
+        task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务"));
+        if (existTask != null) {
+            task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.SURE_END.getCode());
+        } else {
+            task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode());
+        }
+        task1.put("vehicle_code", shallowIvt.getContainer_name());
+        task1.put("point_code1", shallowIvt.getPoint_code());
+        task1.put("point_code2", pointCode4);
+        task1.put("task_group_id", taskId);
+        task1.put("material_code", shallowIvt.getIvt_status());
+        shiftingTaskId = shiftingTask.createTask(task1);
+        if (existTask != null) {
+            LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
+                    .eq(SchBaseTask::getTask_id, existTask.getTask_id());
+            updateWrapper.set(SchBaseTask::getTask_group_id, shiftingTaskId);
+            taskService.update(null, updateWrapper);
+        }
+    }
+
+    private String createTask(JSONObject task) {
+        if (task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) {
+            return djqToKzjhcwTask.createTask(task);
+        } else {
+            return gzqToKzjhcwTask.createTask(task);
+        }
+    }
+
 }
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 c9527853d..99c2b80c4 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
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 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.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
@@ -26,8 +26,6 @@ import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapp
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.utils.RedisUtils;
-import org.nl.system.service.param.ISysParamService;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
@@ -38,7 +36,6 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -52,12 +49,8 @@ import static org.nl.wms.util.TaskUtil.getMaxNum;
 public class AutoSendZxToDjw extends Prun{
     private final String THIS_CLASS = AutoSendZxToDjw.class.getName();
 
-    private static final String NUM_KEY = "AutoSendZxToDjw:NUM";
-
     private final RedissonClient redissonClient;
     @Resource
-    private RedisUtils redisUtils;
-    @Resource
     private IschBaseTaskService taskService;
     @Resource
     private ZxDjwTask zxDjwTask;
@@ -80,8 +73,7 @@ public class AutoSendZxToDjw extends Prun{
     @Resource
     private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
 
-    @Resource
-    private ISysParamService iSysParamService;
+
 
     //装箱区->装箱对接位agv自动搬运任务
     @Autowired
@@ -93,96 +85,97 @@ public class AutoSendZxToDjw extends Prun{
     public void sendZxToDjw() {
         //装箱位有木箱
         List<BstIvtPackageinfoivt> zxwPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "", PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"));
-        if (CollectionUtils.isEmpty(zxwPackageinfoivtList)) {
+        if (ObjectUtils.isEmpty(zxwPackageinfoivtList)) {
             return;
         }
-        //装箱区有子卷且没有正在进行的装箱任务
-        List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), "", "", "");
-        if (CollectionUtils.isEmpty(zxqPackageinfoivtList)) {
-            return;
-        }
-        //装箱位上的木箱号
-        String boxNo = zxwPackageinfoivtList.get(0).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 + "是否存在或者状态为已装箱!");
-        }
-        //检查木箱信息
-        checkBoxParams(boxNo, bstIvtBoxinfo);
-        //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务
-        List<PdmBiSubpackagerelation> relationList = subpackageRelationService
-                .list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
-        if (CollectionUtils.isEmpty(relationList)) {
-            log.info("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!");
-            return;
-            //throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!");
-        }
-        //获取与该木箱号匹配的子卷号
-        String containerName = relationList.get(0).getContainer_name();
-        log.info(THIS_CLASS + "-装箱区->装箱对接位任务开始执行扫描。");
-        RLock lock = redissonClient.getLock(containerName);
-        boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
-        try {
-            if (tryLock) {
-                List<BstIvtPackageinfoivt> zxqPoint = zxqPackageinfoivtList.stream().filter(r -> r.getContainer_name().equals(containerName)).collect(Collectors.toList());
-                //装箱区点位上有与该木箱号匹配的子卷
-                if (CollectionUtils.isNotEmpty(zxqPoint)) {
-                    List<PdmBiSlittingproductionplan> productionPlanList = pdmBiSlittingproductionplanMapper.selectList(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
-                    if (CollectionUtils.isEmpty(productionPlanList)) {
-                        log.info("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
-                        throw new BadRequestException("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
-                    }
-                    //校验是否存在相同子卷号任务
-                    List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, containerName).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();
-                        jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"));
-                        jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
-                        jo.put("point_code1", zxqPoint.get(0).getPoint_code());
-                        jo.put("point_code2", zxwPackageinfoivtList.get(0).getPoint_code());
-                        jo.put("vehicle_code", containerName);
-                        jo.put("vehicle_code2", boxNo);
-                        jo.put("is_send", IOSEnum.IS_NOTANDYES.code("是"));
-                        //扩展参数
-                        JSONObject param = new JSONObject();
-                        //查询是否为最后一个子卷，相同木箱号且子卷包装状态为生成
-                        List<PdmBiSubpackagerelation> packagerelationList = subpackageRelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
-                        if (packagerelationList.size() == 1 && packagerelationList.get(0).getContainer_name().equals(containerName)) {
-                            //最后子卷
-                            param.put("lastOne", IOSEnum.IS_NOTANDYES.code("是"));
-                        } else {
-                            param.put("lastOne", IOSEnum.IS_NOTANDYES.code("否"));
-                        }
-                        //获取木箱高度等级
-                        param.put("heightLevel", getHeightLevel(bstIvtBoxinfo));
-                        //获取子卷长度
-                        param.put("len", getMaxNum(productionPlanList.get(0), null));
-                        //木箱最大数量
-                        param.put("maxNo", bstIvtBoxinfo.getNum());
-                        //托盘类型 1小托盘 2大托盘
-                        param.put("containerType", bstIvtBoxinfo.getVehicle_type());
-                        //木箱需放入子卷数量
-                        param.put("boxNo", relationList.get(0).getQuanlity_in_box());
-                        //子卷号
-                        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 {
-                log.info("装箱区->装箱对接位agv自动搬运任务正在创建被锁住。");
+        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 + "是否存在或者状态为已装箱!");
             }
-        } finally {
-            if (tryLock) {
-                lock.unlock();
+            //检查木箱信息
+            checkBoxParams(boxNo, bstIvtBoxinfo);
+            //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务
+            List<PdmBiSubpackagerelation> relationList = subpackageRelationService
+                    .list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
+            if (ObjectUtils.isEmpty(relationList)) {
+                log.info("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!");
+                throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!");
+            }
+            //装箱区有子卷且没有正在进行的装箱任务
+            List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), "", "", "");
+            if (ObjectUtils.isEmpty(zxqPackageinfoivtList)) {
+                return;
+            }
+            //获取与该木箱号匹配的子卷号
+            String containerName = relationList.get(0).getContainer_name();
+            log.info(THIS_CLASS + "-装箱区->装箱对接位任务开始执行扫描。");
+            RLock lock = redissonClient.getLock(containerName);
+            boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
+            try {
+                if (tryLock) {
+                    List<BstIvtPackageinfoivt> zxqPoint = zxqPackageinfoivtList.stream().filter(r -> r.getContainer_name().equals(containerName)).collect(Collectors.toList());
+                    //装箱区点位上有与该木箱号匹配的子卷
+                    if (ObjectUtils.isNotEmpty(zxqPoint)) {
+                        List<PdmBiSlittingproductionplan> productionPlanList = pdmBiSlittingproductionplanMapper.selectList(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
+                        if (ObjectUtils.isEmpty(productionPlanList)) {
+                            log.info("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
+                            throw new BadRequestException("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
+                        }
+                        //校验是否存在相同子卷号任务
+                        List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, containerName).eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位")).eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")).lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
+                        if (ObjectUtils.isEmpty(taskList)) {
+                            //创建搬运任务到装箱位
+                            JSONObject jo = new JSONObject();
+                            jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"));
+                            jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
+                            jo.put("point_code1", zxqPoint.get(0).getPoint_code());
+                            jo.put("point_code2", bstIvtPackageinfoivt.getPoint_code());
+                            jo.put("vehicle_code", containerName);
+                            jo.put("vehicle_code2", boxNo);
+                            jo.put("is_send", IOSEnum.IS_NOTANDYES.code("是"));
+                            //扩展参数
+                            JSONObject param = new JSONObject();
+                            //查询是否为最后一个子卷，相同木箱号且子卷包装状态为生成
+                            List<PdmBiSubpackagerelation> packagerelationList = subpackageRelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
+                            if (packagerelationList.size() == 1 && packagerelationList.get(0).getContainer_name().equals(containerName)) {
+                                //最后子卷
+                                param.put("lastOne", IOSEnum.IS_NOTANDYES.code("是"));
+                            } else {
+                                param.put("lastOne", IOSEnum.IS_NOTANDYES.code("否"));
+                            }
+                            //获取木箱高度等级
+                            param.put("heightLevel", getHeightLevel(bstIvtBoxinfo));
+                            //获取子卷长度
+                            param.put("len", getMaxNum(productionPlanList.get(0), null));
+                            //木箱最大数量
+                            param.put("maxNo", bstIvtBoxinfo.getNum());
+                            //托盘类型 1小托盘 2大托盘
+                            param.put("containerType", bstIvtBoxinfo.getVehicle_type());
+                            //木箱需放入子卷数量
+                            param.put("boxNo", relationList.get(0).getQuanlity_in_box());
+                            //子卷号
+                            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 {
+                    log.info("装箱区->装箱对接位agv自动搬运任务正在创建被锁住。");
+                }
+            } finally {
+                if (tryLock) {
+                    lock.unlock();
+                }
             }
         }
     }
@@ -201,14 +194,14 @@ public class AutoSendZxToDjw extends Prun{
                 .map(PdmBiSubpackagerelation::getContainer_name)
                 .collect(Collectors.toSet());
         List<PdmBiSlittingproductionplan> planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().in(PdmBiSlittingproductionplan::getContainer_name, containerNameList));
-        if (CollectionUtils.isEmpty(planList)) {
+        if (ObjectUtils.isEmpty(planList)) {
             log.info("子卷装箱异常，transferBoxPackageToMes接口的子卷号：" + packagerelationList.get(0).getContainer_name() + ",无对应的分切计划信息，请检查!");
             throw new BadRequestException("该箱号不存在分切计划");
         }
         BigDecimal totalWeight;
         totalWeight = planList.stream()
                 .map(PdmBiSlittingproductionplan::getWeight)
-                .filter(Objects::nonNull)
+                .filter(p -> p != null && !p.trim().isEmpty())
                 .filter(r -> !r.isEmpty())
                 .map(BigDecimal::new)
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -250,104 +243,6 @@ public class AutoSendZxToDjw extends Prun{
         lmsToMesServiceImpl.momBoxPackageSubmit(param);
     }
 
-
-    void sendZxToDjw8() {
-        //装箱位有木箱
-        List<BstIvtPackageinfoivt> zxwPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "", PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"));
-        if (CollectionUtils.isEmpty(zxwPackageinfoivtList)) {
-            return;
-        }
-        //装箱区有子卷且没有正在进行的装箱任务
-        List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "", "", "");
-        if (CollectionUtils.isEmpty(zxqPackageinfoivtList)) {
-            return;
-        }
-        //装箱位上的木箱号
-        String boxNo = zxwPackageinfoivtList.get(0).getContainer_name();
-        //获取木箱信息,未包装的木箱
-        BstIvtBoxinfo bstIvtBoxinfo = bstIvtBoxinfoMapper.selectOne(new LambdaQueryWrapper<BstIvtBoxinfo>().eq(BstIvtBoxinfo::getBox_no, boxNo).ne(BstIvtBoxinfo::getIs_packing, "1"));
-        if (bstIvtBoxinfo == null) {
-            throw new BadRequestException("请检查木箱号:" + boxNo + "是否存在或者状态为已装箱!");
-        }
-        //检查木箱信息
-        checkBoxParams(boxNo, bstIvtBoxinfo);
-        //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务
-        List<PdmBiSubpackagerelation> relationList = subpackageRelationService
-                .list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
-        if (CollectionUtils.isEmpty(relationList)) {
-            throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!");
-        }
-        //获取与该木箱号匹配的子卷号
-        String containerName = relationList.get(0).getContainer_name();
-        List<BstIvtPackageinfoivt> zxqPoint = zxqPackageinfoivtList.stream().filter(r -> r.getContainer_name().equals(containerName)).collect(Collectors.toList());
-        //装箱区点位上有与该木箱号匹配的子卷
-        if (CollectionUtils.isNotEmpty(zxqPoint)) {
-            List<PdmBiSlittingproductionplan> productionPlanList = pdmBiSlittingproductionplanMapper.selectList(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName));
-            if (productionPlanList.isEmpty()) {
-                throw new BadRequestException("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
-            }
-            //创建搬运任务到装箱位
-            JSONObject jo = new JSONObject();
-            jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"));
-            jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
-            jo.put("point_code1", zxqPoint.get(0).getPoint_code());
-            jo.put("point_code2", zxwPackageinfoivtList.get(0).getPoint_code());
-            jo.put("vehicle_code", containerName);
-            jo.put("vehicle_code2", boxNo);
-            jo.put("is_send", IOSEnum.IS_NOTANDYES.code("是"));
-            //扩展参数
-            JSONObject param = new JSONObject();
-            //查询是否为最后一个子卷，相同木箱号且子卷包装状态为生成
-            List<PdmBiSubpackagerelation> packagerelationList = subpackageRelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
-            if (packagerelationList.size() == 1 && packagerelationList.get(0).getContainer_name().equals(containerName)) {
-                //最后子卷
-                param.put("lastOne", IOSEnum.IS_NOTANDYES.code("是"));
-            } else {
-                param.put("lastOne", IOSEnum.IS_NOTANDYES.code("否"));
-            }
-            //获取木箱高度等级
-            param.put("heightLevel", getHeightLevel(bstIvtBoxinfo));
-            //获取子卷长度
-            param.put("len", getMaxNum(productionPlanList.get(0), null));
-            //木箱最大数量
-            param.put("maxNo", bstIvtBoxinfo.getNum());
-            //托盘类型 1小托盘 2大托盘
-            param.put("containerType", bstIvtBoxinfo.getVehicle_type());
-            //木箱需放入子卷数量
-            param.put("boxNo", relationList.get(0).getQuanlity_in_box());
-            //子卷号
-            param.put("barcode", containerName);
-            jo.put("request_param", param.toString());
-            zxDjwTask.createTask(jo);
-            //扩展参数
-            //                        JSONObject param = new JSONObject();
-            //                        //子卷号
-            //                        param.put("barcode", containerName);
-            //                        //获取木箱高度等级
-            //                        param.put("heightLevel", getHeightLevel(bstIvtBoxinfo));
-            //                        //获取子卷长度
-            //                        param.put("len", getMaxNum(productionPlanList.get(0), null));
-            //                        //木箱最大数量
-            //                        param.put("maxNo", bstIvtBoxinfo.getNum());
-            //                        //托盘类型 1小托盘 2大托盘
-            //                        param.put("containerType", bstIvtBoxinfo.getVehicle_type());
-            //                        //木箱计划放入子卷数量
-            //                        param.put("boxNo", relationList.get(0).getQuanlity_in_box());
-            //                        Integer num = getNumFromRedis();
-            //                        num = num + 1;
-            //                        if (num.equals(Integer.parseInt(relationList.get(0).getQuanlity_in_box().toString()))) {
-            //                            param.put("lastOne", IOSEnum.IS_NOTANDYES.code("是"));
-            //                            num = 0;
-            //                        } else {
-            //                            param.put("lastOne", IOSEnum.IS_NOTANDYES.code("否"));
-            //                        }
-            //                        // 更新计数
-            //                        redisUtils.set(NUM_KEY, num);
-            //                        jo.put("request_param", param.toString());
-            // zxDjwTask.createTask(jo);
-        }
-    }
-
     private static void checkBoxParams(String boxNo, BstIvtBoxinfo bstIvtBoxinfo) {
         if (StringUtils.isBlank(bstIvtBoxinfo.getBox_high())) {
             throw new BadRequestException("请检查木箱号:" + boxNo + "木箱高度不能为空!");
@@ -377,70 +272,7 @@ public class AutoSendZxToDjw extends Prun{
         return height;
     }
 
-    private Integer getNumFromRedis() {
-        Object numObj = redisUtils.get(NUM_KEY);
-        if (numObj == null) {
-            return 0;
-        }
-        return (Integer) numObj;
-    }
 
 
-    //    void sendMzqToDjq() {
-    //        //满轴位有子卷
-    //        List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper
-    //                .selectList(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("有子卷"))
-    //                        .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
-    //        if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
-    //            String containerName = bstIvtPackageinfoivtList.get(0).getContainer_name();
-    //            String pointCode = bstIvtPackageinfoivtList.get(0).getPoint_code();
-    //            //查询子卷信息，去分切计划表查找定级数据，桁架任务完成根据子卷定级创建AGV任务将满轴搬运至质检区或管制区
-    //            PdmBiSlittingproductionplan containerInfo = productionPlanService.getOne(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
-    //                    .eq(PdmBiSlittingproductionplan::getContainer_name, containerName));
-    //            if (containerInfo == null) {
-    //                throw new BadRequestException("找不到子卷信息!");
-    //            }
-    //            //子卷等级
-    //            String level = containerInfo.getLevel() == null ? "1" : containerInfo.getLevel();
-    //            String finalLevel = level;
-    //            if (Arrays.stream(ContainerLevelEnum.values()).noneMatch(enumItem -> enumItem.getCode().equals(finalLevel))) {
-    //                throw new BadRequestException("非法的子卷等级!");
-    //            }
-    //            level = "1";
-    //            JSONObject toDjqTask = new JSONObject();
-    //            toDjqTask.put("vehicle_code", containerName);
-    //            // 判断子卷等级属于待检区还是管制区,创建满轴缓存位到待检区或管制区的agv任务
-    //            String finalLevel1 = level;
-    //            if (Stream.of(ContainerLevelEnum.BEST, ContainerLevelEnum.WELL, ContainerLevelEnum.COMMON).anyMatch(enumItem -> enumItem.getCode().equals(finalLevel1))) {
-    //                List<BstIvtPackageinfoivt> djqPointList = bstIvtPackageinfoivtList.stream()
-    //                        .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("待检区").equals(r.getPoint_status())
-    //                                && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-    //                if (CollectionUtils.isEmpty(djqPointList)) {
-    //                    throw new BadRequestException("待检区暂无空余库位!");
-    //                }
-    //                toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"));
-    //                toDjqTask.put("point_code1", pointCode);
-    //                toDjqTask.put("point_code2", djqPointList.get(0).getPoint_code());
-    //                djqTask.createTask(toDjqTask);
-    //            } else {
-    //                String finalLevel2 = level;
-    //                if (Stream.of(ContainerLevelEnum.REWORK, ContainerLevelEnum.CONTROL).anyMatch(enumItem -> enumItem.getCode().equals(finalLevel2))) {
-    //                    List<BstIvtPackageinfoivt> gkqPointList = bstIvtPackageinfoivtList.stream()
-    //                            .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status())
-    //                                    && PackageInfoIvtEnum.IVT_STATUS.code("空").equals(r.getIvt_status()) && r.getIs_used().equals(PackageInfoIvtEnum.IS_USED.code("启用"))).collect(Collectors.toList());
-    //                    if (CollectionUtils.isEmpty(gkqPointList)) {
-    //                        throw new BadRequestException("管控区暂无空余库位!");
-    //                    }
-    //                    toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->管制区"));
-    //                    toDjqTask.put("point_code1", pointCode);
-    //                    toDjqTask.put("point_code2", gkqPointList.get(0).getPoint_code());
-    //                    gzqTask.createTask(toDjqTask);
-    //                }
-    //            }
-    //        }
-
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/ManualSendToZxq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/ManualSendToZxq.java
deleted file mode 100644
index 0e7d3f7a2..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/ManualSendToZxq.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.nl.b_lms.sch.tasks.first_floor_area.auto;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-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.first_floor_area.ZxqTask;
-import org.nl.common.enums.PackageInfoIvtEnum;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class ManualSendToZxq {
-
-    @Resource
-    private IbstIvtPackageinfoivtService packageinfoivtService;
-    @Resource
-    private ZxqTask zxqTask;
-
-
-    //待检区->装箱区agv手动搬运任务
-    public void run() {
-        //this.sendDjqToZxq();
-    }
-
-    /**
-     * 普通任务
-     */
-    public  void sendDjqToZxq() {
-        JSONObject toDjqTask = new JSONObject();
-        //待检区有子卷且过滤未完成任务
-        List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
-        if (CollectionUtils.isEmpty(djqPackageinfoivtList)) {
-            return;
-        }
-        List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), "", "");
-        if (CollectionUtils.isEmpty(zxqPackageinfoivtList)) {
-            return;
-        }
-        toDjqTask.put("vehicle_code", djqPackageinfoivtList.get(0).getContainer_name());
-        toDjqTask.put("point_code1", djqPackageinfoivtList.get(0).getPoint_code());
-        toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"));
-        toDjqTask.put("point_code2", zxqPackageinfoivtList.get(0).getPoint_code());
-        zxqTask.createTask(toDjqTask);
-    }
-
-}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
index 84a2177ab..fccf9e057 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
@@ -1,17 +1,31 @@
 package org.nl.b_lms.sch.tasks.first_floor_area.auto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+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;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.dto.SchBaseTaskDto;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
+import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask;
 import org.nl.b_lms.sch.tasks.first_floor_area.ZxqTask;
+import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.modules.common.utils.RedisUtils;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -21,9 +35,14 @@ public class TaskQueue {
 
     @Resource
     private IschBaseTaskService taskService;
-
+    @Resource
+    private IbstIvtPackageinfoivtService packageinfoivtService;
+    @Resource
+    private BstIvtPackageinfoivtMapper bstIvtPackageinfoivtMapper;
     @Resource
     private ZxqTask zxqTask;
+    @Resource
+    private ShiftingTask shiftingTask;
 
     private final RedisUtils redisUtils;
 
@@ -37,7 +56,7 @@ public class TaskQueue {
         tasks.forEach(task -> {
             redisUtils.pushToList(TASK_QUEUE_PREFIX + groupId, task);
             //redisUtils.pushToList(TASK_QUEUE_PREFIX + groupId, task,3,TimeUnit.HOURS);
-            log.info("子卷装箱：待检区->装箱区agv任务组为:" + groupId + ",任务编号为：" + task.getTask_code() + "成功添加到任务队列。");
+            log.info("子卷装箱：待检区->装箱区agv任务组为:" + groupId + ",任务编号为：" + task.getTask_code() + "子卷号为：" + task.getVehicle_code() +"成功添加到任务队列。");
         });
     }
 
@@ -52,8 +71,12 @@ public class TaskQueue {
                 //Long  taskCounts =  getTaskCount(groupId);
                 SchBaseTask task = (SchBaseTask) redisUtils.popFromList(TASK_QUEUE_PREFIX + groupId, SchBaseTask.class);
                 if (task != null) {
-                    String pointCode = points.get(i);
-                    executeTask(task, pointCode);
+                    try {
+                        String pointCode = points.get(i);
+                        executeTask(task, pointCode);
+                    } catch (Exception ex) {
+                        log.info("子卷装箱：从待检区任务队列消费任务失败，检查检查，任务组为:" + groupId + ",任务编号为：" + task.getTask_code() + "子卷号为：" + task.getVehicle_code() + "异常信息：" + ex.toString());
+                    }
                 }
             }
         });
@@ -61,12 +84,107 @@ public class TaskQueue {
 
     private void executeTask(SchBaseTask task, String pointCode) {
         if (task != null) {
-            task.setPoint_code2(pointCode);
-            log.info("子卷装箱：待检区->装箱区agv任务编号为："+task.getTask_code()+",任务状态为："+task.getTask_status()+"任务开始下发。");
-            task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
-            taskService.updateById(task);
-            zxqTask.immediateNotifyAcs(null);
-            log.info("子卷装箱：待检区->装箱区agv任务编号为："+task.getTask_code()+",任务状态为："+task.getTask_status()+"下发完成。");
+            //查询子卷号的货位
+            BstIvtPackageinfoivt newIvt = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, task.getVehicle_code())).get(0);
+            String pointCode1 = newIvt.getPoint_code();
+            //是否深库位
+            if (newIvt.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位"))) {
+                //是浅货位，直接创建搬运任务
+                task.setPoint_code1(pointCode1);
+                task.setPoint_code2(pointCode);
+                log.info("子卷装箱：待检区->装箱区agv任务编号为：" + task.getTask_code() + "子卷号为：" + task.getVehicle_code() +  ",任务状态为：" + task.getTask_status() + "任务开始下发。");
+                task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+                taskService.updateById(task);
+                zxqTask.immediateNotifyAcs(null);
+                log.info("子卷装箱：待检区->装箱区agv任务编号为：" + "子卷号为：" + task.getVehicle_code() +  task.getTask_code() + ",任务状态为：" + task.getTask_status() + "下发完成。");
+            } else {
+                //是深货位，查询对应的浅货位
+                List<BstIvtPackageinfoivt> groupIvtList = packageinfoivtService.list(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getCol_num, newIvt.getCol_num())).stream().filter(r -> r.getDepth().equals(PackageInfoIvtEnum.DEPTH_TYPE.code("浅货位"))).collect(Collectors.toList());
+                BstIvtPackageinfoivt shallowIvt = groupIvtList.get(0);
+                //库位为空,查询该点位是否存在放货任务，如果存在，先建立确定起点任务，则等任务完成后再确定终点与下发
+                if (shallowIvt.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))) {
+                    Set<String> pointCodes2 = new HashSet<>();
+                    pointCodes2.add(shallowIvt.getPoint_code());
+                    List<SchBaseTask> existTaskList = bstIvtPackageinfoivtMapper.getTaskList(null, pointCodes2, null, null).stream().filter(r -> !r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"))).collect(Collectors.toList());
+                    //无放货任务，直接创建搬运任务
+                    if (ObjectUtils.isEmpty(existTaskList)) {
+                        task.setPoint_code1(pointCode1);
+                        task.setPoint_code2(pointCode);
+                        log.info("子卷装箱：待检区->装箱区agv任务编号为：" + "子卷号为：" + task.getVehicle_code() +  task.getTask_code() + ",任务状态为：" + task.getTask_status() + "任务开始下发。");
+                        task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
+                        taskService.updateById(task);
+                        zxqTask.immediateNotifyAcs(null);
+                        log.info("子卷装箱：待检区->装箱区agv任务编号为：" + "子卷号为：" + task.getVehicle_code() +  task.getTask_code() + ",任务状态为：" + task.getTask_status() + "下发完成。");
+                    } else {
+                        //有放货任务，先创建移库任务确定起点，再创建搬运任务确定终点，等任务放货任务完成，再执行移库任务，移库任务完成，再执行搬运任务
+                        //更新搬运任务新起点
+                        task.setPoint_code1(pointCode1);
+                        task.setPoint_code2(pointCode);
+                        task.setTask_status(TaskStatusEnum.SURE_END.getCode());
+                        taskService.updateById(task);
+                        //查找移库目标点位
+                        JSONObject task1 = new JSONObject();
+                        //获取移库任务目标点
+                        String pointCode2 = packageinfoivtService.getDjqShiftingPoint(shallowIvt, true);
+                        task1.put("task_status", StringUtils.isBlank(pointCode2) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.SURE_END.getCode());
+                        task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务"));
+                        task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
+                        task1.put("vehicle_code", shallowIvt.getContainer_name());
+                        task1.put("point_code1", shallowIvt.getPoint_code());
+                        task1.put("point_code2", pointCode2);
+                        //移库任务绑定搬运任务组标识
+                        task1.put("task_group_id", task.getTask_id());
+                        task1.put("material_code", shallowIvt.getIvt_status());
+                        //创建移库任务
+                        String shiftingTaskId = shiftingTask.createTask(task1);
+                        //放货任务绑定移库任务组标识
+                        LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
+                                .eq(SchBaseTask::getTask_id, existTaskList.get(0).getTask_id());
+                        updateWrapper.set(SchBaseTask::getTask_group_id, shiftingTaskId);
+                        taskService.update(null, updateWrapper);
+                    }
+                } else {
+                    //库位不为空,创建移库任务，查询该点位是否存在取货任务，如果存在，先更新搬运任务为确定终点任务，则等任务完成后再下发
+                    Set<String> pointCodes2 = new HashSet<>();
+                    pointCodes2.add(shallowIvt.getPoint_code());
+                    List<SchBaseTask> existTaskList = bstIvtPackageinfoivtMapper.getTaskList(pointCodes2, null, null, null).stream().filter(r -> !r.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"))).collect(Collectors.toList());
+                    //存在取货任务
+                    if (ObjectUtils.isNotEmpty(existTaskList)) {
+                        //无需移库，等待取货任务完成，创建搬运任务
+                        //放货任务绑定移库任务组标识
+                        LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
+                                .eq(SchBaseTask::getTask_id, existTaskList.get(0).getTask_id());
+                        updateWrapper.set(SchBaseTask::getTask_group_id, task.getTask_id());
+                        taskService.update(null, updateWrapper);
+                        //更新搬运任务只确定终点
+                        task.setPoint_code1(newIvt.getPoint_code());
+                        task.setPoint_code2(pointCode);
+                        task.setTask_status(TaskStatusEnum.SURE_END.getCode());
+                        taskService.updateById(task);
+                    } else {
+                        //更新搬运任务终点
+                        task.setPoint_code1(newIvt.getPoint_code());
+                        task.setPoint_code2(pointCode);
+                        task.setTask_status(TaskStatusEnum.SURE_END.getCode());
+                        taskService.updateById(task);
+                        //直接创建移库任务
+                        //获取移库任务目标点
+                        JSONObject task1 = new JSONObject();
+                        String pointCode2 = packageinfoivtService.getDjqShiftingPoint(shallowIvt, true);
+                        task1.put("task_status", StringUtils.isBlank(pointCode2) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode());
+                        task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务"));
+                        task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
+                        task1.put("vehicle_code", shallowIvt.getContainer_name());
+                        task1.put("point_code1", shallowIvt.getPoint_code());
+                        task1.put("point_code2", pointCode2);
+                        //任务组标识
+                        task1.put("task_group_id", task.getTask_id());
+                        task1.put("material_code", shallowIvt.getIvt_status());
+                        //创建移库任务
+                        shiftingTask.createTask(task1);
+                    }
+                }
+            }
         }
     }
 
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 ead37899c..76aec4c28 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
@@ -17,6 +17,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 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.pda.service.ProductOutTwoService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
@@ -1870,7 +1871,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 //2.创建输送线->满轴位桁架任务，
                 String point_code1 = whereJson.getString("device_code");
                 jo.put("point_code1", point_code1);
-                if (CollectionUtils.isNotEmpty(mzPointList)) {
+                if (ObjectUtils.isNotEmpty(mzPointList)) {
                     //任意一个满轴缓存位为终点
                     jo.put("point_code2", mzPointList.get(0).getPoint_code());
                     List<BstIvtPackageinfoivt> kzjPointList = bstIvtPackageinfoivtList.stream()
@@ -1878,7 +1879,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                                     && PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status()))
                             .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq)).collect(Collectors.toList());
                     //空载具缓存位有空载具，桁架取空载具从外到里取空载具，升序
-                    if (CollectionUtils.isNotEmpty(kzjPointList)) {
+                    if (ObjectUtils.isNotEmpty(kzjPointList)) {
                         //创建输送线四个点任务
                         return createTask(containerName, jo, kzjPointList.get(0).getPoint_code(), whereJson.getString("device_code"));
                     } else {
@@ -1890,7 +1891,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     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 (CollectionUtils.isEmpty(existTaskList)) {
+                    if (ObjectUtils.isEmpty(existTaskList)) {
                         //只确定起点NBJ1002
                         JSONObject jo2 = new JSONObject();
                         jo2.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
@@ -1931,9 +1932,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         JSONObject result = new JSONObject();
         result.put("data", containerName);
         //如果空载具缓存位缺少空载具，创建输送线->满轴缓存位两个点任务
-        List<String> taskTypes = new ArrayList<>(Arrays.asList(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"), PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"), PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")));
+        // 创建前先判断是否有已创建相同任务
+        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);
-        if (CollectionUtils.isEmpty(existTaskList1)) {
+        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 (ObjectUtils.isEmpty(existTaskList2)&&ObjectUtils.isEmpty(existTaskList3)) {
             jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"));
             jo.put("is_send", true);
             mzhcwTask.createTask(jo);
@@ -1942,8 +1946,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             result.put("status", HttpStatus.OK.value());
             result.put("message", "反馈成功!");
         } else {
-            log.info("已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
-            result.put("message", "已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
+            log.info("存在上一个子卷未完成的桁架任务或已分配的补空载具任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
+            result.put("message", "存在上一个子卷未完成的桁架任务或已分配的补空载具任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
             result.put("status", HttpStatus.BAD_REQUEST.value());
         }
         return result;
@@ -1971,8 +1975,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         // 创建前先判断是否有已创建相同任务
         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);
-        existTaskList1 = existTaskList1.stream().filter(r -> StringUtils.isNotBlank(r.getResponse_param())).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(existTaskList1)) {
+        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 (ObjectUtils.isEmpty(existTaskList2)&&ObjectUtils.isEmpty(existTaskList3)) {
             jo.put("point_code3", pointCode3);
             //终点为输送线点位
             jo.put("point_code4", pointCode4);
@@ -1982,8 +1987,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             result.put("status", HttpStatus.OK.value());
             result.put("message", "反馈成功!");
         } else {
-            log.info("已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
-            result.put("message", "已存在未完成的且已分配的补空载具或桁架任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
+            log.info("存在上一个子卷未完成的桁架任务或已分配的补空载具任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
+            result.put("message", "存在上一个子卷未完成的桁架任务或已分配的补空载具任务,任务编号为：" + existTaskList1.get(0).getTask_code() + "，请检查!");
             result.put("status", HttpStatus.BAD_REQUEST.value());
         }
         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 030480cc2..b89ebe4fb 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
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 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.checkerframework.checker.units.qual.C;
 import org.nl.b_lms.bst.ivt.scale.bound.service.IBstIvtScaleboundService;
@@ -1902,7 +1903,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 if (containerInfo.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区"))) {
                     List<BstIvtPackageinfoivt> djqList = bstIvtPackageinfoivtList.stream().filter(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")) && r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))).collect(Collectors.toList());
                     //待检区有空位，搬到待检区
-                    if (CollectionUtils.isNotEmpty(djqList)) {
+                    if (ObjectUtils.isNotEmpty(djqList)) {
                         toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
                         toDjqTask.put("point_code1", containerInfo.getPoint_code());
                         toDjqTask.put("point_code2", djqList.get(0).getPoint_code());
@@ -1918,7 +1919,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 if (containerInfo.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("管制区"))) {
                     List<BstIvtPackageinfoivt> gzqList = bstIvtPackageinfoivtList.stream().filter(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("管制区")) && r.getIvt_status().equals(PackageInfoIvtEnum.IVT_STATUS.code("空"))).collect(Collectors.toList());
                     //管制区有空位
-                    if (CollectionUtils.isNotEmpty(gzqList)) {
+                    if (ObjectUtils.isNotEmpty(gzqList)) {
                         toDjqTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
                         toDjqTask.put("point_code1", containerInfo.getPoint_code());
                         toDjqTask.put("point_code2", gzqList.get(0).getPoint_code());
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
index e149be912..dfa9fff34 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
@@ -46,7 +46,7 @@
         <el-table-column show-overflow-tooltip prop="quanlity_in_box" label="箱内子卷数" align="center" />
         <el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
         <el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
-        <el-table-column show-overflow-tooltip prop="paper_weight" label="子管重量" align="center" />
+        <!--        <el-table-column show-overflow-tooltip prop="paper_weight" label="子管重量" align="center" />-->
         <el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />
         <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
       </el-table>
@@ -122,7 +122,7 @@
         <el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
         <el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
         <el-table-column show-overflow-tooltip prop="paper_weight" label="子管重量" align="center" />
-        <el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />
+        <!--        <el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />-->
         <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
       </el-table>
     </el-card>
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 854662c89..ef576a917 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -139,10 +139,11 @@
         <el-table-column prop="point_code4" label="放货点2" width="100" show-overflow-tooltip />
         <el-table-column prop="car_no" label="车号" width="100" show-overflow-tooltip />
         <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
+        <el-table-column prop="task_group_id" label="关联任务" width="100" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码1" width="130" show-overflow-tooltip />
         <el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
-        <el-table-column prop="request_param" label="请求参数" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="response_param" label="响应参数" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
+        <el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
         <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人" width="135" show-overflow-tooltip />
         <el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
@@ -294,6 +295,30 @@ export default {
         }
       })
     },
+    formatSignal(row, column) {
+      if (row.task_type === '010911') {
+        if (column.property === 'response_param') {
+          return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
+        }
+        if (column.property === 'request_param') {
+          return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
+        }
+      } else if (row.task_type === '010904') {
+        if (column.property === 'request_param') {
+          return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
+        }
+      } else if (row.task_type === '010901') {
+        if (column.property === 'response_param') {
+          return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
+        }
+      }
+      else if (row.task_type === '010905'||row.task_type === '010913') {
+        if (column.property === 'response_param') {
+          return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配';
+        }
+      }
+      return row[column.property];
+    },
     // 获取子节点数据
     loadChildNodes({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
diff --git a/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java b/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
deleted file mode 100644
index a550d9bec..000000000
--- a/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.nl.b_lms.sch.tasks.first_floor_area.auto;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
-import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
-import org.nl.common.enums.PackageInfoIvtEnum;
-import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-
-@Slf4j
-@Component
-public class AutoSendToZxq {
-
-    @Resource
-    private IbstIvtPackageinfoivtService packageinfoivtService;
-
-    //待检区->装箱区agv自动搬运任务
-    public void run() {
-        this.sendDjqToZxq();
-    }
-
-    void sendDjqToZxq() {
-        //装箱区有空位
-        List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2",PackageInfoIvtEnum.IVT_STATUS.code("空"));
-        if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
-            Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream()
-                    .collect(Collectors.groupingBy(
-                            BstIvtPackageinfoivt::getPoint_code,
-                            LinkedHashMap::new,
-                            Collectors.mapping(BstIvtPackageinfoivt::getPoint_name, Collectors.toList())
-                    ));
-            TaskQueueManager taskQueueManager =new TaskQueueManager();
-            taskQueueManager.processTasks(ivtList);
-        }
-    }
-}
diff --git a/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
deleted file mode 100644
index ac1e51f37..000000000
--- a/lms/test/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.nl.b_lms.sch.tasks.first_floor_area.auto;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-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.first_floor_area.SendKzjTask;
-import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
-import org.nl.common.enums.PackageInfoIvtEnum;
-import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.List;
-
-
-@Slf4j
-@Component
-public class AutoSendVehicleToDjq {
-
-
-    @Resource
-    private IbstIvtPackageinfoivtService packageinfoivtService;
-    @Resource
-    private SendKzjTask sendKzjTask;
-
-    //装箱区->待检区送空agv自动搬运任务
-    public void run() {
-        this.sendKzjHcwEmptyVehicle();
-    }
-
-
-    void sendKzjHcwEmptyVehicle() {
-        JSONObject task = new JSONObject();
-        String pointCode1=null;
-        String pointCode2;
-        //待检区有空位
-        List<BstIvtPackageinfoivt> djqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2",PackageInfoIvtEnum.TASK_TYPE.code("送空(装箱区->待检区或管制区)"));
-        if (CollectionUtils.isNotEmpty(djqList)) {
-            pointCode2=djqList.get(0).getPoint_code();
-        }else{
-            //管制区有空位
-            List<BstIvtPackageinfoivt> zxqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2",PackageInfoIvtEnum.TASK_TYPE.code("送空(装箱区->待检区或管制区)"));
-            pointCode2=zxqList.get(0).getPoint_code();
-        }
-        //查询装箱区有空载具
-        List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService
-                .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
-                        .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱区"))
-                        .eq(BstIvtPackageinfoivt::getIs_used, IOSEnum.IS_NOTANDYES.code("是"))
-                        .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空载具")).orderByAsc(BstIvtPackageinfoivt::getSort_seq));
-        //装箱区有空载具
-        if (CollectionUtils.isNotEmpty(zxqPointList)) {
-            pointCode1 = zxqPointList.get(0).getPoint_code();
-        }
-        //去装箱区搬运空载具
-        if (pointCode1 != null && pointCode2 != null) {
-            task.put("point_code1", pointCode1);
-            task.put("point_code2", pointCode2);
-            task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("送空(装箱区->待检区或管制区)"));
-            sendKzjTask.createTask(task);
-        }
-    }
-
-
-}