From 53f4cc4d271fc723f7a9a2f3de89c4ea8ede49a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 13:30:01 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 6e65e4a..7654c7e 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -13,14 +13,28 @@
<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="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>
@@ -35,5 +49,32 @@
order by priority desc,start_time,task_no asc
</select>
+ <select id="hasChargeInLoc" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where task_sts in (201,202,203,204)
+ and dest_loc = #{locNo}
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectMoveWorking" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where task_sts in (301,302,303)
+ 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}
+ order by priority desc,start_time,task_no asc
+ </select>
+
+ <select id="selectChargeWorking" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where task_sts in (201,202,203,204)
+ and shuttle_no = #{shuttleNo}
+ order by priority desc,start_time,task_no asc
+ </select>
</mapper>
--
Gitblit v1.9.1