From da05dda40512832ec3a8a160ca3cd9ab6d3d36e4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 25 十一月 2025 12:07:37 +0800
Subject: [PATCH] #erp收料单对接
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 35772b4..23ae220 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,10 +41,13 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getIoType() != 11){
+ 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()) {
@@ -49,7 +56,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 +70,18 @@
}
}
+ @Scheduled(cron = "0/10 * * * * ? ")
+ private void executeAgv(){
+ List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 3));
+ if (basAgvstList.isEmpty()) {
+ return;
+ }
+ for (BasAgvMast basAgvMast : basAgvstList) {
+ ReturnT<String> result = workLogHandler.startAgv(basAgvMast);
+ if (!result.isSuccess()) {
+ log.error("AGV宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basAgvMast.getId());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1