From 766b17274bb2fa134b87db1a6eb9552613a70465 Mon Sep 17 00:00:00 2001
From: lgh <lgh0010>
Date: Thu, 14 Jul 2022 21:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E8=AE=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mt/wms/empty/task/AsynRunTaskService.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 964f00a..1defae9 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
@@ -1227,11 +1227,11 @@ public class AsynRunTaskService extends BaseService {
                 if (conflictBoolean){
                     Integer status = moveRgv(2, currTaskId,  2,0);
                     if (status!=1){
-                        logger.info("===执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位39，执行失败===");
-                        webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位39，执行失败");
+                        logger.info("===执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行失败===");
+                        webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行失败");
                         return;
                     }
-                    logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位39，执行成功===");
+                    logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行成功===");
                 }
             }else {
                 logger.info("RGV2不在线，跳过检测是否避让。");
@@ -1248,13 +1248,13 @@ public class AsynRunTaskService extends BaseService {
                 //两辆小车是否冲突
                 Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, currTask.getStartPosition(), currTask.getTargetPosition(), rgv1CurrPosition);
                 if (conflictBoolean){
-                    Integer status = moveRgv(1, currTaskId,  12,0);
+                    Integer status = moveRgv(1, currTaskId,  39,0);
                     if (status!=1){
-                        logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位1，执行失败===");
-                        webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位1，执行失败");
+                        logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败===");
+                        webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败");
                         return;
                     }
-                    logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位1，执行成功===");
+                    logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行成功===");
                 }
             }else {
                 logger.info("RGV1不在线，跳过检测是否避让。");