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 89f7be34d..72cf015c1 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
@@ -805,7 +805,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         }
         //复称
         else if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isNotBlank(whereJson.getString("pointCode"))) {
-            dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode")));
+            dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1")?"ZXQ_135":"ZXQ_136"));
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
                 subpackagerelationService.createSubTest(whereJson);
                 dto.setIvt_status(PackageInfoIvtEnum.IVT_STATUS.code("合格品"));
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 78518ab5a..4ffc1598f 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
@@ -21,7 +21,6 @@ import org.nl.b_lms.sch.tasks.first_floor_area.auto.TaskQueueManager;
 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;
@@ -105,8 +104,10 @@ public class DjqTask extends AbstractAcsTask {
             //1.改变起点点位状态，满轴->待检，二次分配取货完成信号发送就改起点库存,检查起点库存是否清空
             BstIvtPackageinfoivt ivtPoint = packageinfoivtService.getOne(new LambdaUpdateWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, schBaseTask.getPoint_code1()));
             //如果起点库存未清空，则清空
-            if (ivtPoint.getContainer_name().equals(schBaseTask.getVehicle_code())) {
-                packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+            if (ivtPoint.getContainer_name() != null && schBaseTask.getVehicle_code() != null) {
+                if (ivtPoint.getContainer_name().equals(schBaseTask.getVehicle_code())) {
+                    packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
+                }
             }
             //2.更新终点库存记录
             String ivtStatus;
@@ -114,8 +115,7 @@ public class DjqTask extends AbstractAcsTask {
                 if (schBaseTask.getRequest_param().equals("98")) {
                     //管制区送空载具任务
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("空载具");
-                }
-               else if (schBaseTask.getRequest_param().equals("99")) {
+                } else if (schBaseTask.getRequest_param().equals("99")) {
                     //管制品重新质检
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品");
                 } else {
@@ -172,9 +172,9 @@ public class DjqTask 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("起点不能为空");
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 e221b359e..efcd0fad9 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
@@ -81,6 +81,7 @@ public class AutoSendGzqToDjq {
                     pointCode4 = packageList.get(0).getPoint_code();
                     task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
                     task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
+                    task1.put("vehicle_code", "空载具");
                     task1.put("point_code1", pointCode3);
                     task1.put("point_code2", pointCode4);
                     task1.put("request_param", "98");