From dcf49806e12b014cf6471910814fdbcb6f494c44 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 27 四月 2026 09:11:01 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 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 24e02bf..74c3af3 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
@@ -1904,34 +1904,12 @@
case ORI_STA:
// load from sta
sta = staService.getById(currTask.getOriSta());
- // reserve to be waiting
- if (!staReserveService.waitingStaReserve(sta, currTask, currSeg, 1, StaReserveType.OUT)) {
- break;
- }
- // convey plc valid
- if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
- // reserve rollback
- staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
- break;
- }
- News.info("AGV [{}] load permitted at conveyor station [{}]", protocol.getAgvNo(), sta.getStaNo());
- success = true;
+ success = staService.allowAgvWorkAtSta(protocol.getAgvNo(), sta, currTask, currSeg, StaReserveType.OUT);
break;
case DEST_STA:
// place to sta
sta = staService.getById(currTask.getDestSta());
- // reserve to be waiting
- if (!staReserveService.waitingStaReserve(sta, currTask, currSeg, 1, StaReserveType.IN)) {
- break;
- }
- // convey plc valid
- if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
- // reserve rollback
- staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
- break;
- }
- News.info("AGV [{}] unload permitted at conveyor station [{}]", protocol.getAgvNo(), sta.getStaNo());
- success = true;
+ success = staService.allowAgvWorkAtSta(protocol.getAgvNo(), sta, currTask, currSeg, StaReserveType.IN);
break;
default:
News.error("AGV [{}] has wrong posType [{}], segment [{}]", protocol.getAgvNo(), posType.toString(), currSeg.getId());
@@ -2040,5 +2018,4 @@
// segment call back
segmentService.processNext(segmentList);
}
-
}
--
Gitblit v1.9.1