root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取货逻辑优化

Browse Source
This commit is contained in:
psh
2024-06-21 17:56:18 +08:00
parent 85e42f9ca4
commit da0b260a1c
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
View File

@@ -21,17 +21,26 @@
ORDER BY p.row_num, p.col_num ORDER BY p.row_num, p.col_num
</select> </select>
<select id="getZCSameMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint"> <select id="getZCSameMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT p.* SELECT vg.material_id,p.*
FROM sch_base_point p FROM sch_base_point p
LEFT JOIN sch_base_vehiclematerialgroup vg LEFT JOIN sch_base_vehiclematerialgroup vg
ON p.vehicle_code = vg.vehicle_code ON p.vehicle_code = vg.vehicle_code
AND p.vehicle_type = vg.vehicle_type
AND vg.group_bind_material_status = '2' AND vg.group_bind_material_status = '2'
WHERE p.region_code = 'ZC' WHERE p.region_code = 'ZC'
AND p.point_status = '1'
AND p.is_used = TRUE 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 ORDER BY p.row_num, p.col_num
LIMIT 1; limit 1
</select> </select>
<select id="getZCEmptyMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint"> <select id="getZCEmptyMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT p.* SELECT p.*

2
lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: prod active: dev
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data: