From fdf940aaf65c51b820f0c9ba53c9b203d90b25ac Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 14 Jan 2026 23:06:31 +0800 Subject: [PATCH] no message --- .../service/impl/TaskServiceImpl.java | 20 +++++++++---------- .../service/processor/AllocateProcessor.java | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/TaskServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/TaskServiceImpl.java index f3fbd4c..b8e6a8b 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/TaskServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/TaskServiceImpl.java @@ -173,7 +173,7 @@ public class TaskServiceImpl extends ServiceImpl implements IT if (!groupToAgvTaskMap.containsKey(key)) { Pick pick = pickMap.get(tasks.get(0).getPickId()); Long itemId = tasks.get(0).getItemId(); - AgvTask agvTask = agvTaskService.bulidAgvTask(pick==null?null:pick.getConNo(),itemId,null, key.getStockCode(), key.getFromPointCode(), key.getToPointCode(), null, businessType, izAll, AgvVendorEnum.TES.getValue()); + AgvTask agvTask = agvTaskService.bulidAgvTask(pick == null ? null : pick.getConNo(), itemId, null, key.getStockCode(), key.getFromPointCode(), key.getToPointCode(), null, businessType, izAll, AgvVendorEnum.TES.getValue()); createToAgvTaskList.add(agvTask); groupToAgvTaskMap.put(key, agvTask); // 建立映射 log.info("创建AGV任务:{}", agvTask); @@ -193,11 +193,14 @@ public class TaskServiceImpl extends ServiceImpl implements IT for (Task task : list) { task.setAgvTaskId(agvTask.getId()); updateToTaskList.add(task); - Inventory inventory = inventoryMap.get(task.getInventoryId()); - if (inventory != null) { - Integer status = TaskTypeEnum.PICK.getValue().equals(task.getTaskType()) ? InventoryStatusEnum.OUTBOUND.getValue() : InventoryStatusEnum.MOVE.getValue(); - inventory.setStatus(status); - inventoryList.add(inventory); + if (TaskTypeEnum.PICK.getValue().equals(task.getTaskType())) { + Inventory inventory = inventoryMap.get(task.getInventoryId()); + if (inventory != null) { + inventory.setStatus(InventoryStatusEnum.OUTBOUND.getValue()); + if (!inventoryList.contains(inventory)) { + inventoryList.add(inventory); + } + } } } } @@ -206,10 +209,7 @@ public class TaskServiceImpl extends ServiceImpl implements IT } if (CollectionUtils.isNotEmpty(inventoryList)) { - Map distinctInventoryMap = inventoryList.stream() - .collect(Collectors.toMap(Inventory::getId, - Function.identity(), (existing, replacement) -> existing)); - batchUtils.updateBatchInventory(new ArrayList<>(distinctInventoryMap.values())); + batchUtils.updateBatchInventory(inventoryList); } } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java index fc1e7c2..be9a5fc 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java @@ -981,11 +981,15 @@ public class AllocateProcessor { Task moveTask = taskService.bulidTask(taskNo, TaskTypeEnum.MOVE.getValue(), moveItem, fromPoint, toPoint, stock, null, null, inv.getItemKeyId(), inv.getId(), inv.getQuantity(), 0); moveList.add(moveTask); pointService.bindPoint(toPoint); + inv.setStatus(InventoryStatusEnum.MOVE.getValue()); log.info("生成移位任务:{}- 容器:{} - 库位:{} - 库存数量:{}", taskNo, stock.getStockCode(), fromPoint.getPointCode(), inv.getQuantity()); } catch (Exception e) { throw e; } } + if (CollectionUtils.isNotEmpty(moveInventoryList)){ + inventoryMapper.updateById(moveInventoryList); + } return moveList; }