From 06e1ebee3ec23ceed20477eba43b2925ef6bb0c3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:33:46 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/TaskWrkMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 7e8c685..1fadd87 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -118,12 +118,15 @@
     <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=14 and status=5) or status=7 or status=4 or (wrk_sts=4 and status=5))
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
     <insert id="saveToHistory">
-        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4)
+        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4 or status=6)
+    </insert>
+    <insert id="saveToHistoryD">
+        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo}
     </insert>
 
     <select id="selectWorkingTask" resultMap="BaseResultMap">

--
Gitblit v1.9.1