From 0a407310427756d10d5015e62836b4c33ebb5c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 11 May 2024 16:30:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BB=8Eexcel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=97=B6=E8=AF=86=E5=88=AB=E8=99=9A=E6=8B=9F=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/EBomImportService.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 3948b40c..42424027 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -308,6 +308,7 @@ public class EBomImportService { if (!Objects.isNull(vo)) { child.setMaterialCategoryCode(vo.getMaterialCategoryCode()); } + setVirtualPackageType(child); children.add(child); } @@ -360,6 +361,7 @@ public class EBomImportService { parent.setDeptName(SessionUtil.getDepartName()); parent.setSource(EBomSourceEnum.FROM_EXCE.getValue()); parent.setSourceRowId(""); + setVirtualPackageType(parent); return parent; } @@ -425,6 +427,26 @@ public class EBomImportService { parent.setDeptName(SessionUtil.getDepartName()); parent.setSource(EBomSourceEnum.FROM_EXCE.getValue()); parent.setSourceRowId(""); + setVirtualPackageType(parent); return parent; } + + private void setVirtualPackageType(BomNewEbomParentEntity parent) { + if (parent.getMaterialDesc().endsWith(")(发货)") || parent.getMaterialDesc().endsWith(")(制作)") + || parent.getMaterialDesc().endsWith(")(直发)") || parent.getMaterialDesc().endsWith(")(发货前装配)")) { + parent.setVirtualPackageIs(1); + } + } + + private void setVirtualPackageType(BomNewEbomChildEntity child) { + if (child.getMaterialDesc().endsWith(")(发货)")) { + child.setVirtualPartType(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue()); + } else if (child.getMaterialDesc().endsWith(")(制作)")) { + child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue()); + } else if (child.getMaterialDesc().endsWith(")(直发)")) { + child.setVirtualPartType(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue()); + } else if (child.getMaterialDesc().endsWith(")(发货前装配)")) { + child.setVirtualPartType(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue()); + } + } }