From 6e256c4c74c21aad83bb641d61145da93fa30da8 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 18 十二月 2025 15:41:50 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 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..aa83f0b 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);

--
Gitblit v1.9.1