From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 29 九月 2025 13:34:21 +0800 Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态,显示清楚 (完成) 4. 站点保存报错, 修改人,创建人员显示 错误(完成) 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型,应该为入库 (完成) --- src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java index 92be3a2..0d39e15 100644 --- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java @@ -1,12 +1,16 @@ 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.WorkMastHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; import java.util.Date; import java.util.List; @@ -14,7 +18,7 @@ /** * Created by vincent on 2020/7/7 */ -//@Component +@Component public class WorkMastScheduler { private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class); @@ -23,6 +27,8 @@ private WrkMastService wrkMastService; @Autowired private WorkMastHandler workMastHandler; + @Autowired + private TaskService taskService; @Scheduled(cron = "0/3 * * * * ? ") private void execute(){ @@ -43,4 +49,23 @@ } } + @Scheduled(cron = "0/3 * * * * ? ") + private void executeTask(){ + List<Task> wrkMasts = taskService.selectToBeCompleteData(); + if (wrkMasts.isEmpty()) { + return; + } + for (Task wrkMast : wrkMasts) { + ReturnT<String> returnT = workMastHandler.AgvStart(wrkMast); + if (!returnT.isSuccess()) { + wrkMast.setUpdMk("X"); + wrkMast.setErrorMemo(returnT.getMsg()); + wrkMast.setErrorTime(new Date()); + if (!taskService.updateById(wrkMast)) { + log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo()); + } + } + } + } + } -- Gitblit v1.9.1