From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index e5f5ad1..cc08129 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -16,7 +16,12 @@
import java.util.List;
/**
- * 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚鐨勬暟鎹�
+ * 浠诲姟绫诲瀷锛�
+ * 飦� putaway锛氫笂鏋躲��
+ * 飦� carry锛氭惉杩愶紝缁熸寚鍑哄簱銆佺Щ搴撱�佺偣鍒扮偣鎼繍绛夈��
+ * 飦� scan锛氭壂鎻忕洏鐐广��
+ * 飦� weight锛氱О閲嶇洏鐐广��
+ * 飦� rfid锛歳fid鐩樼偣銆�
*/
@Slf4j
@Component
@@ -27,11 +32,19 @@
@Autowired
AgvWrkMastService agvWrkMastService;
+
+ /*
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.搴撴牸绉昏浇)鐨勬暟鎹�
+ */
@Scheduled(cron = "0/5 * * * * ? ")
public void excutePutwayWrk(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 205)
- .eq("io_type",1));
+ .andNew().eq("io_type",53)
+ .or().eq("io_type",1)
+ .or().eq("io_type",57)
+ .or().eq("io_type",10)
+ .or().eq("io_type",11));
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
ReturnT<String> returnT = agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
@@ -39,13 +52,35 @@
}
}
+ /*
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负206.瀹瑰櫒绂诲満瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void excuteCarryWrk(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 206)
+ .andNew().eq("io_type",110)
+ .or().eq("io_type",101));
+ if(!Cools.isEmpty(agvWrkMastList)){
+ agvWrkMastList.stream().forEach(agvWrkMast -> {
+ ReturnT<String> returnT = agvWrkMastHandler.completedCarryWrk(agvWrkMast);
+ });
+ }
+ }
+
+ /*
+ putaway锛氫笂鏋�
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
+ */
@Scheduled(cron = "0/5 * * * * ? ")
public void startPutwayWrk(){
-
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
,new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 201)
- .eq("io_type", 1)).getRecords();
+ .andNew().eq("io_type", 53)
+ .or().eq("io_type", 1)
+ .or().eq("io_type", 10)
+ .or().eq("io_type", 57)).getRecords();
if(!Cools.isEmpty(agvWrkMastList)){
try {
@@ -55,4 +90,28 @@
}
}
}
+
+ /*
+ carry锛氭惉杩愶紝缁熸寚鍑哄簱銆佺Щ搴撱�佺偣鍒扮偣鎼繍绛�
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓�(鍑哄簱绫诲瀷涓� 101.鍑哄簱 || 103.鎷ｆ枡鍑哄簱 || 11.搴撴牸绉绘牻 || 110.绌烘澘鍑哄簱 || 107.鐩樼偣鍑哄簱)鐨勬暟鎹�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void startCarryWrk(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
+ ,new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 21)
+ .andNew().eq("io_type", 101)
+ .or().eq("io_type", 103)
+ .or().eq("io_type", 11)
+ .or().eq("io_type", 110)
+ .or().eq("io_type", 107)).getRecords();
+
+ if(!Cools.isEmpty(agvWrkMastList)){
+ try {
+ ReturnT<String> returnT = agvWrkMastHandler.startCarryWrk(agvWrkMastList);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ }
+ }
+ }
}
--
Gitblit v1.9.1