From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 74 +++++++++---------------------------
1 files changed, 19 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 5de2551..9dd9c7e 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -11,13 +11,6 @@
@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")
@@ -25,70 +18,41 @@
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);
+ List<WrkMast> selectLiftStep223103();
- WrkMast selectCarWaiting(@Param("workNo")Integer workNo);
+ WrkMast selectByWorkNo324104(Integer workNo);
- // 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-// @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);
+ List<WrkMast> selectBy2125();
- WrkMast selectPickStepByBarcode(@Param("barcode")String barcode);
+ //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
+ List<WrkMast> selectNoShuttleWrkByLev(String lev);
- // 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-// @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);
+ List<WrkMast> selectShuttleWrkByLev(String lev);
- List<WrkMast> selectWorkingOfPakOutBySource(@Param("locNos") List<String> locNos);
+ List<WrkMast> selectShuttleOutWrkByLev(String lev);
- // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-// @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);
+ WrkMast selectLiftWrkMast(Integer liftNo);
- // 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-// @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> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
- WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+ WrkMast selectPickStepByBarcode(String barcode);
- WrkMast selectWorking(@Param("crnNo")Integer crnNo);
+ WrkMast selectShuttleHasMoveWorking(@Param("shuttleNo") Integer shuttleNo);
- // work log -------------------------------------------------------
- @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
- int saveWrkMastLog(Integer workNo);
+ List<WrkMast> selectShuttleMoveWrk();
- @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
- int saveWrkDetlLog(Integer workNo);
+ WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
- // 閫氱煡妗� ----------------------------------------------------------------------
+ WrkMast selectByBarcode(String barcode);
- // update 鍏ュ簱閫氱煡妗� -- Y
- @Update("update cust_wait_pakin set io_status='Y' where zpallet = #{barcode}")
- int updateWaitPakInStep1(String barcode);
+ List<WrkMast> selectInWrkMastByLiftNo(Integer liftNo);//鎼滅储鎸囧畾鎻愬崌鏈虹殑鍏ュ簱浠诲姟
- // update 鍏ュ簱閫氱煡妗� -- F
- @Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
- int updateWaitPakInStep2(String barcode);
+ WrkMast selectChargeWorking(Integer shuttleNo);
- @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
- int setSteEmpty(Integer wrkNo);
-
- WrkMast selectPakin(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
-
- WrkMast selectPakout(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
-
- WrkMast selectWorkingByCrn(@Param("crnNo")Integer crnNo);
-
- WrkMast selectPakinWorkingByGroupLoc(@Param("locNos")List<String> locNos);
-
- WrkMast selectPakoutWorkingByGroupLoc(@Param("locNos")List<String> locNos);
+ WrkMast selectChargeWorkingByChargeSta(Integer chargeSta);
}
--
Gitblit v1.9.1