From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 8c1d459..9e296c8 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -5,13 +5,17 @@
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
+import java.io.Serializable;
import java.util.List;
@Mapper
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
- WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
+
+ WrkMast selectCrn5Task2();
+
+ WrkMast selectByLocNo( @Param("staNo") String staNo);
WrkMast selectByLocNo1(@Param("sourceLocNo") String sourceLocNo);
@@ -101,6 +105,30 @@
*/
List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ /**
+ * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊凡鍑哄簱宸ヤ綔妗�
+ * @param crnNO
+ * @param sourceStaNo
+ * @return
+ */
+ WrkMast selectPakOutStep14(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+
+ WrkMast selectPakoutEmpty(@Param("staNo")Integer outSite);
+
+ /**
+ * 鏌ヨ鏄惁鏄洏鐐瑰嚭搴擄紝妫�鏂欏嚭搴�
+ */
+ WrkMast selectpj(@Param("staNo")Integer staNo,@Param("barcode")String barcode);
+
+ List<WrkMast> selectLaneWrkMastIn();//鏌ヨ鍏ュ簱浠诲姟
+
+ List<WrkMast> selectLaneWrkMastOut();//鏌ヨ鍑哄簱浠诲姟
+
+ WrkMast selectByWrkNo(Integer wrkNo);
+
+ WrkMast getLastWrkMast105();
+
}
--
Gitblit v1.9.1