From dd2096e88fc4b44c7d40ffab90719a695dd56b4e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 08:33:20 +0800
Subject: [PATCH] 设备执行状态 回写
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 0d39e15..39b00a3 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,5 +1,8 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.api.controller.params.WorkTaskParams;
+import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.TaskService;
@@ -12,6 +15,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -29,9 +34,11 @@
private WorkMastHandler workMastHandler;
@Autowired
private TaskService taskService;
+ @Autowired
+ private WcsApiService wcsApiService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
@@ -49,23 +56,36 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
- private void executeTask(){
- List<Task> wrkMasts = taskService.selectToBeCompleteData();
+
+ /**
+ * 浠诲姟鑷姩涓嬪彂
+ *
+ * @author Ryan
+ * @date 2026/1/10 14:42
+ */
+// @Scheduled(cron = "0/15 * * * * ? ")
+ private void autoPubTasks() {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
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());
- }
+ Collections.shuffle(wrkMasts);
+ wrkMasts.forEach(wrkMast -> {
+ WorkTaskParams params = new WorkTaskParams();
+ if (wrkMast.getIoType().equals(1)) {
+ params.setType("in");
+ params.setTaskNo(wrkMast.getWrkCode())
+ .setLocNo(wrkMast.getLocNo())
+ .setBarcode(wrkMast.getBarcode())
+ .setTaskPri(Integer.parseInt(wrkMast.getIoPri() + ""));
+ } else {
+ params.setType("out")
+ .setTaskNo(wrkMast.getWrkCode())
+ .setLocNo(wrkMast.getLocNo())
+ .setStaNo(wrkMast.getStaNo())
+ .setTaskPri(Integer.parseInt(wrkMast.getIoPri() + ""));
}
- }
+ wcsApiService.pubWrkToWcs(params);
+ });
}
-
}
--
Gitblit v1.9.1