From 94e04540ac8e69231291ab1f2fe605cb6078b770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Tue, 10 Sep 2024 15:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=ACPBOM-=E8=99=9A=E6=8B=9F=E5=8C=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EBom/topbomnew/FormalEBomToPbomBase.java  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
index 833178bc..ae89d308 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
@@ -192,22 +192,22 @@ public abstract class FormalEBomToPbomBase {
         //pbom 处于工作表
         else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
             //if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy())) {
-//                if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) {
-//                    if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy()) || VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0) {
-//                        SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
-//                        oldParent.setSourceRowId(parentVo.getBomRowId());
-//                        oldParent.setCreatedTime(LocalDateTime.now());
-//                        oldParent.setCreatedBy(SessionUtil.getUserCode());
-//                        oldParent.setDeptName(SessionUtil.getDepartName());
-//                        oldParent.setDeptRowId(SessionUtil.getDepartRowId());
-//                        this.pBomParentResult.add(oldParent);
-//                        return oldParent;
-//                    }
-//
-//            } else {
-//                // 降parentVo 及其子节点标记为不转换
-//                markNoConvert(parentVo, parentList);
-//            }
+                if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) {
+                    if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy()) || VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0) {
+                        SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
+                        oldParent.setSourceRowId(parentVo.getBomRowId());
+                        oldParent.setCreatedTime(LocalDateTime.now());
+                        oldParent.setCreatedBy(SessionUtil.getUserCode());
+                        oldParent.setDeptName(SessionUtil.getDepartName());
+                        oldParent.setDeptRowId(SessionUtil.getDepartRowId());
+                        this.pBomParentResult.add(oldParent);
+                        return oldParent;
+                    }
+
+            } else {
+                // 降parentVo 及其子节点标记为不转换
+                markNoConvert(parentVo, parentList);
+            }
             return null;
 
         } else {  //pbom-处于正式表(全部生成小版本)