From 48eefc082760c3f859656e5375f5a71b04f38054 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 08:11:57 +0800
Subject: [PATCH] #

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

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index d9e99d5..a213cac 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -55,6 +55,8 @@
     @Autowired
     private MainService mainService;
     @Autowired
+    private MainLockWrapService mainLockWrapService;
+    @Autowired
     private MapService mapService;
     @Autowired
     private MapDataDispatcher mapDataDispatcher;
@@ -91,6 +93,7 @@
             if (!Cools.isEmpty(waitingSegList)) {
                 for (Segment waitingSeg : waitingSegList) {
                     if (!waitingSeg.getId().equals(segment.getId())) {
+                        log.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
                         return;
                     }
                 }
@@ -441,7 +444,7 @@
 
         } else {
 
-            return mainService.buildMinorTask(agv, null, TaskTypeType.MOVE, endCodeData);
+            return mainLockWrapService.buildMinorTask(agv, null, TaskTypeType.MOVE, endCodeData);
         }
 
         return true;

--
Gitblit v1.9.1