diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java index a304b930..09515441 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java @@ -210,20 +210,6 @@ public class BomNewOriginalParentV2Service extends ServiceImpl originalChildEntities = new ArrayList<>(); - bomAllChildList.forEach(k -> { - BomNewOriginalChildEntity entChild = new BomNewOriginalChildEntity(); - entChild.setRowId(k.getRowId()); - entChild.setBomVersionRowId(k.getBomRowId()); - entChild.setNum(k.getNum()); - entChild.setUnitWeight(k.getUnitWeight()); - originalChildEntities.add(entChild); - }); - if (CollUtil.isNotEmpty(originalChildEntities)) { - originalChildService.updateBatchById(originalChildEntities); - } - } /** diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index 553cffc1..d9a07c2e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -106,7 +106,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { List result = new ArrayList(); //子级中,一般零部件 - List commonPartList = list.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo()) && (OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE.equals(u.getMaterialCategoryCode())|| u.getRegReplaceIs().equals(1))).collect(Collectors.toList()); + List commonPartList = list.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) && (OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE.equals(u.getMaterialCategoryCode())|| u.getRegReplaceIs().equals(1))).collect(Collectors.toList()); Map> materialNoGroupMp =commonPartList.stream().collect(Collectors.groupingBy(BomOriginalListVO::getMaterialNo)); for (Map.Entry> entry : materialNoGroupMp.entrySet()) { @@ -301,7 +301,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc()); parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture()); parentEntity.setMaterialUnit("KG"); - parentEntity.setNum(parentEntity.getTotalWeight()); parentEntity.setProjectType("L"); parentEntity.setRegReplaceIs(1); } else {