From 0e1dcb25ccb0249b1b62a4fec7cb3154a50f7e69 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 15 十月 2025 10:15:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 06a0624..35772b4 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,6 +37,11 @@
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
+            if(wrkMast.getIoType() != 11){
+                if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
+                    continue;
+                }
+            }
             ReturnT<String> result = workLogHandler.start(wrkMast);
             if (!result.isSuccess()) {
                 log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
@@ -37,4 +49,18 @@
         }
     }
 
+    @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={}]鍘嗗彶妗e鐞嗗け璐�", basArmMast.getId());
+            }
+        }
+    }
+
 }

--
Gitblit v1.9.1