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 | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 95e0cc9..93d66e3 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -103,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 or io_type = 12) 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">
@@ -127,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">
@@ -135,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">
@@ -187,6 +187,14 @@
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">
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