From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 a4df9e5..ec41fd9 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -67,13 +67,37 @@
</select>
<select id="selectWaitAnalyzeInBoundTask" resultType="com.zy.asrs.wcs.core.entity.Task">
- select * from wcs_task where task_ctg = 1 and task_sts = 1
+ select * from wcs_task where task_sts = 1
+ order by priority desc,start_time,task_no asc
</select>
<select id="selectPakOut" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
where task_sts=101
- and (task_ctg=101 or task_ctg=110)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectWaitAnalyzeMoveTask" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task where task_sts = 301
+ 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>
@@ -101,14 +125,20 @@
<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)
- and shuttle_no = #{shuttleNo}
+ and shuttle_no = #{shuttleNo}
+ <if test="taskNo!=null">
+ and task_no != #{taskNo}
+ </if>
order by priority desc,start_time,task_no asc
</select>
<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)
+ and lift_no = #{liftNo}
+ <if test="taskNo!=null">
+ and task_no != #{taskNo}
+ </if>
order by priority desc,start_time,task_no asc
</select>
--
Gitblit v1.9.1