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 | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 b5c2bf0..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
@@ -5,12 +5,9 @@
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.CommonUtil;
-import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
+import com.zy.acs.manager.core.service.AgvAreaDispatcher;
import com.zy.acs.manager.manager.entity.*;
-import com.zy.acs.manager.manager.enums.FuncStaType;
-import com.zy.acs.manager.manager.enums.StatusType;
-import com.zy.acs.manager.manager.enums.TaskStsType;
-import com.zy.acs.manager.manager.enums.TaskTypeType;
+import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.FuncStaMapper;
import com.zy.acs.manager.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +53,7 @@
@Override
public List<FuncSta> findInIdleStatus(FuncStaType type, Long agvId) {
LambdaQueryWrapper<FuncSta> wrapper = new LambdaQueryWrapper<FuncSta>()
- .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val);
+ .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val).eq(FuncSta::getState, FuncStaStateType.IDLE.toString());
List<FuncSta> funcStaList = this.list(wrapper);
if (Cools.isEmpty(funcStaList)) {
@@ -64,15 +61,17 @@
}
// 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)) {
@@ -95,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