diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java index 7bb390e2..a4415749 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java @@ -320,7 +320,9 @@ public class PipelineServiceImpl implements IPipelineService { log.warn("没有可用的库位梳齿架子,物料箱:{}", task.getBoxBarcode()); return false; } - String combLocationCode = combLocations.get(0).getLocationCode(); + + Location location = combLocations.get(0); + String combLocationCode = location.getLocationCode(); log.info("找到库位梳齿架子:{}", combLocationCode); // 3. 两步操作 @@ -331,6 +333,15 @@ public class PipelineServiceImpl implements IPipelineService { boolean agvSchedulingTask = iTaskExecuteRecordService.genAgvSchedulingTask (taskTyp, Station.PICKUP_CONVEYOR_LINE, combLocationCode, AgvConstant.EQUIPMENT_TYPE_AGV, task); + if(agvSchedulingTask){ + //修改梳齿架状态 防止重复送货 + location.setLocationStatus(Location.STATUS_OCCUPIED); + boolean locationUpdate = locationService.updateById(location); + if(locationUpdate){ + log.info("库位状态修改为占用:{}",combLocationCode); + } + } + //第二步 需要agv调用完成之后 给到mes通知接口 log.info("第二步:CTU将物料箱从梳齿架子送往库位,等待通知接口 进行CTU调用" ); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java index ac62d9d2..19ace890 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java @@ -156,6 +156,7 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl