From 8f1c5854c90f2f18bdce3f421a8bd20b410f34e1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 22 四月 2026 09:17:13 +0800
Subject: [PATCH] 充电逻辑补充，充电桩分为手动充电和自动充电，手动充电模式下也不可以发任务给小车；协议补充0x71和0x72
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 12 ++++++++----
1 files changed, 8 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 7079caa..531f6f4 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
@@ -1988,10 +1988,14 @@
if (taskComplete) {
// 鍦ㄥ厖鐢典换鍔¤璧板埌缁堢偣锛屽悓鏃跺垽鏂厖鐢垫々鐨勭被鍨�
if (segment.getPosType().equals(TaskPosDto.PosType.TO_CHARGE)){
- FuncSta destFuncSta = funcStaService.getByCodeAndType(task.getDestCode(), FuncStaType.CHARGE.toString());
- if (destFuncSta != null) {
- if (Cools.isEmpty(destFuncSta.getProtocol()) && destFuncSta.getProtocol().equalsIgnoreCase(ProtocolType.MODBUS.toString())) {
- redis.setMap(RedisConstant.AGV_CHARGE_FLAG,segment.getAgvId$(),1);
+ AgvModel agvModel = agvModelService.getByAgvId(task.getAgvId());
+ // 鍒ゆ柇鏄惁闇�瑕佹柇鍏呮搷浣�
+ if (null != agvModel.getNeedUndocking() && agvModel.getNeedUndockingBool()){
+ FuncSta destFuncSta = funcStaService.getByCodeAndType(task.getDestCode(), FuncStaType.CHARGE.toString());
+ if (destFuncSta != null) {
+ if (Cools.isEmpty(destFuncSta.getProtocol()) && destFuncSta.getProtocol().equalsIgnoreCase(ProtocolType.MODBUS.toString())) {
+ redis.setMap(RedisConstant.AGV_CHARGE_FLAG,segment.getAgvId$(),1);
+ }
}
}
}
--
Gitblit v1.9.1