From c19066792c400e8aa83ff60226a6548aa8622616 Mon Sep 17 00:00:00 2001
From: lgh <lgh0010>
Date: Sat, 6 Aug 2022 00:15:42 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=AE=A1=E7=AE=97=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=86=B2=E7=AA=81=E8=B5=B7=E7=BB=88=E7=82=B9?=
 =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
index 31a2770..9fe913d 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
@@ -1390,7 +1390,7 @@ public class AsynRunTaskService extends BaseService {
                 //获取RGV1当前位置
                 Double rgv1CurrPosition = RGVCurrPosition(1);
                 //两辆小车是否冲突
-                Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, currTask.getStartPosition(), currTask.getTargetPosition(), rgv1CurrPosition);
+                Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, startPosition, targetPosition, rgv1CurrPosition);
                 if (conflictBoolean){
                     Integer status = moveRgv(1, currTaskId,  12,0);
                     logger.info(status.toString());