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 |   18 +++++++++++++++++-
 1 files changed, 17 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 f1b73e2..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);
 
@@ -114,5 +118,17 @@
 
     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