From 328c49518617bba79319dbac366724e095ba53b9 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Mon, 5 Aug 2024 11:07:51 +0800
Subject: [PATCH] fix

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

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 883ff17..afb249f 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
@@ -95,7 +95,7 @@ public class KGHJRKTask extends AbstractTask {
             }
             task.setPoint_code2(point.getNext_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
+            task.setRemark(point.getPoint_code());
             taskService.update(task);
 
             //发起任务时先把点位占用，防止发起重复任务
@@ -264,6 +264,14 @@ public class KGHJRKTask extends AbstractTask {
                 endPointObj.setIng_task_code("");
                 endPointObj.setIs_lock(false);
                 pointService.update(endPointObj);
+            }else{
+                //如果等待点未二次分配取消，通过remark找到初始锁定点位解锁软锁
+                endPointObj = pointService.getById(taskObj.getRemark());
+                if (ObjectUtil.isNotEmpty(endPointObj)) {
+                    endPointObj.setIng_task_code("");
+                    endPointObj.setIs_lock(false);
+                    pointService.update(endPointObj);
+                }
             }
             taskObj.setRemark("任务取消");
             taskObj.setTask_status(TaskStatus.CANCELED.getCode());