From 4d0d1312f0782bd90cec598a6125fe503b0fd727 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 15 十月 2025 09:28:30 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 83c4cce..611e118 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -69,12 +69,18 @@
<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 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))
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