diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index b7fa6edeb..af732981b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -1008,7 +1008,18 @@ public class StockOutOrderDomainService { ReviewOrder reviewOrder = reviewOrders.get(0); BeanUtils.copyProperties(reviewOrder,cmd1); List details = new ArrayList<>(); - for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()) { + List materialDetailList = stockOutOrderDO.getMaterialDetailList(); + // 将每个明细的children提取出来,与父级合并为一个扁平list + List flatMaterialDetailList = new ArrayList<>(); + for (OutMaterialDetailDO detail : materialDetailList) { + flatMaterialDetailList.add(detail); + if (!CollectionUtils.isEmpty(detail.getChildren())) { + flatMaterialDetailList.addAll(detail.getChildren()); + } + } + materialDetailList = flatMaterialDetailList; + + for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { ReviewMaterialDetailPO detailPO = new ReviewMaterialDetailPO(); Long materialDetailId = outMaterialDetailDO.getMaterialDetailId(); ReviewMaterialDetail reviewMaterialDetailPO = reviewMaterialDetailMapper.selectOne(new QueryWrapper().lambda()