From aaf32ea778ce17f13de970f1a1dc558bbbc5b9b0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 19 五月 2023 10:51:46 +0800
Subject: [PATCH] 指令

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index c236c59..8c1d459 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -13,6 +13,8 @@
 
     WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
 
+    WrkMast selectByLocNo1(@Param("sourceLocNo") String sourceLocNo);
+
 //    @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
     List<WrkMast> selectToBeCompleteData();
 
@@ -27,7 +29,7 @@
 
     // 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
 //    @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} 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")
-    WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo);
+    WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
 
     // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
 //    @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
@@ -35,11 +37,11 @@
 
     // 鎷f枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
 //    @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);
+    WrkMast selectPickStep(@Param("barcode")String barcode);
 
     // 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
 //    @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);
+    WrkMast selectPakOutStep1(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
 
     // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
 //    @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")
@@ -70,4 +72,35 @@
     @Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
     int updateWaitPakInStep2(String barcode);
 
+//    WrkMast selectWorkingPakin();
+//
+//    WrkMast selectWorkingPakout();
+
+    /**
+     * 鍫嗗灈鏈烘槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+     * @param crnNo
+     * @return
+     */
+    WrkMast selectCrnWorking(@Param("crnNo")Integer crnNo);
+
+    /**
+     * 杈撻�佺嚎鏄惁瀛樺湪鍏ュ簱浠诲姟
+     * @param crnNo
+     * @return
+     */
+    WrkMast selectDevWorking(@Param("crnNo")Integer crnNo);
+
+
+    List<WrkMast> selectPick();
+
+    /**
+     * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊緟鍑哄簱宸ヤ綔妗�
+     * @param crnNO
+     * @param sourceStaNo
+     * @return
+     */
+    List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+
+    WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
 }

--
Gitblit v1.9.1