From 7cd8c743cb1f377a3102d9a154669fb2bc10535c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 26 六月 2023 18:10:58 +0800
Subject: [PATCH] lift

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   81 ++++++++++++++++++++++++++++++++--------
 1 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2c374ac..b474982 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;
@@ -14,6 +11,8 @@
 @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();
 
@@ -21,32 +20,47 @@
 
     // 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")
+//    @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 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 selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo);
+//    @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);
 
     // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
-    @Select("select top 1 from dbo.asr_wrk_mast where wrk_no={workNo}")
-    WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
+//    @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
+    WrkMast selectCrnWaiting(@Param("workNo")Integer workNo);
+    WrkMast selectCrnWaiting2(@Param("workNo")Integer workNo);
+
+    WrkMast selectPakInStep45(@Param("workNo")Integer workNo);
+
+    WrkMast selectCarWaiting(@Param("workNo")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("workNo")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);
+
+    WrkMast selectPickStepByBarcode(@Param("barcode")String barcode);
 
     // 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-    @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 selectPakOutStep1(@Param("crnNo")Integer crnNO);
+//    @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> selectWorkingOfPakOutBySource(@Param("locNos") List<String> locNos);
 
     // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-    @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 selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
+//    @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);
 
     // 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-    @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")
+//    @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);
+
+    WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+
+    WrkMast selectWorking(@Param("crnNo")Integer crnNo);
 
     // work log -------------------------------------------------------
     @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
@@ -55,5 +69,40 @@
     @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
     int saveWrkDetlLog(Integer workNo);
 
+    // 閫氱煡妗� ----------------------------------------------------------------------
 
+    // update 鍏ュ簱閫氱煡妗� -- Y
+    @Update("update cust_wait_pakin set io_status='Y' where zpallet = #{barcode}")
+    int updateWaitPakInStep1(String barcode);
+
+    // update 鍏ュ簱閫氱煡妗�  -- F
+    @Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
+    int updateWaitPakInStep2(String barcode);
+
+    @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);
+
+    List<WrkMast> selectAll(@Param("staNo")Integer staNo);
+
+    WrkMast selectAllC();
+
+    WrkMast selectRackInStep48(Short workNo,Integer staNo);
+
+    WrkMast selectByWorkNo(Integer workNo);
+
+    WrkMast selectLiftStep262327();
+
+    WrkMast selectByWorkNo372428(Integer workNo);
+
+    List<WrkMast> selectBy2125();
 }

--
Gitblit v1.9.1