diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java index 28f1a93..a954f5c 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java @@ -250,7 +250,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe } List<Integer> shipmentContainerHeaderIdList = - shipmentContainerDetailList.stream().map(ShipmentContainerDetail::getShipmentContainerId).collect(Collectors.toList()); + shipmentContainerDetailList.stream().map(ShipmentContainerDetail::getShipmentContainerId).distinct().collect(Collectors.toList()); long shipmentOrder = System.currentTimeMillis(); int sequenceNumber = shipmentContainerHeaderIdList.size(); int sequence = 0; @@ -336,7 +336,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe } List<Integer> shipmentContainerHeaderIdList = - shipmentContainerDetailList.stream().map(ShipmentContainerDetail::getShipmentContainerId).collect(Collectors.toList()); + shipmentContainerDetailList.stream().map(ShipmentContainerDetail::getShipmentContainerId).distinct().collect(Collectors.toList()); long shipmentOrder = System.currentTimeMillis(); int sequenceNumber = shipmentContainerHeaderIdList.size(); int sequence = 0; diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java index 50bab18..0ecdcee 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java @@ -1073,21 +1073,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea return Result.error("完成入库任务时,没有找到目的库位"); } InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode); - if (inventoryHeader != null && taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT && !fromLocationCode.equals(toLocationCode)) { - inventoryHeader.setLocationCode(toLocationCode); - inventoryHeader.setZoneCode(zoneCode); - if (!inventoryHeaderService.updateById(inventoryHeader)) { - throw new JeecgBootException("完成入库任务时, 更新库存头失败"); - } - List<InventoryDetail> inventoryDetails = inventoryDetailService.getInventoryDetailListByInventoryHeaderId(inventoryHeader.getId()); - for (InventoryDetail inventoryDetail : inventoryDetails) { - inventoryDetail.setLocationCode(toLocationCode); - inventoryDetail.setZoneCode(zoneCode); - if (!inventoryDetailService.updateById(inventoryDetail)) { - throw new JeecgBootException("完成入库任务时, 更新库存详情失败"); - } - } - } +// if (inventoryHeader != null && taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT && !fromLocationCode.equals(toLocationCode)) { +// inventoryHeader.setLocationCode(toLocationCode); +// inventoryHeader.setZoneCode(zoneCode); +// if (!inventoryHeaderService.updateById(inventoryHeader)) { +// throw new JeecgBootException("完成入库任务时, 更新库存头失败"); +// } +// List<InventoryDetail> inventoryDetails = inventoryDetailService.getInventoryDetailListByInventoryHeaderId(inventoryHeader.getId()); +// for (InventoryDetail inventoryDetail : inventoryDetails) { +// inventoryDetail.setLocationCode(toLocationCode); +// inventoryDetail.setZoneCode(zoneCode); +// if (!inventoryDetailService.updateById(inventoryDetail)) { +// throw new JeecgBootException("完成入库任务时, 更新库存详情失败"); +// } +// } +// } if (inventoryHeader == null) { inventoryHeader = new InventoryHeader(); inventoryHeader.setWarehouseCode(warehouseCode);