From 99bb2bb9943895f747e91b84d6d5d7459a2a7edc Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Tue, 2 Apr 2024 09:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 0c837ed2..ecb9f269 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1421,6 +1421,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
             SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
 
+                //继承bom的状态
+            if (bomParent != null) {
+                baseMaterialVO.setEditStatus(bomParent.getEditStatus());
+                baseMaterialVO.setStatus(bomParent.getStatus());
+            }
+
+
             //   baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
             baseMaterialVO.setRowId(query.getRowId());
             baseMaterialVO.setParentRowId(query.getBomRowId());
@@ -1440,10 +1447,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             if(ObjectUtil.isNull(baseMaterialVO.getNum())){
                 baseMaterialVO.setNum(new BigDecimal(1));
             }
-            if (bomParent != null) {
-                baseMaterialVO.setEditStatus(bomParent.getEditStatus());
-                baseMaterialVO.setStatus(bomParent.getStatus());
-            }
+
 
 
             if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())