From 8ea4c0fa09a08ec40e5f453bcde0fc7397b15b0d Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 09 十二月 2025 15:08:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index cad09df..4a21c46 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -37,11 +37,14 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000){
- if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
- continue;
- }
- }
+// if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
+// if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
+// continue;
+// }
+// }
+// if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
+// continue;
+// }
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
@@ -49,7 +52,7 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
private void executeArm(){
List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
if (basArmMastList.isEmpty()) {
@@ -63,4 +66,18 @@
}
}
+// @Scheduled(cron = "0/10 * * * * ? ")
+ private void executeAgv(){
+ List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
+ if (basArmMastList.isEmpty()) {
+ return;
+ }
+ for (BasArmMast basArmMast : basArmMastList) {
+ ReturnT<String> result = workLogHandler.startArm(basArmMast);
+ if (!result.isSuccess()) {
+ log.error("ARM宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basArmMast.getId());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1