From 059aad5260176ca87acc9944313cdb2e3f643337 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Tue, 16 Jul 2024 16:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=8C=96=E5=AE=A4=E5=87=BA=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=AB=E6=96=99=E5=88=A4=E6=96=AD=E7=BB=88=E7=82=B9=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89=E4=BB=BB=E5=8A=A1=E5=8F=B7&=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=AE=8C=E6=88=90=E6=89=BE=E7=BB=84=E7=9B=98=E7=94=A8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9C=AC=E8=BA=AB=E7=9A=84=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/tasks/auto/GHCMLTask.java            |  6 +++--
 .../task/tasks/auto/mapper/AutoMapper.xml     | 22 +++++++++++++++----
 2 files changed, 22 insertions(+), 6 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 b03473b..bf15f8f 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
@@ -216,12 +216,14 @@ public class GHCMLTask extends AbstractTask {
     public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
         String startPoint = taskObj.getPoint_code1();
         String endPoint = taskObj.getPoint_code2();
+        String vehicle_code= JSONObject.parseObject(taskObj.getRequest_param()).getString("vehicle_code");
+        String vehicle_type= JSONObject.parseObject(taskObj.getRequest_param()).getString("vehicle_type");
         SchBasePoint startPointObj = pointService.getById(startPoint);
         SchBasePoint endPointObj = pointService.getById(endPoint);
         if (ObjectUtil.isNotEmpty(endPointObj)) {
             SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getVehicleGroupInfo(
-                    startPointObj.getVehicle_code(),
-                    startPointObj.getVehicle_type(),
+                    vehicle_code,
+                    vehicle_type,
                     GroupBindMaterialStatusEnum.BOUND.getValue());
             TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
             vehiclematerialgroup.setTask_code(taskObj.getTask_code());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
index ce0b4bb..c3def9c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
@@ -7,10 +7,24 @@
             p.*
         FROM
             `sch_base_point` p
-        WHERE '5' = (SELECT p1.point_status FROM sch_base_point p1 WHERE p1.point_code = p.parent_point_code AND p1.region_code='GH'
-                                                                     AND p1.point_type = '1')
-          AND p.region_code = 'GH' AND p.point_type = '3' AND p.point_status = '1'
-        ORDER BY p.row_num, p.col_num
+        WHERE
+                '5' = (
+                SELECT
+                    p1.point_status
+                FROM
+                    sch_base_point p1
+                WHERE
+                    p1.point_code = p.parent_point_code
+                  AND p1.region_code = 'GH'
+                  AND p1.point_type = '1'
+            )
+          AND p.region_code = 'GH'
+          AND p.point_type = '3'
+          AND p.point_status = '1'
+          and (p.ing_task_code = '' OR p.ing_task_code IS NULL)
+        ORDER BY
+            p.row_num,
+            p.col_num
     </select>
     <select id="getGHSExitMaterialList" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
         SELECT