From 62606f9cc72b1aff1e65f9f0169f97edfecf643f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期一, 29 十二月 2025 14:30:34 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 b3058b4..ed78f93 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
@@ -100,6 +100,8 @@
private ActionSorter actionSorter;
@Autowired
private StaReserveService staReserveService;
+ @Autowired
+ private ConveyorStationService conveyorStationService;
@SuppressWarnings("all")
@Transactional
@@ -1493,23 +1495,42 @@
success = true;
break;
case ORI_STA:
+ // load from sta
sta = staService.getById(currTask.getOriSta());
- success = staReserveService.waitingStaReserve(sta, currTask, 1, 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);
}
@@ -1569,8 +1590,6 @@
}
if (taskComplete) {
-// locService.taskCallBack(task);
-
task.setTaskSts(TaskStsType.COMPLETE.val());
task.setEndTime(now);
task.setUpdateTime(now);
--
Gitblit v1.9.1