From efd07247427264897b66477dd43d3545b2ef91c6 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Mon, 12 Aug 2024 13:34:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E9=98=B2=E6=AD=A2=E4=B8=AD?=
 =?UTF-8?q?=E9=80=94=E4=BA=A7=E7=94=9F=E5=8F=98=E5=8A=A8=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E4=BA=8C=E6=AC=A1=E5=88=86=E9=85=8D=E9=9D=9E=E5=8E=9F?=
 =?UTF-8?q?=E5=85=88=E9=94=81=E5=AE=9A=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=9C=80?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E9=94=81=E5=AE=9A=E7=9A=84remark=E4=B9=9F?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=A7=A3=E9=94=81=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
index dec9e35..9fa1fc5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
@@ -252,8 +252,13 @@ public class KGHJRKTask extends AbstractTask {
             endPointObj.setVehicle_qty(1);
             endPointObj.setIs_lock(false);
             pointService.update(endPointObj);
-
-
+            //为了防止中途产生变动，导致二次分配非原先锁定位置，最开始锁定的remark也重新解锁下
+            endPointObj = pointService.getById(taskObj.getRemark());
+            if (ObjectUtil.isNotEmpty(endPointObj)) {
+                endPointObj.setIng_task_code("");
+                endPointObj.setIs_lock(false);
+                pointService.update(endPointObj);
+            }
             // 任务完成
             taskObj.setTask_status(TaskStatus.FINISHED.getCode());
             taskObj.setRemark("任务完成");