mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-ck:e1181e0423e2f2bdafd35bf9ef0cf0ed1343b746
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
..
compare: mt-ck:4c0f84d742e7940b836b35ef276f219f849837cb
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

No commits in common. "e1181e0423e2f2bdafd35bf9ef0cf0ed1343b746" and "4c0f84d742e7940b836b35ef276f219f849837cb" have entirely different histories.
e1181e0423 ... 4c0f84d742

1 changed files with 10 additions and 13 deletions
Show Stats Expand all files Collapse all files

23
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
View File

@ -485,15 +485,13 @@ public class AsynRunTaskService extends BaseService {
Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, kilnInfo.getCode(), yeyaTaiCode, rgv2CurrPosition); Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, kilnInfo.getCode(), yeyaTaiCode, rgv2CurrPosition);
if (conflictBoolean) { if (conflictBoolean) {
Integer status = moveRgv(2, 1L, 2, 0); Integer status = moveRgv(2, 1L, 2, 0);
logger.info(status.toString());
if (status != 1) { if (status != 1) {
logger.info("===执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + anotherVehicleId + "移动到点位2，执行失败==="); logger.info("===执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位39，执行失败===");
// 2022/3/6 websocket通知页面 // 2022/3/6 websocket通知页面
webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + anotherVehicleId + "移动到点位2，执行失败"); webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位39，执行失败");
}else { return;
logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + anotherVehicleId + "移动到点位2，执行成功===");
} }
logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位39，执行成功===");
} }
} else { } else {
logger.info("RGV2不在线，跳过检测是否避让。"); logger.info("RGV2不在线，跳过检测是否避让。");
@ -505,17 +503,16 @@ public class AsynRunTaskService extends BaseService {
//获取RGV1当前位置 //获取RGV1当前位置
Double rgv1CurrPosition = RGVCurrPosition(1); Double rgv1CurrPosition = RGVCurrPosition(1);
//两辆小车是否冲突 //两辆小车是否冲突
Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(2L, kilnInfo.getCode(), yeyaTaiCode, rgv1CurrPosition); Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, kilnInfo.getCode(), yeyaTaiCode, rgv1CurrPosition);
if (conflictBoolean) { if (conflictBoolean) {
Integer status = moveRgv(1, 1L, 12, 0); Integer status = moveRgv(1, 1L, 12, 0);
logger.info(status.toString());
if (status != 1) { if (status != 1) {
logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + 1 + "移动到点位12，执行失败==="); logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位1，执行失败===");
// 2022/3/6 websocket通知页面 // 2022/3/6 websocket通知页面
webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + 1 + "移动到点位12，执行失败"); webSocketServer.sendtoAll(LocalDateTime.now() + "执行出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位1，执行失败");
}else { return;
logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + 1 + "移动到点位12，执行成功===");
} }
logger.info("===执行任务出库任务时车辆位置冲突，执行车辆位移任务，车辆" + vehicleId + "移动到点位1，执行成功===");
} }
} else { } else {
logger.info("RGV1不在线，跳过检测是否避让。"); logger.info("RGV1不在线，跳过检测是否避让。");
@ -532,7 +529,6 @@ public class AsynRunTaskService extends BaseService {
Long startPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getStartPosition())).getCode(); Long startPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getStartPosition())).getCode();
Long endPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getEndPosition())).getCode(); Long endPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getEndPosition())).getCode();
Integer status = sendTaskToRgv(vehicleId, 0L, startPoint, endPoint, 0); Integer status = sendTaskToRgv(vehicleId, 0L, startPoint, endPoint, 0);
logger.info(status.toString());
if (status == 1) { if (status == 1) {
logger.info("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行成功==="); logger.info("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行成功===");
//更新调度任务表状态为完成 //更新调度任务表状态为完成
@ -561,6 +557,7 @@ public class AsynRunTaskService extends BaseService {
runTaskServiceBiz.updateById(runTask); runTaskServiceBiz.updateById(runTask);
logger.info("任务 " + runTask.getTaskCode() + " 车辆从加工炉到提升平台过程中失败。"); logger.info("任务 " + runTask.getTaskCode() + " 车辆从加工炉到提升平台过程中失败。");
logger.info("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败==="); logger.info("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败===");
System.out.println("===执行任务出库任务，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败===");
// 2021/12/14 websocket推送到前端 // 2021/12/14 websocket推送到前端
webSocketServer.sendtoAll("出库任务车辆从加工炉到提升平台过程中失败。"); webSocketServer.sendtoAll("出库任务车辆从加工炉到提升平台过程中失败。");
} }