From 0f69561e397093b5165c4aac58530721d5c62178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 十一月 2024 11:03:16 +0800
Subject: [PATCH] #led
---
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 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 7467945..33b6eef 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -13,25 +13,72 @@
<select id="selectByAnalyzeSts" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
where 1=1
- and task_sts in (2, 102, 202, 302)
+ and task_sts in (2, 102)
order by priority desc,start_time,task_no asc
</select>
<select id="selectByExecuteSts" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
where 1=1
- and task_sts in (3, 103, 203, 303)
+ and task_sts in (3, 103)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectChargeByAnalyzeSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (202)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectChargeByExecuteSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (203)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectManualByAnalyzeSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (402)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectManualByExecuteSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (403)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectMoveByAnalyzeSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (302)
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectMoveByExecuteSts" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where 1=1
+ and task_sts in (303)
order by priority desc,start_time,task_no asc
</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>
@@ -49,10 +96,30 @@
order by priority desc,start_time,task_no asc
</select>
+ <select id="selectManualWorking" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where task_sts in (401,402,403)
+ and shuttle_no = #{shuttleNo}
+ order by priority desc,start_time,task_no asc
+ </select>
+
<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,201,202,203,204,301,302,303,401,402,403)
- and shuttle_no = #{shuttleNo}
+ where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403)
+ 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,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