From 0207912e815f085b92405ca5dbca727a55746d30 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 12 十一月 2024 14:03:19 +0800
Subject: [PATCH] 从龙南拉取新分支杰上杰

---
 src/main/resources/mapper/WrkMastMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 6ce2d79..78d045c 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -111,7 +111,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 = 16) and io_type>100 order by io_pri desc,wrk_sts ASC,io_time desc,wrk_no ASC
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
@@ -192,4 +192,7 @@
         select * from asr_wrk_mast
         where wrk_no = #{wrkNo}
     </select>
+    <select id="selectBy104" resultType="com.zy.entity.WrkMast">
+        select top 1 * from asr_wrk_mast awm where awm.sta_no = 104 and awm.wrk_sts = 11 order by awm.appe_time
+    </select>
 </mapper>

--
Gitblit v1.9.1