From 213a3404b2fa2fb0c5814223e7568e000976439c Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Thu, 9 Apr 2026 18:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=8A=B6=E6=80=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PipelineServiceImpl.java | 115 +++++++++--------- .../impl/TaskExecuteRecordServiceImpl.java | 20 +-- 2 files changed, 71 insertions(+), 64 deletions(-) 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 25586ba6..a43eeea1 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 @@ -210,21 +210,24 @@ public class PipelineServiceImpl implements IPipelineService { log.error("AGV调度失败，boxBarcode：{}，station：{}", boxBarcode, station.getStationCode()); return false; + }else { + log.info("AGV调度成功，boxBarcode：{}，station：{}", + boxBarcode, station.getStationCode()); } - // 7. 更新任务状态 - task.setTaskStatus(Task.STATUS_FINISHED); - boolean taskUpdate = taskService.updateById(task); - if (!taskUpdate) { - log.error("任务状态更新失败，但AGV调度已成功，taskId：{}", task.getId()); - } +// // 7. 更新任务状态 +// task.setTaskStatus(Task.STATUS_FINISHED); +// boolean taskUpdate = taskService.updateById(task); +// if (!taskUpdate) { +// log.error("任务状态更新失败，但AGV调度已成功，taskId：{}", task.getId()); +// } // 8. 更新站点状态为占用 - station.setStationStatus(Station.STATUS_OCCUPIED); - boolean stationUpdate = stationService.updateById(station); - if (!stationUpdate) { - log.error("站点状态更新失败，但AGV调度已成功，stationId：{}", stationId); - } +// station.setStationStatus(Station.STATUS_OCCUPIED); +// boolean stationUpdate = stationService.updateById(station); +// if (!stationUpdate) { +// log.error("站点状态更新失败，但AGV调度已成功，stationId：{}", stationId); +// } log.info("预占站点处理成功，boxBarcode：{}，station：{}", boxBarcode, station.getStationCode()); @@ -237,51 +240,51 @@ public class PipelineServiceImpl implements IPipelineService { */ private boolean handleNoPreOccupiedStation(Task task) { // 查找空闲站点 - Long wcId = task.getWcId(); - - if (null != wcId) { - // 尝试找空闲站点 - Station station = findFreeStationCode(wcId); - if (null != station) { - log.info("找到空闲站点：{}，将物料箱送往该站点", station.getStationCode()); - //将站点设置为预占 - station.setStationStatus(Station.PRE_STATUS_OCCUPIED); - stationService.updateById(station); - - String taskType = agvTaskTypeUtil.getTaskTypeByPositions(Station.PICKUP_CONVEYOR_LINE,station.getStationCode()); - if (StringUtils.isEmpty(taskType)) { - log.error("生成任务类型失败，from：{}，to：{}", - Station.PICKUP_CONVEYOR_LINE, station.getStationCode()); - return false; - } - - boolean agvSchedulingTask = iTaskExecuteRecordService.genAgvSchedulingTask - (taskType, Station.PICKUP_CONVEYOR_LINE, station.getStationCode(), AgvConstant.EQUIPMENT_TYPE_AGV, task); - - if (!agvSchedulingTask) { - log.error("AGV调度失败，station：{}", station.getStationCode()); - return false; - } - - // 更新任务状态 - task.setTaskStatus(Task.STATUS_FINISHED); - boolean taskUpdate = taskService.updateById(task); - if (!taskUpdate) { - log.error("任务状态更新失败，但AGV调度已成功，taskId：{}", task.getId()); - } - - // 更新站点状态为占用 - station.setStationStatus(Station.STATUS_OCCUPIED); - boolean stationUpdate = stationService.updateById(station); - if (!stationUpdate) { - log.error("站点状态更新失败，但AGV调度已成功，stationId：{}", station.getId()); - } - - log.info("预占站点处理成功，station：{}", station.getStationCode()); - - return agvSchedulingTask; - } - } +// Long wcId = task.getWcId(); +// +// if (null != wcId) { +// // 尝试找空闲站点 +// Station station = findFreeStationCode(wcId); +// if (null != station) { +// log.info("找到空闲站点：{}，将物料箱送往该站点", station.getStationCode()); +// //将站点设置为预占 +// station.setStationStatus(Station.PRE_STATUS_OCCUPIED); +// stationService.updateById(station); +// +// String taskType = agvTaskTypeUtil.getTaskTypeByPositions(Station.PICKUP_CONVEYOR_LINE,station.getStationCode()); +// if (StringUtils.isEmpty(taskType)) { +// log.error("生成任务类型失败，from：{}，to：{}", +// Station.PICKUP_CONVEYOR_LINE, station.getStationCode()); +// return false; +// } +// +// boolean agvSchedulingTask = iTaskExecuteRecordService.genAgvSchedulingTask +// (taskType, Station.PICKUP_CONVEYOR_LINE, station.getStationCode(), AgvConstant.EQUIPMENT_TYPE_AGV, task); +// +// if (!agvSchedulingTask) { +// log.error("AGV调度失败，station：{}", station.getStationCode()); +// return false; +// } +// +// // 更新任务状态 +// task.setTaskStatus(Task.STATUS_FINISHED); +// boolean taskUpdate = taskService.updateById(task); +// if (!taskUpdate) { +// log.error("任务状态更新失败，但AGV调度已成功，taskId：{}", task.getId()); +// } +// +// // 更新站点状态为占用 +// station.setStationStatus(Station.STATUS_OCCUPIED); +// boolean stationUpdate = stationService.updateById(station); +// if (!stationUpdate) { +// log.error("站点状态更新失败，但AGV调度已成功，stationId：{}", station.getId()); +// } +// +// log.info("预占站点处理成功，station：{}", station.getStationCode()); +// +// return agvSchedulingTask; +// } +// } // 没有空闲站点，走库位逻辑 log.info("无空闲站点，尝试将物料箱移入库位"); 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 26eab6c7..d8bc5a14 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 @@ -501,7 +501,7 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl