From da0b260a1caf7cee4c789768f8382ef75d00187d Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Fri, 21 Jun 2024 17:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E8=B4=A7=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/tasks/auto/mapper/AutoMapper.xml       | 17 +++++++++++++----
 .../src/main/resources/config/application.yml   |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

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 ffc6884..f3530c2 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
@@ -21,17 +21,26 @@
         ORDER BY p.row_num, p.col_num
     </select>
     <select id="getZCSameMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT p.*
+        SELECT vg.material_id,p.*
         FROM sch_base_point p
                  LEFT JOIN sch_base_vehiclematerialgroup vg
                            ON p.vehicle_code = vg.vehicle_code
-                               AND p.vehicle_type = vg.vehicle_type
                                AND vg.group_bind_material_status = '2'
         WHERE p.region_code = 'ZC'
-          AND p.point_status = '1'
           AND p.is_used = TRUE
+          and p.point_status=1
+          and p.row_num in (
+            SELECT p.row_num
+            FROM sch_base_point p
+                     LEFT JOIN sch_base_vehiclematerialgroup vg
+                               ON p.vehicle_code = vg.vehicle_code
+                                   AND vg.group_bind_material_status = '2'
+            WHERE p.region_code = 'ZC'
+              and vg.material_id=#{materialId}
+        )
         ORDER BY p.row_num, p.col_num
-            LIMIT 1;
+            limit 1
+
     </select>
     <select id="getZCEmptyMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
         SELECT p.*
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index e6955d8..413c719 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data: