From 7a4899da4b65d2d7fad57cc783879df930ec399d Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 16 Jul 2024 14:39:08 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B5=B7=E7=82=B9=E5=BA=93=E5=AD=98=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/b_lms/sch/tasks/first_floor_area/DjqTask.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 265e83cf2..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 {