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] =?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());