From f510760823f431891a501cd556928e215702ddb7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 13:36:11 +0800
Subject: [PATCH] 999

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   59 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index e748e0d..328b9da 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,9 +1,9 @@
 package com.zy.asrs.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.LocMast;
 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;
@@ -12,41 +12,21 @@
 @Repository
 public interface WrkMastMapper extends BaseMapper<WrkMast> {
 
-    WrkMast selectBySourceLocNo(@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();
-
-    List<WrkMast> selectToBeHistoryData();
-
     // 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);
 
-    // 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-//    @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)")
-    WrkMast selectPickStep(@Param("wrkNo")Short wrkNo);
-
-    WrkMast selectWorking(@Param("crnNo")Integer crnNo);
-
-    // work log -------------------------------------------------------
-    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
-    int saveWrkMastLog(Integer workNo);
-
-    @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
-    int saveWrkDetlLog(Integer workNo);
-
-    @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
-    int setSteEmpty(Integer wrkNo);
-
-    List<WrkMast> selectAll(@Param("staNo")Integer staNo);
-
-    WrkMast selectRackInStep4(Short workNo,Integer staNo);
+    List<WrkMast> selectInStep4();
 
     WrkMast selectByWorkNo(Integer workNo);
+
+    WrkMast selectByMainWrkNo(Integer workNo);
+
+    WrkMast selectByShuttleNo(Integer shuttleNo);
+
 
     List<WrkMast> selectLiftStep223103();
 
@@ -59,9 +39,11 @@
 
     List<WrkMast> selectShuttleWrkByLev(String lev);
 
+    List<WrkMast> selectShuttleOutWrkByLev(String lev);
+
     WrkMast selectLiftWrkMast(Integer liftNo);
 
-    List<WrkMast> selectInOutWrkMast();//鏌ヨ鍑哄叆搴撳伐浣滄。
+    WrkMast selectLiftWrkMastAndWrkNo(@Param("liftNo") Integer liftNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);
 
     List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
 
@@ -72,4 +54,19 @@
     List<WrkMast> selectShuttleMoveWrk();
 
     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