From 5d9ce091370dde7b9a841765692efddc2230cf32 Mon Sep 17 00:00:00 2001 From: LGH <1746689524@qq.com> Date: Thu, 4 Aug 2022 15:11:22 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=87=BA=E5=BA=93bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/wms/empty/task/AsynRunTaskService.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 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 706e305..a24e886 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 @@ -484,13 +484,15 @@ public class AsynRunTaskService extends BaseService { Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, kilnInfo.getCode(), yeyaTaiCode, rgv2CurrPosition); if (conflictBoolean) { Integer status = moveRgv(2, 1L, 2, 0); + logger.info(status.toString()); if (status != 1) { - logger.info("===执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位39，执行失败==="); + logger.info("===执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + anotherVehicleId + "移动到点位2，执行失败==="); // 2022/3/6 websocket通知页面 - webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位39，执行失败"); - return; + webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + anotherVehicleId + "移动到点位2，执行失败"); + }else { + + logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + anotherVehicleId + "移动到点位2，执行成功==="); } - logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位39，执行成功==="); } } else { logger.info("RGV2不在线，跳过检测是否避让。"); @@ -502,16 +504,17 @@ public class AsynRunTaskService extends BaseService { //获取RGV1当前位置 Double rgv1CurrPosition = RGVCurrPosition(1); //两辆小车是否冲突 - Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, kilnInfo.getCode(), yeyaTaiCode, rgv1CurrPosition); + Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(2L, kilnInfo.getCode(), yeyaTaiCode, rgv1CurrPosition); if (conflictBoolean) { Integer status = moveRgv(1, 1L, 12, 0); + logger.info(status.toString()); if (status != 1) { - logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位1，执行失败==="); + logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + 1 + "移动到点位12，执行失败==="); // 2022/3/6 websocket通知页面 - webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位1，执行失败"); - return; + webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + 1 + "移动到点位12，执行失败"); + }else { + logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + 1 + "移动到点位12，执行成功==="); } - logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位1，执行成功==="); } } else { logger.info("RGV1不在线，跳过检测是否避让。"); @@ -528,6 +531,7 @@ public class AsynRunTaskService extends BaseService { Long startPoint = pointInfoServiceBiz.getOne(new QueryWrapper().eq(PointInfo.NOTE, runTask.getStartPosition())).getCode(); Long endPoint = pointInfoServiceBiz.getOne(new QueryWrapper().eq(PointInfo.NOTE, runTask.getEndPosition())).getCode(); Integer status = sendTaskToRgv(vehicleId, 0L, startPoint, endPoint, 0); + logger.info(status.toString()); if (status == 1) { logger.info("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行成功==="); //更新调度任务表状态为完成 @@ -556,7 +560,6 @@ public class AsynRunTaskService extends BaseService { runTaskServiceBiz.updateById(runTask); logger.info("任务 " + runTask.getTaskCode() + " 车辆从加工炉到提升平台过程中失败。"); logger.info("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败==="); - System.out.println("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败==="); // 2021/12/14 websocket推送到前端 webSocketServer.sendtoAll("出库任务车辆从加工炉到提升平台过程中失败。"); }