From 0d663103c178d04f725fb0ef3a4ce2fa454b9244 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index fa2274c..9d41995 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,36 +1,65 @@
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;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.List;
+
/**
* Created by vincent on 2020/7/7
*/
+@Slf4j
@Component
public class WorkLogScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(WorkLogScheduler.class);
@Autowired
private WorkLogHandler workLogHandler;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private BasArmMastService basArmMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
- if (null == wrkMast) {
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
+ if (wrkMasts.isEmpty()) {
return;
}
- ReturnT<String> result = workLogHandler.start(wrkMast);
- if (!result.isSuccess()) {
- log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ 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;
+ }
+ }
+ ReturnT<String> result = workLogHandler.start(wrkMast);
+ if (!result.isSuccess()) {
+ log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ 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());
+ }
}
}
--
Gitblit v1.9.1