From 9569af2a6abcccc3f312abff0a7e660c0f2be2c8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 十二月 2025 17:23:19 +0800
Subject: [PATCH] 电压改电量
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
index 2ec809c..7044fea 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -61,16 +61,18 @@
}
// area limit
-// List<String> areaCodeList = agvAreaDispatcher.getAreaCodeListByAgvNo(agvService.getAgvNo(agvId));
-// if (Cools.isEmpty(areaCodeList)) {
-// funcStaList.clear();
-// } else {
-// funcStaList.removeIf(funcSta -> {
-// Code code = codeService.getCacheById(funcSta.getCode());
-// if (Cools.isEmpty(code, code.getData())) { return true; }
-// return !areaCodeList.contains(code.getData());
-// });
-// }
+ if (agvAreaDispatcher.isAgvExistsInAnyArea(agvId)) {
+ List<String> areaCodeList = agvAreaDispatcher.getCodesByAgvId(agvId);
+ if (Cools.isEmpty(areaCodeList)) {
+ funcStaList.clear();
+ } else {
+ funcStaList.removeIf(funcSta -> {
+ Code code = codeService.getCacheById(funcSta.getCode());
+ if (Cools.isEmpty(code, code.getData())) { return true; }
+ return !areaCodeList.contains(code.getData());
+ });
+ }
+ }
if (!Cools.isEmpty(funcStaList)) {
Collections.shuffle(funcStaList);
@@ -92,7 +94,7 @@
AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() < agvModel.getQuaBattery()) {
+ if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
return false;
}
} else {
--
Gitblit v1.9.1