From 58b23d18daa51a9837306fb0a8c03285fbd80e99 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:16:49 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index b99fd2d..23fd172 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -69,12 +69,19 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_sts=5
- 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 take_none = '1' and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
+ or (wrk_sts=15 and dateadd(mi,3,crn_end_time) <= 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))
+ or (wrk_no in (9997,9996) and wrk_sts = 15)
order by io_time,wrk_no asc
</select>
+ <select id="selectWrkMast" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_wrk_mast
+ where wrk_no = #{workNo} and barcode = #{barcode}
+ </select>
+
<select id="selectWrkMastWrkDetl" resultMap="BaseResultMap">
select m.* from asr_wrk_mast m,asr_wrk_detl d
where 1=1
--
Gitblit v1.9.1