From cfdeb9cc1eceb83f96137e285587704c1799c849 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 09:06:05 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   22 +++++++++++++++++++---
 1 files changed, 19 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 a41becf..328b9da 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,7 +2,8 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -14,13 +15,18 @@
     // wcs ---------------------------------------------
     // 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
 //    @Select("select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC")
-    WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
+    WrkMast selectPakInStep1(@Param("sourceStaNo") Integer sourceStaNo, @Param("barcode") String barcode);
 
-    WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectPakInStep11(@Param("sourceStaNo") Integer sourceStaNo);
 
     List<WrkMast> selectInStep4();
 
     WrkMast selectByWorkNo(Integer workNo);
+
+    WrkMast selectByMainWrkNo(Integer workNo);
+
+    WrkMast selectByShuttleNo(Integer shuttleNo);
+
 
     List<WrkMast> selectLiftStep223103();
 
@@ -37,6 +43,8 @@
 
     WrkMast selectLiftWrkMast(Integer liftNo);
 
+    WrkMast selectLiftWrkMastAndWrkNo(@Param("liftNo") Integer liftNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);
+
     List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
 
     WrkMast selectPickStepByBarcode(String barcode);
@@ -47,10 +55,18 @@
 
     WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
 
+    WrkMast selectShuttleWorking2(@Param("shuttleNo") Integer shuttleNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
+
+
     WrkMast selectByBarcode(String barcode);
 
     List<WrkMast> selectInWrkMastByLiftNo(Integer liftNo);//鎼滅储鎸囧畾鎻愬崌鏈虹殑鍏ュ簱浠诲姟
 
     WrkMast selectChargeWorking(Integer shuttleNo);
 
+    WrkMast selectChargeWorkingByChargeSta(Integer chargeSta);
+
+    WrkMast selectWorkingPakout(Integer staNo);
+
+    WrkMast selectWorkingPakin(Integer staNo);
 }

--
Gitblit v1.9.1