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 f8e400583..5f9a01fc6 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 @@ -751,6 +751,26 @@ public class StockOutOrderDomainService { outMaterialDetailPO.setCheckGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); outMaterialDetailPO.setWaitCheckQuantity(outMaterialDetailPO.getPickingQuantity()); } + List children = outMaterialDetailPO.getChildren(); + if (!CollectionUtils.isEmpty(children)) { + for (OutMaterialDetailPO outMaterialDetailPOChild : children) { + outMaterialDetailPOChild.setMaterialCode(outMaterialDetailPOChild.getMaterialNo()); + outMaterialDetailPOChild.setMaterialName(outMaterialDetailPOChild.getCommodityName()); + Long uniqueIdChild = outMaterialDetailPOChild.getUniqueId(); + PickingMaterialDetailPO pickingMaterialDetailPO1 = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(uniqueIdChild); + if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO1)) { + outMaterialDetailPOChild.setTotalArea(pickingMaterialDetailPO1.getTotalArea()); + outMaterialDetailPOChild.setTotalVolume(pickingMaterialDetailPO1.getTotalVolume()); + outMaterialDetailPOChild.setTotalNetWeight(pickingMaterialDetailPO1.getTotalNetWeight()); + outMaterialDetailPOChild.setTotalGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight()); + outMaterialDetailPOChild.setCheckArea(pickingMaterialDetailPO1.getTotalArea()); + outMaterialDetailPOChild.setCheckVolume(pickingMaterialDetailPO1.getTotalVolume()); + outMaterialDetailPOChild.setCheckNetWeight(pickingMaterialDetailPO1.getTotalNetWeight()); + outMaterialDetailPOChild.setCheckGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight()); + outMaterialDetailPOChild.setWaitCheckQuantity(pickingMaterialDetailPO1.getPickingQuantity()); + } + } + } } stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList); BigDecimal weightLimit = BigDecimal.ZERO;