From c808221f6a427014d8c112d172f5a1e58abab197 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 26 五月 2025 18:37:12 +0800
Subject: [PATCH] 环境文件备份，数据库备份

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |  262 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 251 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8762dda..a00872f 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,13 @@
 @Repository
 public interface WrkMastMapper extends BaseMapper<WrkMast> {
 
+    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
+    int saveLog(Long workNo);
+
+    WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
+
+    WrkMast selectByLocNo1(@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,16 +25,54 @@
 
     // 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);
 
-    // 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-    @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);
+    WrkMast selectPakInStep111(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
 
-    // 鍑哄簱鏃讹紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-    @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 selectPakOutStep1(@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 selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
+
+    /**
+     * 鏌ヨ鍚屼竴鍙板爢鍨涙満涓嬫墍鏈夊嚭搴撲换鍔�
+     * @param crnNo
+     * @return
+     */
+    List<WrkMast> selectPakInStep12(@Param("crnNo")Integer crnNo);
+
+    // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
+//    @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
+    WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
+    WrkMast selectWrkMastUnstackingOne212();
+
+    WrkMast selectPakInStep4(@Param("staNo")Integer staNo,@Param("sheetNo")String sheetNo);
+    WrkMast selectPakInStep5(@Param("staNo")Integer staNo,@Param("sheetNo")String sheetNo);
+
+    // 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
+//    @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("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, @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 selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectPakOutStep2345(@Param("sourceStaNo")Integer sourceStaNo,@Param("workNo")Integer workNo);
+
+    WrkMast selectPakOutStep3(@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")
+    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}")
@@ -39,5 +81,203 @@
     @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);
+
+//    WrkMast selectWorkingPakin();
+//
+//    WrkMast selectWorkingPakout();
+
+    /**
+     * 鍫嗗灈鏈烘槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+     * @param crnNo
+     * @return
+     */
+    WrkMast selectCrnWorking(@Param("crnNo")Integer crnNo);
+
+    /**
+     * 杈撻�佺嚎鏄惁瀛樺湪鍏ュ簱浠诲姟
+     * @param crnNo
+     * @return
+     */
+    WrkMast selectDevWorking(@Param("crnNo")Integer crnNo);
+
+
+    List<WrkMast> selectPick();
+
+    /**
+     * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊緟鍑哄簱宸ヤ綔妗�
+     * @param crnNO
+     * @param sourceStaNo
+     * @return
+     */
+    List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+
+    /**
+     * 鏌ヨ鍚屼竴鍙板爢鍨涙満涓嬫墍鏈夊嚭搴撲换鍔�
+     * @param crnNO
+     * @return
+     */
+    List<WrkMast> selectPakOutStep12(@Param("crnNo")Integer crnNO);
+
+    WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+
+    WrkMast selectPakoutEmpty(@Param("staNo")Integer outSite);
+
+
+    Integer selectExistInEmpty();
+
+    /**
+     * 鏌ユ壘宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級,涓擱GV鍏ュ簱鎺ラ┏绔欑鍚堢殑鐨勫叆搴撳伐浣滄。
+     * @param rgvNo
+     * @param staNos
+     * @return
+     */
+    List<WrkMast> selectRgvInStep1(@Param("rgvNo")Integer rgvNo, @Param("staNos")List<Integer> staNos);
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪RGV姝ｅ湪宸ヤ綔涓殑浠诲姟
+     * @param rgvNo
+     * @return
+     */
+    List<WrkMast> selectRgvInWorking(@Param("rgvNo")Integer rgvNo);
+
+    /**
+     * 鎸囧畾RGV鍑哄簱绔�,鏌ユ壘宸ヤ綔鐘舵�佷负7(RGV鍏ュ簱鏀捐揣涓�)鐨勫叆搴撳伐浣滄。List
+     * @param rgvInDStn
+     * @return
+     */
+    List<WrkMast> selectRgvInStep2(@Param("rgvInDStn")Integer rgvInDStn);
+
+    /**
+     * 鎸囧畾RGV鍑哄簱绔�,鏌ユ壘宸ヤ綔鐘舵�佷负17(RGV鍑哄簱鏀捐揣涓�)鐨勫嚭搴撳伐浣滄。List
+     * @param rgvOutDStn
+     * @return
+     */
+    List<WrkMast> selectRgvOutStep2(@Param("rgvOutDStn")Integer rgvOutDStn);
+
+    /**
+     * 鎸囧畾RGV鍑哄簱绔�,鏌ユ壘宸ヤ綔鐘舵�佷负7(RGV鍏ュ簱鏀捐揣涓�)鎴� 17(RGV鍑哄簱鏀捐揣涓�) 鐨勫伐浣滄。List
+     * @param rgvDestStn
+     * @return
+     */
+    List<WrkMast> selectRgvDestStep2(@Param("rgvDestStn")Integer rgvDestStn);
+
+    /**
+     * 鏌ユ壘宸ヤ綔鐘舵�佷负14锛堝嚭搴撳畬鎴愶級,涓擱GV鍑哄簱鎺ラ┏绔欑鍚堢殑鐨勫叆搴撳伐浣滄。
+     * @param rgvNo
+     * @param staNos
+     * @return
+     */
+    List<WrkMast> selectRgvOutStep1(@Param("rgvNo")Integer rgvNo, @Param("staNos")List<Integer> staNos);
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪RGV姝ｅ湪鍑哄簱宸ヤ綔涓殑浠诲姟
+     * @param rgvNo
+     * @return
+     */
+    List<WrkMast> selectRgvOutWorking(@Param("rgvNo")Integer rgvNo);
+
+    /*..............................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐..............................*/
+    /*...............................Created by Monkey D. Luffy on 2023.07.19................................*/
+
+    /*=========================================== RGV浠诲姟缁戝畾鐩稿叧 ========================================*/
+
+    /**
+     * 鑾峰彇绛夊緟缁戝畾RGV鐨勪换鍔�
+     * @return
+     */
+    List<WrkMast> selectWaitBindRGV();
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鍏ュ嚭搴撳伐浣滀腑绛夊緟RGV鎼繍鐨勪换鍔�
+     *
+     * @param rgvNo
+     * @return
+     */
+    List<WrkMast> selectIoRgvNo(@Param("rgvNo") Integer rgvNo);
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鍏ュ簱宸ヤ綔涓鍦ㄨ蛋鍚慠GV鐨勪换鍔�
+     * @param wrkNo
+     * @return
+     */
+    WrkMast selectRgvInSteWrkNo(@Param("wrkNo")Integer wrkNo);
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鍑哄簱宸ヤ綔涓鍦ㄨ蛋鍚慠GV鐨勪换鍔�
+     * @param wrkNo
+     * @return
+     */
+    WrkMast selectRgvOutSteWrkNo(@Param("wrkNo")Integer wrkNo);
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鍏ュ簱宸ヤ綔涓瓑寰匯GV鎼繍鐨勪换鍔�
+     * @param rgvNo
+     * @return
+     */
+    WrkMast selectRgvInSteNo(@Param("rgvNo")Integer rgvNo);
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鍑哄簱宸ヤ綔涓瓑寰匯GV鎼繍鐨勪换鍔�
+     * @param rgvNo
+     * @return
+     */
+    WrkMast selectRgvOutSteNo(@Param("rgvNo")Integer rgvNo);
+
+
+    /*=========================================== RGV浠诲姟缁戝畾鐩稿叧 ========================================*/
+
+    /*=========================================== 鑷姩琛ョ┖鏉跨浉鍏� ========================================*/
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鍑哄簱宸ヤ綔涓瓑寰匯GV鎼繍鐨勪换鍔�
+     */
+//    List<WrkMast> selectDischargingMachineOutputTray();
+
+    /**
+     * 鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+     */
+//    List<WrkMast> selectStackingCompletionDriveTray();
+//    /**
+//     * 鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+//     * @param wrkNo
+//     */
+//    @Update("update asr_wrk_mast set wrk_sts=44 where 1=1 and wrk_no=#{wrkNo}")
+//    int updateStackingCompletionDriveTray(@Param("wrkNo")Integer wrkNo);
+
+//    int selectConfigCount10468N();
+    // update Config  -- Y
+//    @Update("update sys_config set value='Y' where 1=1 and id=10468 and value = 'N'")
+//    int updateConfig10468Y();
+    /*=========================================== 鑷姩琛ョ┖鏉跨浉鍏� ========================================*/
+
+    /**
+     * 鏌ユ壘鏄惁瀛樺湪鎷嗗灈鍗曟瀹屾垚鐨勫伐浣滄。
+     */
+    WrkMast selectWrkMastUnstackingOne202(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectWrkMastUnstackingOne202Two(@Param("sourceStaNo")Integer sourceStaNo);
+    WrkMast selectWrkMastUnstackingOne145(@Param("sourceStaNo")Integer sourceStaNo);
+
+    WrkMast selectWrkMastLabelingOne54();
+
+    List<WrkMast> selectWaitBindRGVRgvNo(@Param("rgvNo") Integer rgvNo);
+    List<WrkMast> selectWaitBindRgvNo2(@Param("rgvNo") Integer rgvNo);
+    void insertRgvMast(@Param("wrkNo") Integer wrkNo);
+    void updateRgvMast(@Param("wrkNo") Integer wrkNo);
+
+    WrkMast selectWaitBindRgvNoOneWrkNo(@Param("wrkNo") Integer wrkNo);
+
+
+
+
+    /*..............................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯..............................*/
 }

--
Gitblit v1.9.1