Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java

@@ -1151,10 +1151,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             else {
                 bomRowIds.add(bomRowId);
             }
+            if(CollUtil.isNotEmpty(bomRowIds)) {
                 this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds);
-            //同步sap
-            // saySyncDEMO();
-//            importSap(parent,allBom);
                 //记录-BOM版本RowId
                 List<BomNewPbomChildEntity> pBomChildren = new ArrayList<>();
                 allBom.forEach(k -> {
@@ -1168,7 +1166,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                 }
 
                 //历史版本转移到formal正式工作表
-            pBomToFormal(bomRowIds, parentMaterialNos,parent.getFacCode());
+                pBomToFormal(bomRowIds, parentMaterialNos, parent.getFacCode());
+            }
 
 //            SpringUtil.getBean(BomNewPbomParentFormalService.class).copyPbomFormal(bomRowId);
         } catch (Exception ex) {

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormal31New.java

@@ -3,12 +3,14 @@ package com.nflg.product.bomnew.service.domain.EBom.topbomnew;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.excel.enums.BooleanEnum;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum;
 import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
+import com.nflg.product.bomnew.mapper.master.BomNewPbomParentMapper;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@@ -125,6 +127,13 @@ public class EBomToPBomForFormal31New extends FormalEBomToPbomBase {
                 if(Objects.isNull(parentEnt)){
                     continue;
                 }
+                //检查是否用户跟用户节点（）
+                if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) {
+                    List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo());
+                    if (CollUtil.isEmpty(childMaterialNos)) {
+                        parentEnt.setUserRootIs(1);
+                    }
+                }
 
                 //子级
                 if (CollUtil.isNotEmpty(child)) {

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java

@@ -89,10 +89,13 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase {
                     continue;
                 }
                 //检查是否用户跟用户节点（）
-                List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parentEnt.getMaterialNo());
+                if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) {
-                if(CollUtil.isEmpty(childMaterialNos)){
+                    List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo());
+                    if (CollUtil.isEmpty(childMaterialNos)) {
                         parentEnt.setUserRootIs(1);
                     }
+                }
+
                 //子级
                 if (CollUtil.isNotEmpty(child)) {
                     //合并子级