From 74a80161d264f597b827ef91fcd9230be407d7f4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 九月 2025 16:52:46 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 0a3a982..e4b3d26 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,7 +56,6 @@
         <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" />
@@ -64,12 +63,13 @@
     </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 != 104  ) 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 asr_wrk_mast
         where wrk_sts=5
+        or wrk_sts=20
         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) &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))

--
Gitblit v1.9.1