From 48490a0ae4384f8b4077a700837f7021082b239a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 08:02:58 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 10 ++++++----
1 files changed, 6 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 e149266..bef12fb 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,7 +1780,8 @@
break;
}
// convey plc valid
- if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
+ //if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
+ if (false){
// reserve rollback
staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
break;
@@ -1795,7 +1796,8 @@
break;
}
// convey plc valid
- if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
+ //if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
+ if (false){
// reserve rollback
staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
break;
@@ -1816,8 +1818,8 @@
AGV_06_DOWN agv_06_down = new AGV_06_DOWN();
agv_06_down.setSerialNo(agv_06_up.getSerialNo());
agv_06_down.setActionCode(agv_06_up.getActionCode());
- agv_06_down.setResult(success ? 1 : 0);
-
+ //agv_06_down.setResult(success ? 1 : 0);
+ agv_06_down.setResult(1);
redis.push(RedisConstant.AGV_PATH_DOWN_FLAG, AgvProtocol.build(protocol.getAgvNo()).setMessageBody(agv_06_down));
}
--
Gitblit v1.9.1