From b90e5934dacde7ba72061b9c7ffeab2b547143e7 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期六, 08 十一月 2025 13:03:01 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index fac4623..93d66e3 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -73,6 +73,10 @@
select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
</select>
+ <select id="selectBy122ManQu" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where sta_no = #{staNo} and io_type = #{ioType} and wrk_sts = #{wrkSts}
+ </select>
+
<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>
@@ -99,7 +103,7 @@
</select>
<select id="selectPakInStep12" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} 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 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57 or io_type = 12 or io_type = 59) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
@@ -111,7 +115,7 @@
</select>
<select id="selectPakInStep5" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo}
+ select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo} and sheet_no!= '0'
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
@@ -123,7 +127,7 @@
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and (io_type>100 or io_type = 12) order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectPakOutStep3" resultMap="BaseResultMap">
@@ -131,7 +135,7 @@
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc, io_time,wrk_no
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
@@ -180,8 +184,16 @@
</select>
<select id="selectPakOutStep12" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and (io_type>100 or io_type = 12) order by io_pri desc,io_time,wrk_no asc
</select>
+
+ <select id="countPakOut" resultType="Integer">
+ select count(*)
+ from dbo.asr_wrk_mast
+ where io_type = 101
+ and wrk_sts = 2
+ </select>
+
<!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
<select id="selectWorkingPakin" resultMap="BaseResultMap">
@@ -347,8 +359,20 @@
SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =51 and source_sta_no = #{sourceStaNo}
</select>
+ <select id="selectWrkMastUnstackingOne202Two" resultMap="BaseResultMap">
+ SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =52 and source_sta_no = #{sourceStaNo}
+ </select>
+
+ <select id="selectWrkMastUnstackingOne145" resultMap="BaseResultMap">
+ SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=1 and wrk_sts =2 and sheet_no='4' and source_sta_no = #{sourceStaNo}
+ </select>
+
<select id="selectWrkMastLabelingOne54" resultMap="BaseResultMap">
SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =54
</select>
+ <select id="selectWrkMastUnstackingOne212" resultMap="BaseResultMap">
+ SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=212 and sta_no =212
+ </select>
+
</mapper>
--
Gitblit v1.9.1