From 0161b04fea3c8f05d445076dc66c838f89ebb337 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 12 九月 2025 16:05:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdwcs' into ycawdwcs
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8f0fa36..6de66b7 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -37,7 +37,7 @@
WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-// @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)")
+// @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (14,16) and (io_type=103 or io_type=107 or io_type=104)")
WrkMast selectPickStep(@Param("barcode")String barcode);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
@@ -106,4 +106,12 @@
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+
+ /**
+ * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊凡鍑哄簱宸ヤ綔妗�
+ * @param crnNO
+ * @param sourceStaNo
+ * @return
+ */
+ WrkMast selectPakOutStep14(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
}
--
Gitblit v1.9.1