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 | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 69829aa..a00872f 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -11,6 +11,9 @@
@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);
@@ -24,6 +27,8 @@
// 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
// @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 selectPakInStep111(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
@@ -41,6 +46,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);
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
// @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 +62,9 @@
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
// @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")
@@ -229,15 +241,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);
- 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