From ff952db837b9193a58ddf42396d8aff34d5b34ff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 08:03:46 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 bef12fb..195e689 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
@@ -1780,8 +1780,7 @@
break;
}
// convey plc valid
- //if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
- if (false){
+ if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
// reserve rollback
staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
break;
@@ -1796,8 +1795,7 @@
break;
}
// convey plc valid
- //if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
- if (false){
+ if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
// reserve rollback
staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
break;
--
Gitblit v1.9.1