From a94b7bd0c1af79224dfe4effc83eff957bf0747c Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Sat, 15 Jun 2024 20:28:44 +0800
Subject: [PATCH] fix

---
 .../task_manage/task/tasks/auto/GHCMLTask.java    |  2 +-
 .../task_manage/task/tasks/auto/GHCQLTask.java    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
index 0da9aae..69a5f66 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
@@ -111,7 +111,7 @@ public class GHCMLTask extends AbstractTask {
         // 设置组盘 - 需要的话由子类自行实现
         task.setGroup_id(setGroupPlate(jsonObject));
         // 设置等待点并修改创建成功状态
-        task.setNext_wait_point(point.getPoint_code());
+        task.setPoint_code2(point.getPoint_code());
         task.setTask_status(TaskStatus.CREATED.getCode());
         task.setRemark("");
         TaskUtils.setUpdateByAcs(task);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
index 9aceba6..c9f5b8a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
@@ -113,6 +113,10 @@ public class GHCQLTask extends AbstractTask {
         point.setIng_task_code(task.getTask_code());
         PointUtils.setUpdateByAcs(point);
         pointService.updateById(point);
+        //任务创建后锁住终点
+        SchBasePoint nextPoint = pointService.getById(task.getPoint_code2());
+        nextPoint.setIng_task_code(task.getTask_code());
+        pointService.updateById(point);
     }
 
     /**
@@ -212,6 +216,7 @@ public class GHCQLTask extends AbstractTask {
             endPointObj.setVehicle_code(taskObj.getVehicle_code());
             endPointObj.setVehicle_type(taskObj.getVehicle_type());
             endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
+            endPointObj.setIng_task_code("");
             PointUtils.setUpdateByType(endPointObj, taskFinishedType);
             pointService.updateById(endPointObj);
         }
@@ -226,12 +231,20 @@ public class GHCQLTask extends AbstractTask {
     public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
         String startPoint = taskObj.getPoint_code1();
         SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 终点解锁
+        // 起点解锁
         if (ObjectUtil.isNotEmpty(startPointObj)) {
             startPointObj.setIng_task_code("");
             PointUtils.setUpdateByType(startPointObj, taskFinishedType);
             pointService.updateById(startPointObj);
         }
+        String nextPoint = taskObj.getPoint_code2();
+        SchBasePoint nextPointObj = pointService.getById(nextPoint);
+        // 终点解锁
+        if (ObjectUtil.isNotEmpty(nextPointObj)) {
+            nextPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(nextPointObj, taskFinishedType);
+            pointService.updateById(nextPointObj);
+        }
         taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
         taskObj.setTask_status(TaskStatus.CANCELED.getCode());
         taskObj.setFinished_type(taskFinishedType.getCode());