From b41175b526252a8796de62e0f3ba7ec6c531de52 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 12 六月 2025 14:54:38 +0800 Subject: [PATCH] 寻找待机位和充电桩的时候,找空闲的 --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 7 ++----- 1 files changed, 2 insertions(+), 5 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..b98f6bb 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 @@ -7,10 +7,7 @@ import com.zy.acs.manager.common.utils.CommonUtil; import com.zy.acs.manager.core.constant.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)) { -- Gitblit v1.9.1