From 2a6e27f1c0064690d6fc6ab137d64c02fc0742da Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 16 六月 2025 16:16:09 +0800
Subject: [PATCH] 1

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index 3bb25ad..86fb4cc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -4,7 +4,7 @@
 import com.zy.acs.common.utils.RedisSupport;
 import com.zy.acs.framework.common.Cools;
 import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.common.constant.AgvAreaDispatcher;
+import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
 import com.zy.acs.manager.core.cache.CoreCache;
 import com.zy.acs.manager.core.domain.CodeStepDto;
 import com.zy.acs.manager.core.domain.type.JobType;
@@ -125,7 +125,7 @@
             return;
         }
 
-        if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
+        if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null,false)) {
             log.info( "{}寮�濮嬩綔涓氭紨绀�...", agvNo);
 
             CoreCache.AGV_MOCK_STEP_CACHE.put(agvId, CodeStepDto.build(destinationCodeData, jobType));
@@ -180,7 +180,7 @@
         if (Cools.isEmpty(destinationCodeData)) {
             return;
         }
-        if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
+        if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null,false)) {
             log.info( "{}寮�濮嬭蛋琛屾紨绀�...", agvNo);
         }
     }
@@ -202,7 +202,9 @@
 
         List<String> codeList = AgvAreaDispatcher.AGV_AREA.get(agvNo);
         List<String> disableCodeList = AgvAreaDispatcher.AGV_DISABLE_AREA.get(agvNo);
-        Collections.shuffle(codeList);
+        if (!Cools.isEmpty(codeList)) {
+            Collections.shuffle(codeList);
+        }
 
         for (String endCodeData : codeList) {
             if (disableCodeList.contains(endCodeData)) { continue; }
@@ -243,7 +245,7 @@
                 executePatrolLogic(agvNo);
 //                executeUShapeConveyor(agvNo);
             } catch (Exception e) {
-                log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�: {}", agvNo, e.getMessage());
+                log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�", agvNo, e);
             }
         };
 

--
Gitblit v1.9.1