From 1aeaa1b1ce5df8e285777fedc1fcaae954badc1d Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 25 Jul 2024 16:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD0101=E4=B8=BA=E7=A9=BA=E4=BD=86=E5=89=8D=E9=9D=A2?=
 =?UTF-8?q?=E6=9C=89=E8=B4=A7=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java    | 1 +
 .../nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml | 1 +
 2 files changed, 2 insertions(+)

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 8d5fa8d..71ecf0f 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
@@ -370,6 +370,7 @@ public class GHCMLTask extends AbstractTask {
                 .collect(Collectors.toList());
         JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param());
         SchBasePoint result = findNextPoint(nextRegionStr, jsonObject);
+        log.info("任务{}二次分配找到目标点位{}",task_id, result.getPoint_code());
         // 锁住货位点
         PointUtils.setUpdateByAcs(result);
         result.setIng_task_code(task.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 c3def9c..64f7e2e 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
@@ -62,6 +62,7 @@
           AND p.is_used = TRUE
           AND p.point_code like '%01-01%'
           AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
+          AND 0= (Select count(*) from sch_base_point p2 where point_status=2 and p.row_num=p2.row_num)
         ORDER BY p.row_num, p.col_num
             LIMIT 1;
     </select>