From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 11 ++++++++---
1 files changed, 8 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 8a4dc4e..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();
@@ -70,9 +72,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();
/**
* 鍫嗗灈鏈烘槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
@@ -98,4 +100,7 @@
* @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