From 62e2362ad2d62678712e3a40c5d611ddc9cd95f0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 09:30:26 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/WrkMastMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 3bca05f..f9d225e 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -86,6 +86,11 @@
<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="selectPakInStep1All" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and crn_no=#{crnNo} 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>
@@ -97,6 +102,19 @@
<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>
+
+ <select id="selectPakInStep103" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=103 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>
+
+
+
+
+ <select id="selectByPltType" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=103 and crn_no=#{crnNo} and plt_type =#{pltType} order by io_pri desc,io_time,wrk_no ASC
+ </select>
+
+
<select id="selectPakInStep3" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
@@ -117,7 +135,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 or wrk_sts=108) and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
@@ -169,6 +187,13 @@
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="selectPakOutStep105" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=105 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
--
Gitblit v1.9.1