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

Compare commits

base: mt-ck:fbdb10ace7340f8436e52f1f10f3e02531b75dc6
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
..
compare: mt-ck:2c186a6ff486b316061a6636dfcc4f4b7360c1b2
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

No commits in common. "fbdb10ace7340f8436e52f1f10f3e02531b75dc6" and "2c186a6ff486b316061a6636dfcc4f4b7360c1b2" have entirely different histories.
fbdb10ace7 ... 2c186a6ff4

1 changed files with 0 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -1369,7 +1369,6 @@ public class AsynRunTaskService extends BaseService {
Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, startPosition, targetPosition, rgv2CurrPosition);
if (conflictBoolean){
Integer status = moveRgv(2, currTaskId, 2,0);
logger.info(status.toString());
if (status!=1){
logger.info("===执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行失败===");
webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位2，执行失败");
@ -1393,7 +1392,6 @@ public class AsynRunTaskService extends BaseService {
Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, currTask.getStartPosition(), currTask.getTargetPosition(), rgv1CurrPosition);
if (conflictBoolean){
Integer status = moveRgv(1, currTaskId, 39,0);
logger.info(status.toString());
if (status!=1){
logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败===");
webSocketServer.sendtoAll(LocalDateTime.now()+"执行任务："+currTask.getTaskCode()+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败");