From 7e1e714c49a20468fcc7c7c37d4f65142abb2528 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 五月 2025 11:19:12 +0800
Subject: [PATCH] #电视机增加批号
---
src/main/resources/mapper/WrkMastMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 54bace6..a91ba57 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">
@@ -92,7 +92,7 @@
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=55 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
@@ -160,9 +160,19 @@
select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
+ <select id="selectPakOutStep14" resultMap="BaseResultMap">
+ 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">
@@ -179,4 +189,32 @@
and source_sta_no = #{sourceStaNo}
order by io_time,wrk_no
</select>
+ <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 wrk_sts =14 and barcode=#{barcode}
+ </select>
+
+ <select id="selectLaneWrkMastIn" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where wrk_sts=2 and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ </select>
+
+ <select id="selectLaneWrkMastOut" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where wrk_sts in (11,12,13,14) and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <select id="selectByWrkNo" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_no = #{wrkNo} and (wrk_sts = 13 or wrk_sts = 2 or io_type = 199) order by io_pri desc,io_time,wrk_no asc
+ </select>
+ <select id="selectCrn5Task2" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where wrk_sts=1 and io_type=1 and crn_no=5 order by io_pri desc,io_time,wrk_no ASC
+ </select>
+
+ <select id="getLastWrkMast105" resultMap="BaseResultMap">
+ SELECT TOP 1 mast.* FROM asr_wrk_mast mast
+ JOIN asr_wrk_detl detl
+ ON mast.wrk_no = detl.wrk_no AND mast.io_type = 105 AND mast.wrk_sts = 14 AND detl.weight is null
+ ORDER BY mast.modi_time
+ </select>
</mapper>
--
Gitblit v1.9.1