diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 9d089bf7..a44111f7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -964,6 +964,10 @@ public class BomNewEbomParentService extends ServiceImpl changeMaterial(BomNewDQbomQuery query) { VUtils.isTure(Objects.isNull(query.getParent())).throwMessage("父级节点不能为空"); - if (CollUtil.isNotEmpty(query.getDatas())) return query.getDatas(); - List materialNos = query.getDatas().stream() - .map(BomNewDQbomVO::getMaterialNo) - .filter(StrUtil::isNotBlank) - .distinct() - .collect(Collectors.toList()); - List materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos); - query.getDatas().forEach(c -> { - BaseMaterialVO vo = materialBaseInfos.stream() - .filter(m -> m.getMaterialNo().equals(c.getMaterialNo())) - .findFirst() - .orElse(null); - if (vo != null) { - c.setUnitWeight(vo.getMaterialWeight()); - c.setTotalWeight(BomUtil.calculateTotalWeight(c.getNum(), c.getUnitWeight())); - c.setMaterialName(vo.getMaterialName()); - c.setMaterialUnit(vo.getMaterialUnit()); - c.setMaterialTexture(vo.getMaterialTexture()); - } - }); + if (CollUtil.isEmpty(query.getDatas())) return query.getDatas(); + + initMaterialInfo(query.getDatas()); return query.getDatas(); }