From 12c3f4de5ce151b50e187066a3c105260523abb8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 30 四月 2026 10:04:56 +0800
Subject: [PATCH] 充电机代码提交
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index bf630fe..cf1c4b6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -343,18 +343,18 @@
@Override
public Boolean judgeAutoStopCharge(AgvModel agvModel, AgvDetail agvDetail, Agv agv ) {
if (redis.getMap(RedisConstant.AGV_CHARGE_FLAG, agv.getUuid()) != null){
- return false;
+ return true;
}
// 鎵嬪姩鍏呯數妯″紡锛岃烦杩�
if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
ModbusTCPMaster modbusTCPMaster = chargeService.get(funcSta.getUuid());
// 鎵嬪姩鍏呯數妯″紡,璺宠繃
- if (chargeCoreService.getChargeMode(modbusTCPMaster) != 1) {
- return false;
+ if (chargeCoreService.getChargeMode(modbusTCPMaster) == 1) {
+ return true;
}
}
- return true;
+ return false;
}
}
--
Gitblit v1.9.1