取货逻辑优化

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.*

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: