huojin
/
Cpte-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2026-01-14 23:06:31 +08:00
parent ca22218b8a
commit fdf940aaf6
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/TaskServiceImpl.java
View File

@ -173,7 +173,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
if (!groupToAgvTaskMap.containsKey(key)) { if (!groupToAgvTaskMap.containsKey(key)) {
Pick pick = pickMap.get(tasks.get(0).getPickId()); Pick pick = pickMap.get(tasks.get(0).getPickId());
Long itemId = tasks.get(0).getItemId(); 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); createToAgvTaskList.add(agvTask);
groupToAgvTaskMap.put(key, agvTask); // 建立映射 groupToAgvTaskMap.put(key, agvTask); // 建立映射
log.info("创建AGV任务：{}", agvTask); log.info("创建AGV任务：{}", agvTask);
@ -193,11 +193,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
for (Task task : list) { for (Task task : list) {
task.setAgvTaskId(agvTask.getId()); task.setAgvTaskId(agvTask.getId());
updateToTaskList.add(task); updateToTaskList.add(task);
Inventory inventory = inventoryMap.get(task.getInventoryId()); if (TaskTypeEnum.PICK.getValue().equals(task.getTaskType())) {
if (inventory != null) { Inventory inventory = inventoryMap.get(task.getInventoryId());
Integer status = TaskTypeEnum.PICK.getValue().equals(task.getTaskType()) ? InventoryStatusEnum.OUTBOUND.getValue() : InventoryStatusEnum.MOVE.getValue(); if (inventory != null) {
inventory.setStatus(status); inventory.setStatus(InventoryStatusEnum.OUTBOUND.getValue());
inventoryList.add(inventory); if (!inventoryList.contains(inventory)) {
inventoryList.add(inventory);
}
}
} }
} }
} }
@ -206,10 +209,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
} }
if (CollectionUtils.isNotEmpty(inventoryList)) { if (CollectionUtils.isNotEmpty(inventoryList)) {
Map<Long, Inventory> distinctInventoryMap = inventoryList.stream() batchUtils.updateBatchInventory(inventoryList);
.collect(Collectors.toMap(Inventory::getId,
Function.identity(), (existing, replacement) -> existing));
batchUtils.updateBatchInventory(new ArrayList<>(distinctInventoryMap.values()));
} }
} }

4
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java
View File

@ -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); Task moveTask = taskService.bulidTask(taskNo, TaskTypeEnum.MOVE.getValue(), moveItem, fromPoint, toPoint, stock, null, null, inv.getItemKeyId(), inv.getId(), inv.getQuantity(), 0);
moveList.add(moveTask); moveList.add(moveTask);
pointService.bindPoint(toPoint); pointService.bindPoint(toPoint);
inv.setStatus(InventoryStatusEnum.MOVE.getValue());
log.info("生成移位任务:{}- 容器:{} - 库位:{} - 库存数量:{}", taskNo, stock.getStockCode(), fromPoint.getPointCode(), inv.getQuantity()); log.info("生成移位任务:{}- 容器:{} - 库位:{} - 库存数量:{}", taskNo, stock.getStockCode(), fromPoint.getPointCode(), inv.getQuantity());
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} }
} }
if (CollectionUtils.isNotEmpty(moveInventoryList)){
inventoryMapper.updateById(moveInventoryList);
}
return moveList; return moveList;
} }