From 6e28ed413a6adfa60000c092aae2464ab2e43fd4 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 31 十二月 2025 10:11:33 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 2d2890e..10ff983 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -247,7 +247,9 @@
List<Long> taskIds = taskList.stream().map(Task::getId).distinct().collect(Collectors.toList());
for (Task task : taskList) {
- Agv agv = allocateService.execute(task);
+ Agv agv = allocateService.execute(task, () => {
+
+ });
if (null == agv) {
// log.warn("Task[{}] has an issue锛� because it failed to check out agv which is idle...", task.getSeqNum());
continue;
@@ -296,7 +298,7 @@
return o2.getPriority() - o1.getPriority();
}
});
- Integer backpack = agvService.getBackpack(agv);
+ Integer backpack = agvService.getBackpack(agvId);
if (taskList.size() > backpack) {
taskList = taskList.subList(0, backpack);
}
@@ -1495,26 +1497,42 @@
success = true;
break;
case ORI_STA:
+ // load from sta
sta = staService.getById(currTask.getOriSta());
- success = staReserveService.waitingStaReserve(sta, currTask, 1, StaReserveType.OUT);
-
- boolean permit = conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT);
-
- // load sta
- // remove expiredTime
+ // reserve to be waiting
+ if (!staReserveService.waitingStaReserve(sta, currTask, 1, StaReserveType.OUT)) {
+ break;
+ }
+ // convey plc valid
+ if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
+ // reserve rollback
+ staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
+ break;
+ }
+ success = true;
break;
case DEST_STA:
- // place sta
+ // place to sta
sta = staService.getById(currTask.getDestSta());
- success = staReserveService.waitingStaReserve(sta, currTask, 1, StaReserveType.IN);
+ // reserve to be waiting
+ if (!staReserveService.waitingStaReserve(sta, currTask, 1, StaReserveType.IN)) {
+ break;
+ }
+ // convey plc valid
+ if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
+ // reserve rollback
+ staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
+ break;
+ }
+ success = true;
break;
default:
log.error("agv[{}] has wrong posType [{}], segment [{}]", protocol.getAgvNo(), posType.toString(), currSeg.getId());
break;
}
}
-
}
+
} catch (Exception e) {
log.error("agv[{}] failed to deal with action request, qrCode={}", agv.getUuid(), agv_06_up.getVal(), e);
}
@@ -1574,8 +1592,6 @@
}
if (taskComplete) {
-// locService.taskCallBack(task);
-
task.setTaskSts(TaskStsType.COMPLETE.val());
task.setEndTime(now);
task.setUpdateTime(now);
--
Gitblit v1.9.1