From 170ad6fa2e6b6db97128deeec52756f155d42da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sat, 3 Aug 2024 16:20:01 +0800 Subject: [PATCH] =?UTF-8?q?31=E7=A0=81-=E7=94=9F=E6=88=90=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=8C=85=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=B8=AD=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=9B=BE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/VirtualPackageBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)); } }