From d250ca5d40e6b28c7f79c3d8ea724f039288dec3 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期五, 12 八月 2022 12:40:24 +0800
Subject: [PATCH] Merge branch 'hylywcs' of http://47.97.1.152:5880/r/zy-wcs into hylywcs

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 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 6f9c9c0..ceaad8d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -70,8 +70,35 @@
     @Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
     int updateWaitPakInStep2(String barcode);
 
-    WrkMast selectWorkingPakin();
+//    WrkMast selectWorkingPakin();
+//
+//    WrkMast selectWorkingPakout();
 
-    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