From 79bd061eaccec683cfaac29570d7cdca24aa00b3 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Mon, 8 Jul 2024 16:06:25 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=A1=81=E6=9E=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E5=8F=96=E7=A9=BA=E8=BD=BD=E5=85=B7?=
 =?UTF-8?q?=E4=B8=8D=E5=88=86=E9=85=8D=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BstIvtPackageinfoivtServiceImpl.java        | 12 +++++++++---
 .../first_floor_area/auto/AutoSendVehicleToKzj.java  |  2 --
 2 files changed, 9 insertions(+), 5 deletions(-)

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 f3b734ca1..99509e76b 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
@@ -299,8 +299,12 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                                     .eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")
                                     )));
             if (CollectionUtils.isNotEmpty(taskList)) {
-                if (!taskList.get(0).getRequest_param().equals(IOSEnum.IS_SEND.code("是"))) {
+                if (StringUtils.isBlank(taskList.get(0).getRequest_param())) {
                     throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位");
+                } else {
+                    if (!taskList.get(0).getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
+                        throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位");
+                    }
                 }
             }
             newPoint = checkIvtSBlock();
@@ -371,8 +375,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 //清空起点库存状态
                 bstIvtPackageinfoivtMapper.update(null, updateWrapper);
                 //标记桁架任务取空载具完成
-                baseTask.setRequest_param(IOSEnum.IS_SEND.code("是"));
-                taskService.update();
+                UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.eq("task_id", baseTask.getTask_id());
+                updateWrapper1.set("request_param", PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"));
+                taskService.update(updateWrapper1);
             }
         } 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 5afc8e988..050ce41e9 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
@@ -121,8 +121,6 @@ public class AutoSendVehicleToKzj {
                 } else {
                     pointCode2 = kzjIvtList.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.isNotEmpty(djqPackageinfoivtList)) {