From 6c258de9be7d09a3f9f8d043a6a68bc03f073fc2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 八月 2020 10:54:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 5f98223..aa086c1 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -32,9 +32,13 @@
     @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")
     WrkMast selectPickStep(@Param("workNo")Integer workNo);
 
-    // 鍑哄簱鏃讹紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
+    // 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
+    @Select("select top 1 * from dbo.asr_wrk_mast where crn_no={crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
+    WrkMast selectPakOutStep1(@Param("crnNo")Integer crnNO);
+
+    // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
     @Select("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")
-    WrkMast selectPakOutStep1(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
 
     // work log -------------------------------------------------------
     @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")

--
Gitblit v1.9.1