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 ddcae3a5..acf41081 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 @@ -95,7 +95,7 @@ public abstract class VirtualPackageBase { for (BomNewEbomChildEntity ch : child) { for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) { for(String fac : EBomConstant.VIRTUAL_PACKAGE_DRAWING_NO_1010_AND_1020) { - String vDrawingNo = String.join("", "(", parentDrawingNo, ")", "(", ch.getMaterialName()+fac, ")", "(", vpy.getConMaterialName(), ")"); + String vDrawingNo = String.join("", "(", parentDrawingNo, ")", "(", StrUtil.replace(ch.getMaterialName(),ch.getDrawingNo(),"") +fac, ")", "(", vpy.getConMaterialName(), ")"); vDrawingNoNewSet.add(vDrawingNo); } } @@ -107,7 +107,7 @@ public abstract class VirtualPackageBase { for (BomNewEbomChildEntity ch : child) { for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) { for (String fac : EBomConstant.VIRTUAL_PACKAGE_DRAWING_NO_1010_AND_1020) { - String vDrawingNo = String.join("", "(", parentDrawingNo, ")", "(", ch.getMaterialName()+fac, ")", "(", vpy.getConMaterialName(), ")"); + String vDrawingNo = String.join("", "(", parentDrawingNo, ")", "(", StrUtil.replace(ch.getMaterialName(),ch.getDrawingNo(),"") +fac, ")", "(", vpy.getConMaterialName(), ")"); params.add(buildAddMaterialParamDo(StrUtil.join("", ch.getRowId().toString(), vpy.getConMaterialName()+fac), vDrawingNo, vDrawingNo, vpy, oldMaterialMap)); } }