From 966626cb396cdd881e4f7684078bbf6dbdabe34f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 九月 2025 11:14:08 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/TaskWrkMapper.xml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 7644a05..c8304a1 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -119,7 +119,7 @@
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from dbo.wcs_task_wrk
         where 1=1
-        and ((wrk_sts=14 and status=5) or status=4 or (wrk_sts=4 and status=5))
+        and ((wrk_sts=15 and status=5) or status=4 or (wrk_sts=5 and status=5))
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
@@ -129,9 +129,16 @@
 
     <select id="selectWorkingTask" resultMap="BaseResultMap">
         select * from dbo.wcs_task_wrk
+        where (wrk_sts=5 and io_type = 1)
+        or (wrk_sts=15 and io_type = 2)
+        or (wrk_sts = 5 and io_type = 3)
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+    <select id="selectbyWrksts4" resultMap="BaseResultMap">
+        select * from dbo.wcs_task_wrk
         where (wrk_sts=4 and io_type = 1)
-        or (wrk_sts=14 and io_type = 2)
-        or (wrk_sts = 4 and io_type = 3)
+           or (wrk_sts=14 and io_type = 2)
+           or (wrk_sts = 4 and io_type = 3)
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 

--
Gitblit v1.9.1