From 52433e1e316923c8fc26e2742e9943897c9271e7 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 31 五月 2024 08:49:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 93 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 3bf8d47..f17466b 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvLocMastService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.task.core.ReturnT;
@@ -25,9 +27,11 @@
private AutoMoveHandler autoMoveHandler;
@Autowired
private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
// 璋冩嫧鍑哄簱
- @Scheduled(cron = "0/2 * * * * ? ")
+// @Scheduled(cron = "0/2 * * * * ? ")
private void execute(){
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
new EntityWrapper<AgvLocMast>()
@@ -44,13 +48,37 @@
}
- // 璋冩嫧鍑哄簱
+ /**
+ * 鑷姩璋冩嫧浠诲姟锛屼粠1妤艰皟鎷ㄥ埌2妤硷紝
+ * wrkSts 22.璋冩嫧寰呭垎閰�
+ * ioType 108.鑷姩璋冩嫧
+ * crnNo :2鐩爣妤煎眰
+ */
@Scheduled(cron = "0/2 * * * * ? ")
private void execute2(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
+ .eq("crn_no",2)
+ .orderBy("appe_time",true)
);
+ if (agvWrkMastList.isEmpty()) {
+ return;
+ }
+ for (AgvWrkMast agvWrkMast : agvWrkMastList) {
+ ReturnT<String> returnT = autoMoveHandler.start2(agvWrkMast);
+ }
+
+ }
+
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void execute5(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 22)
+ .andNew().eq("io_type",108)
+ .eq("crn_no",3)
+ .orderBy("appe_time",true)
+ );
if (agvWrkMastList.isEmpty()) {
return;
}
@@ -77,7 +105,7 @@
}
// 绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -97,10 +125,9 @@
private void autoEmptyBack3(){
// 宸ヤ綔妗ｄ负201 涓� 鍏ュ嚭搴撶被鍨嬩负109
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
- .eq("wrk_sts", 201)
+ .eq("wrk_sts", 214)
.eq("loc_no","")
- .or().eq("io_type",109)
- .or().eq("io_type",112));
+ .eq("io_type",113));
if (agvWrkMastList.isEmpty()) {
return;
}
@@ -110,7 +137,7 @@
}
// 绌烘澘鑷姩鍥炲簱
- //@Scheduled(cron = "0/2 * * * * ? ")
+// @Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack2(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -124,6 +151,65 @@
for (AgvLocMast agvLocMast : agvLocMasts) {
ReturnT<String> returnT = autoMoveHandler.autoEmptyBack2(agvLocMast);
}
+ }
+ /**
+ * 绌烘澘鑷姩鍥炲簱
+ * 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿
+ * 姣忓眰鏈�澶� 鍦� 鍥炲簱鏁伴噺闄愬埗5鏉�
+ * 浼樺厛閫夋嫨鍏堝埌鎺ラ┏浣嶏紙鎺ラ┏浣嶅彲鍏ワ級 鍚庨�夋嫨鐩存帴鍥炲簱
+ */
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void autoEmptyBack4(){
+ // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
+ new EntityWrapper<AgvLocMast>()
+ .ne("floor", 1)
+ .eq("loc_sts","D")
+ .eq("loc_type1",3));
+ if (agvLocMasts.isEmpty()) {
+ return;
+ }
+ for (AgvLocMast agvLocMast : agvLocMasts) {
+ ReturnT<String> returnT = autoMoveHandler.autoEmptyBack4(agvLocMast);
+ }
+ }
+
+ /**
+ * 绔欑偣鏄惁鑷姩
+ * 鑷姩锛� 鐢熸垚 109 鑷姩鍥炴祦
+ * 鎵嬪姩锛� 鐢熸垚 113 鎵嬪姩鍥炴祦
+ * 浼樺厛閫夋嫨鍏堝埌鎺ラ┏浣嶏紙鎺ラ┏浣嶅彲鍏ワ級 鍚庨�夋嫨鐩存帴鍥炲簱
+ */
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void autoEmptyBack5(){
+ List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
+ .ne("floor", 1)
+ .eq("loc_sts", "F")
+ .like("dev_no", "DB"));
+ if (agvBasDevps.isEmpty()) {
+ return;
+ }
+ for (AgvBasDevp agvBasDevp : agvBasDevps) {
+ ReturnT<String> returnT = autoMoveHandler.autoEmptyBack5(agvBasDevp);
+ }
+ }
+
+ /**
+ * 妫�娴�1妤兼帴椹崇偣
+ * 鎵嬪姩锛� 鐢熸垚 113 鎵嬪姩鍥炴祦
+ */
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void autoEmptyBack6(){
+ List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
+ .eq("floor", 1)
+ .eq("loc_sts", "F")
+ .like("dev_no", "DB"));
+ if (agvBasDevps.isEmpty()) {
+ return;
+ }
+ for (AgvBasDevp agvBasDevp : agvBasDevps) {
+ ReturnT<String> returnT = autoMoveHandler.autoEmptyBack6(agvBasDevp);
+ }
}
}
--
Gitblit v1.9.1