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 6fd59f88..efcf11e3 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 @@ -2386,7 +2386,23 @@ public class BomNewEbomParentService extends ServiceImpl vos = Convert.toList(QueryMaterialsVO.class, datas); + query.forEach(it -> { + if (Objects.nonNull(it.getUnitWeight()) || StrUtil.isNotBlank(it.getProjectType())) { + QueryMaterialsVO vo = vos.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), it.getMaterialNo()) + || StrUtil.equals(m.getDrawingNo(), it.getDrawingNo())) + .findFirst().orElse(null); + if (Objects.nonNull(vo)) { + if (Objects.nonNull(it.getUnitWeight())) { + vo.setUnitWeight(it.getUnitWeight()); + } + if (StrUtil.isNotBlank(it.getProjectType())) { + vo.setProjectType(it.getProjectType()); + } + } + } + }); + return vos; } public Integer getSapErrorNum() {