From cea1758e1f540e3f5f807951f128b7385b32afe6 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期六, 24 一月 2026 17:03:04 +0800
Subject: [PATCH] agv增加主动查询状态

---
 src/main/resources/mapper/TaskMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index bb52fca..17c6689 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -34,13 +34,13 @@
 
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
-        select * from agv_task where ((wrk_sts = 4 Or wrk_sts = 14 Or wrk_sts = 15 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
+        select * from agv_task where is_deleted = 0 and(((wrk_sts = 4 Or wrk_sts = 14 Or wrk_sts = 15 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) ) order by upd_mk,error_time,io_time,wrk_no
     </select>
 
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from agv_task
-        where wrk_sts=5 or wrk_sts=15
+        where  is_deleted = 0 and( wrk_sts=5 or wrk_sts=15)
         order by io_time,wrk_no asc
     </select>
 </mapper>

--
Gitblit v1.9.1