From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs
---
src/main/resources/mapper/WrkMastMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 2a3cb24..07747c5 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -112,7 +112,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">
@@ -183,4 +183,14 @@
and source_sta_no = #{sourceStaNo}
order by io_time,wrk_no
</select>
+
+ <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
+ </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>
</mapper>
--
Gitblit v1.9.1