From dcb2caa3d988e63553906485cc3f8379681f94d1 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 9 Mar 2026 19:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 ++-- .../controller/AGVDockingController.java | 2 +- .../controller/PipelineController.java | 20 ------------------- .../service/impl/PipelineServiceImpl.java | 17 +++++++--------- .../impl/StorageMonitoringServiceImpl.java | 2 +- .../service/impl/TaskServiceImpl.java | 1 - 6 files changed, 11 insertions(+), 35 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 2f1548cd..36ad6406 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -12,9 +12,9 @@ public interface LauncherConstant { /** * nacos 命名空间 */ -// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; + String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/AGVDockingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/AGVDockingController.java index 83f32964..4bc9184c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/AGVDockingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/AGVDockingController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @AllArgsConstructor -@RequestMapping("/agv") +@RequestMapping("没呢 ") @Tag(name = "agv小车接口", description = "agv小车对接接口") public class AGVDockingController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/PipelineController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/PipelineController.java index fc63157e..ebdd6ee7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/PipelineController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/PipelineController.java @@ -165,24 +165,4 @@ public class PipelineController extends BladeController { return R.data(true); } - - /** - * 接收空物料箱到输送线通知 - */ - @GetMapping("/test") - @ApiOperationSupport(order = 4) - @Operation(summary = "接收物料箱", description = "传入箱条码") - public R test(@RequestParam String test1,@RequestParam String test2) { - - String taskType = agvTaskTypeUtil.getTaskTypeByPositions(test1,test2); - - return R.data(true); - } - - - - - - - } 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 99791218..3f94b9ec 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 @@ -176,6 +176,9 @@ public class PipelineServiceImpl implements IPipelineService { 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()); @@ -216,14 +219,6 @@ public class PipelineServiceImpl implements IPipelineService { * 处理库位逻辑 */ private boolean handleLocationLogic(Task task) { - // 1. 查询空闲库位 - List freeLocations = locationService.selectByLocationStatus(Location.STATUS_FREE); - if (CollectionUtils.isEmpty(freeLocations)) { - log.warn("没有空闲库位可用，物料箱：{}", task.getBoxBarcode()); - return false; - } - String targetLocationCode = freeLocations.get(0).getLocationCode(); - log.info("找到空闲库位：{}", targetLocationCode); // 2. 查询库位梳齿架子 List combLocations = locationService.selectByStatus(1); @@ -237,11 +232,13 @@ public class PipelineServiceImpl implements IPipelineService { // 3. 两步操作 log.info("第一步：AGV将物料箱从输送线放入梳齿架子：{}", combLocationCode); // 调用AGV小车 将输送线物资放入梳齿架子 + String taskTyp = agvTaskTypeUtil.getTaskTypeByPositions(Station.PICKUP_CONVEYOR_LINE, combLocationCode); + boolean agvSchedulingTask = iTaskExecuteRecordService.genAgvSchedulingTask - ("QM7", Station.PICKUP_CONVEYOR_LINE, combLocationCode, AgvConstant.EQUIPMENT_TYPE_AGV, task); + (taskTyp, Station.PICKUP_CONVEYOR_LINE, combLocationCode, AgvConstant.EQUIPMENT_TYPE_AGV, task); //第二步 需要agv调用完成之后 给到mes通知接口 - log.info("第二步：CTU将物料箱从梳齿架子送往库位：{}", targetLocationCode); + log.info("第二步：CTU将物料箱从梳齿架子送往库位,等待通知接口 进行CTU调用" ); return true; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java index 5c67915d..22c09761 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java @@ -116,7 +116,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService { // ========== 步骤2.1：查询对应工位的待库位任务（按创建时间升序） ========== List taskList = taskService.list( new LambdaQueryWrapper() - .eq(Task::getTaskStatus, Task.STATUS_LOCATION) // 任务状态：待库位 + .eq(Task::getTaskStatus, Task.STATUS_CONVEYOR_END) // 任务状态：待库位 .eq(Task::getWcId, station.getWcId()) // 匹配当前站点的工位ID .orderByAsc(Task::getCreateTime) // 按创建时间升序，优先处理最早创建的任务 ); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java index db2436d7..0500396b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java @@ -40,7 +40,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; -import static org.springblade.desk.logistics.pojo.entity.Task.getStatusDesc; /** * 物流任务 服务类