From 1fdb2ee8b5482b53825815fb4f73a5bb0fd33b22 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 22 六月 2024 14:55:55 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml |    8 +++++---
 1 files changed, 5 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 40cd790..f3550fb 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -67,14 +67,13 @@
     </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>
 
@@ -107,7 +106,10 @@
     <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>
 

--
Gitblit v1.9.1