From 320dd02854bc38524934a8b69cfa5d6819d3b6b4 Mon Sep 17 00:00:00 2001 From: luoliming Date: Sun, 23 Jun 2024 16:54:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?PBOM=20=E5=8F=91=E5=B8=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/EBom/EBomToPbomBase.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 18ef8384..2200a299 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 @@ -230,31 +230,29 @@ public abstract class EBomToPbomBase { */ protected void liftingLayer() { for (BomNewEbomParentVO vo : allBomDetail) { - BomNewEbomParentVO newVo=new BomNewEbomParentVO(); - BeanUtil.copyProperties(vo,newVo); if (StrUtil.isNotBlank(vo.getProjectType()) && vo.getProjectType().equals(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey())) { BomNewEbomParentVO lastVirtualPackage = getLastVirtualPackage(vo, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE); if (Objects.nonNull(lastVirtualPackage)) { - liftingLayerSummary(lastVirtualPackage, newVo); - newVo.setSourceRowId(String.valueOf(vo.getParentRowId())); - newVo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); - newVo.setParentRowId(lastVirtualPackage.getBomRowId()); - result.add(newVo); + liftingLayerSummary(lastVirtualPackage, vo); + vo.setSourceRowId(String.valueOf(vo.getParentRowId())); + vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); + vo.setParentRowId(lastVirtualPackage.getBomRowId()); + result.add(vo); } continue; } if (StrUtil.isNotBlank(vo.getProjectType()) && vo.getProjectType().equals(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey())) { BomNewEbomParentVO lastVirtualPackage = getLastVirtualPackage(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE); if (Objects.nonNull(lastVirtualPackage)) { - liftingLayerSummary(lastVirtualPackage, newVo); + liftingLayerSummary(lastVirtualPackage, vo); vo.setSourceRowId(String.valueOf(vo.getParentRowId())); vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); vo.setParentRowId(lastVirtualPackage.getBomRowId()); - result.add(newVo); + result.add(vo); } continue; } - result.add(newVo); + result.add(vo); } } From 5a16d05a0d48cf103fc7c036722f7ee1c7c8fef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sun, 23 Jun 2024 18:50:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=20=E5=8D=95=E5=B1=82=E5=8F=8D?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/EBomToPBomForFormal31.java | 4 ++-- .../product/bomnew/service/domain/EBom/EBomToPbomBase.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java index 82aa6a92..6a3a89fa 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java @@ -80,8 +80,8 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase { check(); //bom 提层 liftingLayer(); - result.forEach(u->u.setLevelNo("")); - generateDrawingNo(result, parent.getRowId(), "1"); +// result.forEach(u->u.setLevelNo("")); +// generateDrawingNo(result, parent.getRowId(), "1"); splitData(); List hasConvert = new ArrayList<>(); 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 2200a299..22aeb298 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 @@ -167,8 +167,8 @@ public abstract class EBomToPbomBase { } //pbom 处于工作表 else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) { - if (oldParent.getCreatedBy() == parentVo.getCreatedBy()) { - if (ConvertToPBomModelEnum.OVERRIDE.equals(convertMode.getValue())) { + if (oldParent.getCreatedBy().equals( parentVo.getCreatedBy())) { + if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) { SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId())); oldParent.setCurrentVersion(parentVo.getCurrentVersion()); oldParent.setSourceRowId(parentVo.getRowId()); From 8a69a3763555201f2b087624a398a94d493b3752 Mon Sep 17 00:00:00 2001 From: luoliming Date: Sun, 23 Jun 2024 19:01:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?EBOM=E6=AD=A3=E5=BC=8F=E8=BD=ACPBOM?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java | 1 + .../product/bomnew/service/domain/EBom/EBomFormalDetailTask.java | 1 + 2 files changed, 2 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java index eb7e7b0b..cc921574 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java @@ -68,6 +68,7 @@ public class EBomDetailTask extends RecursiveTask> { detailVO.setBomExist(ebomParentEntity.getBomExist()); detailVO.setStatus(ebomParentEntity.getStatus()); detailVO.setBatchNo(ebomParentEntity.getBatchNo()); + detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java index bfcb74a2..705137d2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalDetailTask.java @@ -76,6 +76,7 @@ public class EBomFormalDetailTask extends RecursiveTask detailVO.setBomExist(ebomParentEntity.getBomExist()); detailVO.setStatus(ebomParentEntity.getStatus()); detailVO.setBatchNo(ebomParentEntity.getBatchNo()); + detailVO.setCreatedBy(ebomParentEntity.getCreatedBy()); } }