From 7ab1bf4c111cbfa3a35685aa9aa0ed3599b6b6c7 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 18 二月 2024 20:58:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 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 e5bbc0b..32176dd 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -41,6 +41,10 @@
     // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
 //    @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);
 
     // 鎷f枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
 //    @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)")
@@ -53,6 +57,8 @@
     // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
 //    @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 selectPakOutStep3(@Param("sourceStaNo")Integer sourceStaNo);
 
     // 搴撲綅绉昏浆宸ヤ綔妗o紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
 //    @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")
@@ -229,25 +235,41 @@
     /**
      * 鏌ユ壘鏄惁瀛樺湪鍑哄簱宸ヤ綔涓瓑寰匯GV鎼繍鐨勪换鍔�
      */
-    List<WrkMast> selectDischargingMachineOutputTray();
+//    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);
+//    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();
+//    int selectConfigCount10468N();
     // update Config  -- Y
-    @Update("update sys_config set value='Y' where 1=1 and id=10468 and value = 'N'")
-    int updateConfig10468Y();
+//    @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