From 8122ebdd8a71a7fd1cfa4d744ee67ff70ce1a32c Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 11 Jul 2024 09:51:24 +0800 Subject: [PATCH] =?UTF-8?q?EBOM=E7=BC=96=E8=BE=91=EF=BC=8C21=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=94=9F=E6=88=90=E5=8F=91=E8=B4=A7=E5=8C=85=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=89=8D=E8=A3=85=E9=85=8D=E5=8C=85=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E8=A7=84=E5=88=99=E5=92=8C=E5=88=86=E7=B1=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/constant/VirtualPackageTypeEnum.java | 2 +- .../service/domain/EBom/VirtualPackageBase.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 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 4476cff8..1c7cf273 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 @@ -13,7 +13,7 @@ public enum VirtualPackageTypeEnum implements ValueEnum{ DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", "",1), MAKING_PACKAGE(2,"制作包","制作","201101","",2), DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F",4), - PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z",8), + PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","201101","Z",8), PAINT_PACKAGE(16, "油漆包", "油漆包", "201101", "", 16); private final Integer value; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java index ceda3d48..ddcae3a5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java @@ -134,11 +134,12 @@ public abstract class VirtualPackageBase { for (BomNewEbomParentVO ch : child) { for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) { String vDrawingNo; - if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) { + // 20240711 发货前装配包，命名规则也一样 + /*if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) { vDrawingNo = String.join("", parentDrawingNo, ".FHQ", "(", ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")"); - } else { + } else {*/ vDrawingNo = String.join("", "(", parentDrawingNo, ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")"); - } + //} vDrawingNoSet.add(vDrawingNo); } } @@ -151,11 +152,12 @@ public abstract class VirtualPackageBase { for (BomNewEbomParentVO ch : child) { for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) { String vDrawingNo; - if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) { + // 20240711 发货前装配包，命名规则也一样 + /*if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) { vDrawingNo = String.join("", parentDrawingNo, ".FHQ", "(", ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")"); - } else { + } else {*/ vDrawingNo = String.join("", "(", parentDrawingNo, ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")"); - } + //} params.add(buildAddMaterialParamDo(StrUtil.join("", ch.getRowId().toString(), vpy.getConMaterialName()), vDrawingNo, vDrawingNo, vpy, oldMaterialMap)); } }