From f0b0edf6bf188363e506d5a137add41a59fed2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 1 Apr 2024 21:39:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=A7=8Bbom?=
 =?UTF-8?q?=E8=BD=ACebom=E6=97=B6=EF=BC=8C=E4=BC=9A=E5=B0=86=E5=AD=90?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=BA=E5=BC=95=E7=94=A8=E4=BB=B6=E4=B9=9F?=
 =?UTF-8?q?=E8=BD=AC=E8=B5=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewOriginalParentService.java      | 15 +++++++++++----
 .../OriginalBom/OriginalBomToEBomConvert.java     |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index b45151e1..0547b410 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -78,8 +78,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
     @Resource
     MaterialMainService materialMainService;
 
-    @Resource
-    BomNewOriginalParentService parentService;
+//    @Resource
+//    BomNewOriginalParentService parentService;
 
     @Resource
     BomNewOriginalMaterialUseService originalMaterialUseService;
@@ -246,7 +246,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
      * @return
      */
     public List<BomOriginalListVO> getChild(Long rowId) {
-        BomNewOriginalParentEntity parent = parentService.getBaseMapper().selectById(rowId);
+        BomNewOriginalParentEntity parent = this.getBaseMapper().selectById(rowId);
         List<BomOriginalListVO> parentChild = this.getBaseMapper().getParentChild(rowId);
         materialMainService.intiMaterialInfo(parentChild);
         if (CollUtil.isNotEmpty(parentChild)) {
@@ -289,6 +289,13 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                         child.setDeviseUserCode(parent.getDeviseUserCode());
                         child.setDeviseName(parent.getDeviseName());
                         child.setDeptName(parent.getDeptName());
+                        if (child.getBomRowId() > 0) {
+                            // 子级节点状态与父级节点状态不一致时，子级节点重置为0
+                            BomNewOriginalParentEntity p = this.getBaseMapper().selectById(child.getBomRowId());
+                            if (!p.getStatus().equals(child.getStatus())) {
+                                child.setBomRowId(0L);
+                            }
+                        }
                         try {
                             if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                                 child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@@ -503,7 +510,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         for (BomNewOriginalParentEntity parent : bomNewOriginalParentEntities) {
 
             if (!Objects.equals(parent.getCreatedBy(), SessionUtil.getUserCode())){
-//                importOriginalBomVOList.add(new ImportOriginalBomVO(parent.getDrawingNo(),"非本人创建"));
+                importOriginalBomVOList.add(new ImportOriginalBomVO(parent.getDrawingNo(),"非本人创建"));
                 log.warn(SessionUtil.getRealName()+"("+SessionUtil.getUserCode()+")转换原始bom("+parent.getRowId().toString()+")到ebom的操作被阻止");
                 continue;
             }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
index 9d2e3cb9..5c3a089c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
@@ -18,7 +18,6 @@ import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
-import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO;
 import com.nflg.product.bomnew.pojo.vo.MaterialMateVO;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
 import com.nflg.product.bomnew.service.MaterialMainService;
@@ -96,7 +95,8 @@ public class OriginalBomToEBomConvert extends BaseConvert {
 
 
         //处理子级
-        List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0 && ( OriginalStatusEnum.UN_CONVERT.equalsValue(u.getStatus()) || OriginalStatusEnum.REFERENCE.equalsValue(u.getStatus()))  ).collect(Collectors.toList());
+        //List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0 && ( OriginalStatusEnum.UN_CONVERT.equalsValue(u.getStatus()) || OriginalStatusEnum.REFERENCE.equalsValue(u.getStatus()))).collect(Collectors.toList());
+        List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId() > 0 && OriginalStatusEnum.UN_CONVERT.equalsValue(u.getStatus())).collect(Collectors.toList());
         //去重
         bomParents= ListCommonUtil.toDistinct(bomParents,BomOriginalListVO::getBomRowId);
         for (BomOriginalListVO childParent : bomParents) {