From 8b8a2086509e28bb902166aa35e4c287eb906621 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 六月 2025 15:28:39 +0800
Subject: [PATCH] #禁止跨层
---
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
index f3550fb..cd32c17 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -105,7 +105,7 @@
<select id="selectWorkingByShuttle" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
- where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403)
+ where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403,501,502,503)
and shuttle_no = #{shuttleNo}
<if test="taskNo!=null">
and task_no != #{taskNo}
@@ -115,8 +115,11 @@
<select id="selectWorkingByLift" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
- where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403)
- and lift_no = #{liftNo}
+ where task_sts in (1,2,3,101,102,103,201,202,203,301,302,303,401,402,403,501,502,503)
+ and lift_no = #{liftNo}
+ <if test="taskNo!=null">
+ and task_no != #{taskNo}
+ </if>
order by priority desc,start_time,task_no asc
</select>
@@ -126,5 +129,21 @@
and shuttle_no = #{shuttleNo}
order by priority desc,start_time,task_no asc
</select>
+ <select id="selectWaitAnalyzeLadenMoveTask" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task where task_sts = 501
+ order by priority desc,start_time,task_no asc
+ </select>
+ <select id="selectLadenMoveByAnalyzeSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (502)
+ order by priority desc,start_time,task_no asc
+ </select>
+ <select id="selectLadenMoveByExecuteSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (503)
+ order by priority desc,start_time,task_no asc
+ </select>
</mapper>
--
Gitblit v1.9.1