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 ca71cb5..cdcab79 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 @@ -274,9 +274,9 @@ public class AsynRunTaskService extends BaseService { //工业炉已满,调用车辆起点为提升台,终点为缓存区 @Async("asyncServiceExecutor") - public void asynRunTaskToWarehouse(Long currTaskId, Long vehicleId) throws IOException { + public void asynRunTaskToWarehouse(Long currTaskId, Long vehicleId,Location location) throws IOException { CurrTask currTask = currTaskServiceBiz.getById(currTaskId); - Location location = locationServiceBiz.getById(currTask.getLocationId()); + //Location location = locationServiceBiz.getById(currTask.getLocationId()); VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId); //检查车辆是否冲突,冲突则避让 rgvStatus(vehicleId, currTask); diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java index 3829e4f..c1452f7 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java @@ -179,7 +179,7 @@ public class RunTaskUtils { currTask.setLocationId(location.getId()); currTaskServiceBiz.updateById(currTask); //异步调用车辆 - asynRunTaskService.asynRunTaskToWarehouse(currTask.getId(),vehicleId); + asynRunTaskService.asynRunTaskToWarehouse(currTask.getId(),vehicleId,location); return R.ok("操作成功!当前目标工业炉已满,托盘准备加入缓存区待加工队列。"); } return R.failed("当前目标工业炉已满!缓存区已满!请稍后重试!");