From ba1c668970f02bcad86561a69aca62490ae8fa33 Mon Sep 17 00:00:00 2001
From: lfdMem <1>
Date: 星期一, 28 四月 2025 15:32:49 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/WrkMastMapper.xml | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 3276b8a..53cb7a2 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -66,6 +66,10 @@
select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y')
</select>
+ <select id="selectByLocNo1" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
+ </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>
@@ -81,6 +85,9 @@
<select id="selectPakInStep1" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+ </select>
+ <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
</select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
@@ -111,6 +118,10 @@
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>
+ <select id="selectLocMove111" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=111 and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
<select id="selectLocMoving" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
@@ -119,26 +130,26 @@
select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
</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 = 180 order by io_time,wrk_no
- </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 = 180 order by io_time,wrk_no-->
+<!-- </select>-->
- <!-- 鍑哄簱浠诲姟 -->
- <select id="selectWorkingPakout" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
- where (wrk_sts in (11,12)
- or (wrk_sts in (14,15) and wrk_no in
- (
- select wrk_no
- from asr_bas_devp
- where wrk_no > 0)
- ))
- and io_type != 11
- and source_sta_no = 180
- order by io_time,wrk_no
- </select>
+<!-- <!– 鍑哄簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
+<!-- select top 1 *-->
+<!-- from dbo.asr_wrk_mast-->
+<!-- where (wrk_sts in (11,12)-->
+<!-- or (wrk_sts in (14,15) and wrk_no in-->
+<!-- (-->
+<!-- select wrk_no-->
+<!-- from asr_bas_devp-->
+<!-- where wrk_no > 0)-->
+<!-- ))-->
+<!-- and io_type != 11-->
+<!-- and source_sta_no = 180-->
+<!-- order by io_time,wrk_no-->
+<!-- </select>-->
<select id="selectCrnWorking" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
@@ -155,4 +166,27 @@
<select id="selectPakOutStep11" resultMap="BaseResultMap">
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="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>
+
+ <select id="selectWorkingPakout" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where (wrk_sts in (11,12)
+ or (wrk_sts in (14,15) and wrk_no in
+ (
+ select wrk_no
+ from asr_bas_devp
+ where wrk_no > 0)
+ ))
+ and io_type != 11
+ 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>
</mapper>
--
Gitblit v1.9.1