From 08915b05c42b2ba97a8bb0809aeb48802ae63b46 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index f9522b8..62b4d8c 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -89,7 +89,9 @@
*/
@Scheduled(cron = "0/5 * * * * ? ")
private void autoPubTasks() {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(11L, 1L)));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", Arrays.asList(11L, 1L))
+ .orderDesc(Arrays.asList("io_pri")));
if (wrkMasts.isEmpty()) {
return;
}
@@ -97,8 +99,7 @@
listMap.keySet().forEach(key -> {
List<WrkMast> wrkMasts1 = listMap.get(key);
Collections.shuffle(wrkMasts1);
- Integer crnNos = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", key));
- if (crnNos < 6) {
+ try {
wrkMasts1.forEach(wrkMast -> {
WorkTaskParams params = new WorkTaskParams();
if (wrkMast.getIoType().equals(11)) {
@@ -117,6 +118,8 @@
wcsApiService.pubWrkToWcs(params);
}
});
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
});
}
@@ -173,11 +176,17 @@
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 || wrkMast.getIoType() == 103){
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53) {
+ if (wrkMast.getIsNewIn().equals("XM1")) {
+ param.setWrkNo(wrkMast.getWrkNo() + "");
+ param.setOrgSite(wrkMast.getSourceStaNo());
+ param.setTarSite(wrkMast.getStaNo());
+ } else {
+ param.setWrkNo(wrkMast.getWrkNo() + "");
+ param.setOrgSite(wrkMast.getSourceStaNo());
+ param.setTarSite(wrkMast.getLocNo());
+ }
+ } else if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103){
param.setWrkNo(wrkMast.getWrkNo() + "");
param.setOrgSite(wrkMast.getSourceLocNo());
param.setTarSite(wrkMast.getStaNo());
--
Gitblit v1.9.1