From d2bdac9da5131cfe34612d491377b0ac544d56bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十月 2024 14:14:56 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 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 c35cd65..e55da25 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
@@ -499,14 +499,9 @@
             switch (taskType) {
                 case TO_CHARGE:
                 case TO_STANDBY:
-                    List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>()
-                                    .eq(FuncSta::getType, FuncStaType.query(taskType).toString())
-                                    .eq(FuncSta::getAgvId, agv.getId())
-                                    .eq(FuncSta::getState, FuncStaStateType.IDLE.toString())
-                                    .eq(FuncSta::getStatus, StatusType.ENABLE.val)
-                    );
-                    if (!Cools.isEmpty(funcStaList)) {
-                        FuncSta funcSta = funcStaList.get(0);
+                    List<FuncSta> idleFunStaList = funcStaService.findInIdleStatus(FuncStaType.query(taskType), agv.getId());
+                    if (!Cools.isEmpty(idleFunStaList)) {
+                        FuncSta funcSta = funcStaService.checkoutClosestFunSta(agvDetail.getRecentCode(), idleFunStaList);
                         endCode = codeService.getById(funcSta.getCode());
                     }
                     break;

--
Gitblit v1.9.1