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 |   26 ++++++++++++++++++++++++--
 1 files changed, 24 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 f3550fb..ec41fd9 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -82,6 +82,25 @@
         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>
+
     <select id="hasChargeInLoc" resultType="com.zy.asrs.wcs.core.entity.Task">
         select * from wcs_task
         where task_sts in (201,202,203,204)
@@ -115,8 +134,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)
+        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