From 707d414c0e6a8baff3ce7affec820f0fc1a13c19 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 24 二月 2026 09:06:04 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 33112bc..78e86ff 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,10 +1,15 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.api.controller.params.AgvCarriesParam;
import com.zy.api.controller.params.WorkTaskParams;
+import com.zy.api.entity.CallAgvParams;
+import com.zy.api.service.AgvScheduleService;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.CompleteParam;
+import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.TaskService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
@@ -35,7 +40,11 @@
@Autowired
private WcsApiService wcsApiService;
@Autowired
+ private MobileService mobileService;
+ @Autowired
private TaskService taskService;
+ @Autowired
+ private AgvScheduleService agvScheduleService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
@@ -77,36 +86,65 @@
/**
- * 浠诲姟鑷姩涓嬪彂
+ * 浠诲姟鑷姩涓嬪彂鍑哄簱浠诲姟
*
* @author Ryan
* @date 2026/1/10 14:42
*/
- @Scheduled(cron = "0/15 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
private void autoPubTasks() {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(11L, 1L)));
if (wrkMasts.isEmpty()) {
return;
}
- Collections.shuffle(wrkMasts);
+// 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 {
+ if (wrkMast.getIoType().equals(11)) {
+ CompleteParam param = new CompleteParam();
+ param.setTaskNo(wrkMast.getWrkNo() + "");
+ param.setSourceLocNo(wrkMast.getSourceLocNo());
+ param.setLocNo(wrkMast.getLocNo());
+// param.set
+ mobileService.taskMove(param, 9527L);
+ } else if (wrkMast.getIoType() > 100) {
params.setType("out")
.setTaskNo(wrkMast.getWrkNo() + "")
- .setLocNo(wrkMast.getLocNo())
+ .setLocNo(wrkMast.getSourceLocNo())
+ .setBarcode(wrkMast.getBarcode())
.setStaNo(wrkMast.getStaNo())
.setTaskPri(wrkMast.getIoPri().intValue());
wcsApiService.pubWrkToWcs(params);
}
});
+
}
-
+ /**
+ * AGV浠诲姟鑷姩涓嬪彂鍑哄簱浠诲姟
+ *
+ * @author Ryan
+ * @date 2026/1/10 14:42
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ private void autoPubAgvTasks() {
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().in("wrk_sts", Arrays.asList(201L, 301L)));
+ if (tasks.isEmpty()) {
+ return;
+ }
+ Collections.shuffle(tasks);
+ tasks.forEach(wrkMast -> {
+ CallAgvParams param = new CallAgvParams();
+ if (wrkMast.getIoType() == 1) {
+ param.setWrkNo(wrkMast.getWrkNo() + "");
+ param.setOrgSite(wrkMast.getSourceStaNo());
+ param.setTarSite(wrkMast.getLocNo());
+ } else if (wrkMast.getIoType() == 110 ||wrkMast.getIoType() == 101){
+ param.setWrkNo(wrkMast.getWrkNo() + "");
+ param.setOrgSite(wrkMast.getSourceLocNo());
+ param.setTarSite(wrkMast.getStaNo());
+ }
+ agvScheduleService.callAgvCarry(param);
+ });
+ }
}
--
Gitblit v1.9.1