From 9528744b1db4b4c63beac11aa70c2c2f547858b6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 11 十二月 2025 16:09:56 +0800
Subject: [PATCH] #AGV任务转历史档

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 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 ac0033c..b4bc696 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,29 +1,63 @@
 package com.zy.asrs.task;
 
+import com.zy.asrs.entity.Task;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.TaskService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkLogHandler;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
+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 {
 
     @Autowired
     private WorkLogHandler workLogHandler;
     @Autowired
-    private ConfigService configService;
+    private WrkMastService wrkMastService;
+
+    @Autowired
+    private TaskService taskService;
+
 
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
-        ReturnT<Config> result = workLogHandler.start();
-        if (!result.isSuccess()) {
-            configService.insert(result.getContent());
+        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
+        if (wrkMasts.isEmpty()) {
+            return;
+        }
+        for (WrkMast wrkMast : wrkMasts) {
+            ReturnT<String> result = workLogHandler.start(wrkMast);
+            if (!result.isSuccess()) {
+                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+            }
         }
     }
 
+    @Scheduled(cron = "0/3 * * * * ? ")
+    private void executeTask(){
+        List<Task> taskList = taskService.selectToBeHistoryData();
+        if (taskList.isEmpty()) {
+            return;
+        }
+        for (Task task : taskList) {
+            ReturnT<String> result = workLogHandler.AgvStart(task);
+            if (!result.isSuccess()) {
+                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", task.getWrkNo());
+            }
+        }
+    }
+
+
+
+
 }

--
Gitblit v1.9.1