From 136d22c6c5810ed3e8e98727583a6a812d08ecd2 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 12 八月 2022 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 16 +++++++++++++---
1 files changed, 13 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 26517b8..ceaad8d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -70,9 +70,9 @@
@Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
int updateWaitPakInStep2(String barcode);
- WrkMast selectWorkingPakin();
-
- WrkMast selectWorkingPakout();
+// WrkMast selectWorkingPakin();
+//
+// WrkMast selectWorkingPakout();
/**
* 鍫嗗灈鏈烘槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
@@ -91,4 +91,14 @@
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