From 0df6e7bb33c9f6a18f026a500776b00cbf2ae62c Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 24 十二月 2024 09:48:06 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index cddf0f1..e7f394d 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -2,10 +2,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.WrkMast; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; import java.util.List; @@ -20,18 +17,43 @@ List<WrkMast> selectToBeHistoryData(); // wcs --------------------------------------------- - @Select("select top 1 wrk_no,loc_no,source_sta_no,sta_no,crn_no,wrk_sts,io_type 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") + // 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ +// @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); - @Select("select top 1 loc_no,source_sta_no,sta_no,wrk_no,crn_no,wrk_sts,io_type,source_loc_no,io_time 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("workNo")Integer workNo); + WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo); - // work log ------------------------------------------------------- - @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}") - int saveWrkMastLog(Integer workNo); + List<WrkMast> selectInStep4(); - @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}") - int saveWrkDetlLog(Integer workNo); + WrkMast selectByWorkNo(Integer workNo); + List<WrkMast> selectLiftStep223103(); + + WrkMast selectByWorkNo324104(Integer workNo); + + List<WrkMast> selectBy2125(); + + //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟 + List<WrkMast> selectNoShuttleWrkByLev(String lev); + + List<WrkMast> selectShuttleWrkByLev(String lev); + + List<WrkMast> selectShuttleOutWrkByLev(String lev); + + WrkMast selectLiftWrkMast(Integer liftNo); + + List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗� + + WrkMast selectPickStepByBarcode(String barcode); + + WrkMast selectShuttleHasMoveWorking(@Param("shuttleNo") Integer shuttleNo); + + List<WrkMast> selectShuttleMoveWrk(); + + WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ) + + WrkMast selectByBarcode(String barcode); + + List<WrkMast> selectInWrkMastByLiftNo(Integer liftNo);//鎼滅储鎸囧畾鎻愬崌鏈虹殑鍏ュ簱浠诲姟 } -- Gitblit v1.9.1