From a6b49351ea3d9f70b2ef2aed0bf6fab865f7055e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:33:54 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/WrkMastMapper.xml |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index f3ef02c..7875a50 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,23 +56,60 @@
         <result column="log_err_time" property="logErrTime" />
         <result column="log_err_memo" property="logErrMemo" />
         <result column="barcode" property="barcode" />
-        <result column="Pdc_type" property="PdcType" />
         <result column="ctn_no" property="ctnNo" />
         <result column="full_plt" property="fullPlt" />
-
+        <result column="pre_have" property="preHave" />
+        <result column="take_none" property="takeNone" />
     </resultMap>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
-        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) 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="selectToBeCompleteData202" resultMap="BaseResultMap">
+        select * from asr_wrk_mast where wrk_sts = 56 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
     </select>
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from asr_wrk_mast
         where wrk_sts=5
+        or wrk_sts=44
+        or wrk_sts=64
+        or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
         order by io_time,wrk_no asc
     </select>
 
+    <select id="selectToBeHistoryData2" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where
+        wrk_sts=15 and ove_mk='N' and io_type = 110 and sta_no = 213 and wrk_no in (select wrk_no from asr_bas_devp where dev_no = 213)
+        order by io_time,wrk_no asc
+    </select>
+
+    <update id="orderAddPri">
+        UPDATE asr_wrk_mast
+        SET io_pri = io_pri + 100000
+        WHERE 1=1
+          AND wrk_no IN (
+            SELECT wrk_no
+            FROM asr_wrk_detl
+            WHERE order_no = #{orderNo}
+        );
+    </update>
+
+    <update id="orderReducePri">
+        UPDATE asr_wrk_mast
+        SET io_pri = io_pri - 100000
+        WHERE 1=1
+          AND io_pri >= 100001
+          AND wrk_no IN (
+            SELECT wrk_no
+            FROM asr_wrk_detl
+            WHERE order_no = #{orderNo}
+        );
+    </update>
+
 </mapper>

--
Gitblit v1.9.1