From afb07cb87c993a7054d4c482afc2738cda1b175c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 一月 2026 12:46:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 884015d..98d61d4 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.BasAgvMast;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasAgvMastService;
import com.zy.asrs.service.BasArmMastLogService;
import com.zy.asrs.service.BasArmMastService;
import com.zy.asrs.service.WrkMastService;
@@ -29,6 +31,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasArmMastService basArmMastService;
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -37,14 +41,6 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- 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());
@@ -68,14 +64,14 @@
@Scheduled(cron = "0/10 * * * * ? ")
private void executeAgv(){
- List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
- if (basArmMastList.isEmpty()) {
+ List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 4));
+ if (basAgvstList.isEmpty()) {
return;
}
- for (BasArmMast basArmMast : basArmMastList) {
- ReturnT<String> result = workLogHandler.startArm(basArmMast);
+ for (BasAgvMast basAgvMast : basAgvstList) {
+ ReturnT<String> result = workLogHandler.startAgv(basAgvMast);
if (!result.isSuccess()) {
- log.error("ARM宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basArmMast.getId());
+ log.error("AGV宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basAgvMast.getId());
}
}
}
--
Gitblit v1.9.1