diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 1e980b92..4fa1806f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -370,22 +370,26 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { private List syncMaterial(List children) { if (CollUtil.isNotEmpty(children)) { - List materialVOS = materialMainService.getMaterialBaseInfo(children.stream() + List materialNos = children.stream() .filter(f -> !StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, f.getProjectType()) && StrUtil.isNotEmpty(f.getMaterialNo())) - .map(BomNewPbomChildEntity::getMaterialNo).collect(Collectors.toList())); - children.forEach(c -> { - if (!StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, c.getProjectType()) - && StrUtil.isNotEmpty(c.getMaterialNo())) { - BaseMaterialVO materialVO = materialVOS.stream() - .filter(m -> StrUtil.equals(m.getMaterialNo(), c.getMaterialNo())) - .findFirst() - .orElse(null); - if (Objects.nonNull(materialVO)) { - c.setMaterialCategoryCode(materialVO.getMaterialCategoryCode()); + .map(BomNewPbomChildEntity::getMaterialNo).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(materialNos)) { + List materialVOS = materialMainService.getMaterialBaseInfo(materialNos); + children.forEach(c -> { + if (!StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, c.getProjectType()) + && StrUtil.isNotEmpty(c.getMaterialNo())) { + BaseMaterialVO materialVO = materialVOS.stream() + .filter(f -> !StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, f.getProjectType()) + && StrUtil.equals(f.getMaterialNo(), c.getMaterialNo())) + .findFirst() + .orElse(null); + if (Objects.nonNull(materialVO)) { + c.setMaterialCategoryCode(materialVO.getMaterialCategoryCode()); + } } - } - }); + }); + } } return children; }