From 7dd4ffa405be3d4aaf23b328b5db2b9d485a17d1 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 30 一月 2026 09:00:58 +0800
Subject: [PATCH] 添加移库接口 修改自动下发任务 添加条码入库申请
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 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 10bffd4..b5b1f15 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,6 +1,11 @@
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;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -10,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;
@@ -25,9 +32,13 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private WcsApiService wcsApiService;
+ @Autowired
+ private TaskService taskService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
@@ -45,4 +56,57 @@
}
}
+ @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());
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 浠诲姟鑷姩涓嬪彂鍑哄簱浠诲姟
+ *
+ * @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(11L)));
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ Collections.shuffle(wrkMasts);
+ wrkMasts.forEach(wrkMast -> {
+ WorkTaskParams params = new WorkTaskParams();
+// if (wrkMast.getIoType().equals(1)) {
+// params.setType("in");
+// params.setTaskNo(wrkMast.getWrkNo() + "")
+// .setLocNo(wrkMast.getLocNo())
+// .setBarcode(wrkMast.getBarcode())
+// .setTaskPri(wrkMast.getIoPri().intValue());
+// } else {
+ params.setType("out")
+ .setTaskNo(wrkMast.getWrkNo() + "")
+ .setLocNo(wrkMast.getLocNo())
+ .setStaNo(wrkMast.getStaNo())
+ .setTaskPri(wrkMast.getIoPri().intValue());
+ wcsApiService.pubWrkToWcs(params);
+// }
+ });
+ }
+
+
}
--
Gitblit v1.9.1