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 | 84 +++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index c13627a..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;
@@ -11,78 +12,61 @@
@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 dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
- WrkMast selectPakInStep23456(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
+ List<WrkMast> selectInStep4();
- // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
-// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
- WrkMast selectCrnWaiting(@Param("workNo")Integer workNo);
+ WrkMast selectByWorkNo(Integer workNo);
- WrkMast selectPakInStep45(@Param("workNo")Integer workNo);
+ WrkMast selectByMainWrkNo(Integer workNo);
- WrkMast selectCarWaiting(@Param("workNo")Integer workNo);
+ WrkMast selectByShuttleNo(Integer shuttleNo);
- // 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-// @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 selectPickStepByBarcode(@Param("barcode")String barcode);
+ List<WrkMast> selectLiftStep223103();
- // 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
- WrkMast selectPakOutStep111215(@Param("crnNo")Integer crnNo, @Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectByWorkNo324104(Integer workNo);
- List<WrkMast> selectWorkingOfPakOutBySource(@Param("locNos") List<String> locNos);
+ List<WrkMast> selectBy2125();
- // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
- WrkMast selectPakOutStep16(@Param("sourceStaNo")Integer sourceStaNo);
+ //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
+ List<WrkMast> selectNoShuttleWrkByLev(String lev);
- // 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
- WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
+ List<WrkMast> selectShuttleWrkByLev(String lev);
- WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+ List<WrkMast> selectShuttleOutWrkByLev(String lev);
- WrkMast selectWorking(@Param("crnNo")Integer crnNo);
+ WrkMast selectLiftWrkMast(Integer liftNo);
- // work log -------------------------------------------------------
- @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
- int saveWrkMastLog(Integer workNo);
+ WrkMast selectLiftWrkMastAndWrkNo(@Param("liftNo") Integer liftNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);
- @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
- int saveWrkDetlLog(Integer workNo);
+ List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
- // 閫氱煡妗� ----------------------------------------------------------------------
+ WrkMast selectPickStepByBarcode(String barcode);
- // update 鍏ュ簱閫氱煡妗� -- Y
- @Update("update cust_wait_pakin set io_status='Y' where zpallet = #{barcode}")
- int updateWaitPakInStep1(String barcode);
+ WrkMast selectShuttleHasMoveWorking(@Param("shuttleNo") Integer shuttleNo);
- // update 鍏ュ簱閫氱煡妗� -- F
- @Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
- int updateWaitPakInStep2(String barcode);
+ List<WrkMast> selectShuttleMoveWrk();
- @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
- int setSteEmpty(Integer wrkNo);
+ WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
- WrkMast selectPakin(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
+ WrkMast selectShuttleWorking2(@Param("shuttleNo") Integer shuttleNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
- WrkMast selectPakout(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
+ 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