From dcdfc93b50febf61301832d91dfcddcfa1ca5403 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 14:06:36 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 5773347..9787512 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -52,6 +52,7 @@
     <select id="selectPakIn" resultMap="BaseResultMap">
         select top 1 * from "SOURCE"."wcs_task_wrk"
         where "STATUS"=1
+        and "WRK_STS"=2
         and "CRN_NO"=#{crnNo}
         and "WRK_NO"=#{workNo}
         and "START_POINT"=#{startPoint}
@@ -122,7 +123,7 @@
         select * from "SOURCE"."wcs_task_wrk"
         where 1=1
         and (("WRK_STS"=14 and "STATUS"=5) or "STATUS"=7 or "STATUS"=4
-                 or ("WRK_STS"=4 and "STATUS"=5))
+                 or ("WRK_STS"=4 and "STATUS"=5) or ("WRK_STS"=14 and "STATUS"=9))
         order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
     </select>
 
@@ -130,7 +131,8 @@
         insert into "SOURCE"."wcs_task_wrk_log"
         select * from "SOURCE"."wcs_task_wrk"
         where "TASK_NO" = #{taskNo}
-          and ("STATUS"=5 or "STATUS"=4 or "STATUS"=6)
+          and ("STATUS"=5 or "STATUS"=4 or "STATUS"=6 or "STATUS"=7  or "STATUS"=9)
+        and ("WRK_NO" not in (select "WRK_NO" from "SOURCE"."asr_bas_devp"))
     </insert>
 
     <insert id="saveToHistoryD">

--
Gitblit v1.9.1