diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java index ab8a2d92..cfa00852 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java @@ -40,12 +40,12 @@ public class EBomToPBom extends EBomToPbomBase { } private void splitData() { - this.facCodes = new ArrayList<>(); + // this.facCodes = new ArrayList<>(); //1020数据 List data1020 = new ArrayList<>(); List deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃")).collect(Collectors.toList()); if (CollUtil.isNotEmpty(deliveryPackage1020)) { - facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); + // facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); data1020.add(parent); for (BomNewEbomParentVO data : deliveryPackage1020) { List subVos = getResultAllSubIncludeSelf(data); @@ -58,7 +58,7 @@ public class EBomToPBom extends EBomToPbomBase { List data1010 = new ArrayList<>(); List deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); //&& !u.getMaterialName().contains("仙桃") if (CollUtil.isNotEmpty(deliveryPackage1010)) { - facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); + // facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); data1010.add(parent); for (BomNewEbomParentVO data : deliveryPackage1010) { List subVos = new ArrayList<>(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java index ded76e12..72285663 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java @@ -43,12 +43,12 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase { } private void splitData() { - this.facCodes = new ArrayList<>(); + //1020数据 List data1020 = new ArrayList<>(); List deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃")).collect(Collectors.toList()); if (CollUtil.isNotEmpty(deliveryPackage1020)) { - facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); + data1020.add(parent); for (BomNewEbomParentVO data : deliveryPackage1020) { List subVos = getResultAllSubIncludeSelf(data); @@ -61,7 +61,7 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase { List data1010 = new ArrayList<>(); List deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); //&& !u.getMaterialName().contains("仙桃") if (CollUtil.isNotEmpty(deliveryPackage1010)) { - facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); + data1010.add(parent); for (BomNewEbomParentVO data : deliveryPackage1010) { List subVos = new ArrayList<>();