From 92c9df2ee599e9f3cce757b6d817da30d90321c6 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 29 Jun 2026 20:34:26 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E8=BD=A6=E9=97=B4=E9=85=8D=E9=80=81=E5=AE=9A=E6=97=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/SchBasePointMapper.java        | 21 +------------------
 .../service/dao/mapper/SchBasePointMapper.xml | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java
index 4e555d1..d2a51ef 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java
@@ -30,26 +30,7 @@ public interface SchBasePointMapper extends BaseMapper<SchBasePoint> {
      */
     List<SchBasePoint> getAllUnlockAbnormalPoints();
 
-    @Select("SELECT p.*\n" +
-            "FROM sch_base_point p\n" +
-            "WHERE p.is_used = 1\n" +
-            "  AND p.region_code IN \n" +
-            "  <foreach collection='regions' item='region' open='(' separator=',' close=')'>\n" +
-            "    #{region}\n" +
-            "  </foreach>\n" +
-            "  AND NOT EXISTS (\n" +
-            "    SELECT 1\n" +
-            "    FROM sch_base_task t\n" +
-            "    WHERE t.is_delete = 0\n" +
-            "      AND t.task_status <= '20'\n" +
-            "      AND (\n" +
-            "        t.point_code1 = p.point_code\n" +
-            "        OR t.point_code2 = p.point_code\n" +
-            "        OR t.point_code3 = p.point_code\n" +
-            "        OR t.point_code4 = p.point_code\n" +
-            "      )\n" +
-            "  )\n" +
-            "ORDER BY p.point_code")
+
     List<SchBasePoint> selectIdlePoint(@Param("regions") List<String> regions);
 
     /**
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml
index 78579c4..95fba31 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml
@@ -63,4 +63,25 @@
         </where>
         ORDER BY p.region_code, p.point_code, p.point_type
     </select>
+    <select id="selectIdlePoint" resultType="org.nl.wms.sch_manage.service.dao.SchBasePoint">
+        SELECT p.*
+        FROM sch_base_point p
+        WHERE p.is_used = 1
+        <if test="regions != null and regions.size() > 0">
+            AND p.region_code IN
+            <foreach collection="regions" item="region" open="(" separator="," close=")">
+                #{region}
+            </foreach>
+        </if>
+        AND NOT EXISTS (
+            SELECT 1
+            FROM sch_base_task t
+            WHERE t.is_delete = 0
+            AND t.task_status &lt;= '20'
+            AND (
+            t.point_code1 = p.point_code
+            OR t.point_code2 = p.point_code)
+        )
+        ORDER BY p.point_code
+    </select>
 </mapper>