From ec0ab3f202d7597f0c06a21d6da25d4b986e416c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 28 May 2024 12:13:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=8131F=E9=A1=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/constant/VirtualPackageTypeEnum.java | 11 ++++++----- .../bomnew/service/domain/EBom/EBomToPBomFor31.java | 4 ++-- .../bomnew/service/domain/EBom/EBomToPbomBase.java | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java index e4aba58b..0c454188 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java @@ -9,17 +9,18 @@ import lombok.Getter; public enum VirtualPackageTypeEnum implements ValueEnum{ //1-发货包 2-制作包 4-直发包 8-发货前装配包 - UN_VIRTUAL_PACKAGE(0,"非虚拟包","" ,"", ""), - DELIVERY_PACKAGE(1,"发货包","(发货)" ,"201101", ""), - MAKING_PACKAGE(2,"制作包","(制作)","201101",""), - DIRECT_DELIVERY_PACKAGE(4,"直发包","(直发)","201101","F"), - PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","(发货前装配)","200601","Z"); + UN_VIRTUAL_PACKAGE(0,"非虚拟包","" ,"", "",""), + DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", "","(发货)"), + MAKING_PACKAGE(2,"制作包","制作","201101","","(制作)"), + DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F","(直发)"), + PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z","(发货前装配)"); private final Integer value; private final String description; private final String conMaterialName; private final String materialCategoryCode; private final String productTypeKey; + private final String findConMaterialName; public static Integer getAll(){ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java index 8766e179..4d8ce114 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java @@ -44,7 +44,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase { this.facCodes=new ArrayList<>(); //1020数据 List data1020=new ArrayList<>(); - List deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("发货")).collect(Collectors.toList()); + List deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("(发货)")).collect(Collectors.toList()); if(CollUtil.isNotEmpty(deliveryPackage1020)){ facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); data1020.add(parent); @@ -58,7 +58,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase { //1010 数据 List data1010=new ArrayList<>(); - List deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && !u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("发货")).collect(Collectors.toList()); + List deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && !u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("(发货)")).collect(Collectors.toList()); if(CollUtil.isNotEmpty(deliveryPackage1010)){ facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); data1010.add(parent); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 91d833b9..157af8bf 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -383,7 +383,7 @@ public abstract class EBomToPbomBase { String preAssemblyPackageLevelNo = StrUtil.isNotBlank(parentDrawingNoRe) ? StrUtil.join("-", parentDrawingNoRe, "1") : "1"; for (BomNewEbomParentVO firstLevelBom : firstLevelBoms) { - if (firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getConMaterialName()) || firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getConMaterialName())) { + if (firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getFindConMaterialName()) || firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getFindConMaterialName())) { firstLevelBom.setLevelNumber(levelToNum(preAssemblyPackageLevelNo)); firstLevelBom.setLevelNo(preAssemblyPackageLevelNo); continue;