From 0e8ed55d684ed8a683b97a11b8619f15c6e18223 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 27 十月 2025 18:59:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index fe46f21..884015d 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,6 +1,11 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasArmMastLogService;
+import com.zy.asrs.service.BasArmMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
@@ -22,6 +27,8 @@
private WorkLogHandler workLogHandler;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private BasArmMastService basArmMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -30,7 +37,12 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getSheetNo() != null && wrkMast.getSheetNo().equals("2")){
+ 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);
@@ -40,4 +52,32 @@
}
}
+ @Scheduled(cron = "0/5 * * * * ? ")
+ private void executeArm(){
+ 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());
+ }
+ }
+ }
+
+ @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