From 6274f4380453d9e2855f5e13645877852f020600 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 16 五月 2023 22:33:11 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index c39dff6..187e23f 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,7 +63,7 @@
</resultMap>
<select id="selectByLocNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y')
+ select top 1 * from asr_wrk_mast where sta_no = #{staNo} and (ctn_no is null or ctn_no != 'Y')
</select>
<select id="selectByLocNo1" resultMap="BaseResultMap">
@@ -161,12 +161,18 @@
</select>
<select id="selectPakOutStep14" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=14 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select top 1 * from dbo.asr_wrk_mast
+ where crn_no=#{crnNo}
+ and ((wrk_sts=14 and io_type in (103,107) and source_sta_no=#{sourceStaNo}) or (wrk_sts in (2,3) and io_type in (53,57) and sta_no=#{sourceStaNo}))
+ order by io_pri desc,io_time,wrk_no asc
</select>
<!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
<select id="selectWorkingPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast
+ where (wrk_sts in (2,3,4) or (wrk_sts=14 and io_type in (103,107)))
+ and io_type != 11 and source_sta_no = #{sourceStaNo}
+ order by io_time,wrk_no
</select>
<select id="selectWorkingPakout" resultMap="BaseResultMap">
@@ -186,4 +192,7 @@
<select id="selectPakoutEmpty" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
</select>
+ <select id="selectpj" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts =14 and barcode=#{barcode}
+ </select>
</mapper>
--
Gitblit v1.9.1