Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

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

@@ -3,11 +3,8 @@ package com.nflg.product.bomnew.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,23 +18,17 @@ import com.nflg.product.bomnew.mapper.master.BomNewEbomParentMapper;
 import com.nflg.product.bomnew.pojo.dto.BomNewEBomCreateDTO;
 import com.nflg.product.bomnew.pojo.dto.BomNewEBomRevertDTO;
 import com.nflg.product.bomnew.pojo.dto.VirtualPackageParamDto;
-import com.nflg.product.bomnew.pojo.entity.*;
+import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity;
+import com.nflg.product.bomnew.pojo.entity.BomNewEbomMaterialUseEntity;
+import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
+import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery;
-import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
 import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
-import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
 import com.nflg.product.bomnew.pojo.vo.EbomExcelVO;
-import com.nflg.product.bomnew.service.domain.EBom.EBomDetailTask;
+import com.nflg.product.bomnew.service.domain.EBom.*;
-import com.nflg.product.bomnew.service.domain.EBom.EbomInitProjectType;
-import com.nflg.product.bomnew.service.domain.EBom.VirtualPackageBase;
-import com.nflg.product.bomnew.service.domain.EBom.VirtualPackageFor31;
-import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomDetailTask;
 import com.nflg.product.bomnew.util.*;
 import nflg.product.common.constant.STATE;
-import nflg.product.common.vo.ResultVO;
-import org.apache.ibatis.annotations.Param;
-import org.bouncycastle.cert.dane.DANECertificateFetcher;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,7 +44,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**
@@ -102,10 +92,12 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
             if(StrUtil.isNotBlank(materialNo)){
                 List<String> parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician());
+                if(CollUtil.isNotEmpty(parentMaterialByMaterialNo)) {
                     List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo);
                     List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo);
 
-                returnResult= handSeachToTree(parents,childs);
+                    returnResult = handSeachToTree(parents, childs);
+                }
             }
         }else {
             Page<BomNewEbomParentVO> result = this.getBaseMapper().getEBomListPage(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode());
@@ -345,7 +337,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 if (parent.getMaterialCategoryCode().startsWith("30")) {
                     generate = new VirtualPackageFor31(paramDto.getBomRowId(), paramDto.getVirtualPackageValue());
                 } else {
-                    generate = new VirtualPackageFor31(paramDto.getBomRowId(), paramDto.getVirtualPackageValue());
+                    generate = new VirtualPackageFor21(paramDto.getBomRowId(), paramDto.getVirtualPackageValue());
                 }
                 generate.generateVirtualPackage();
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java

@@ -102,9 +102,9 @@ public class OriginalBomToEBomConvert extends BaseConvert {
                     SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(parentChildNoMaterilaNoList, BomOriginalListVO::getDrawingNo, BomOriginalListVO::setMaterialNo, BomOriginalListVO::setMaterialName);
                 }
                 //合并相同编码的物料
-                List<BomOriginalListVO> mergeResult = mergeBOM(parentChild);
+              //  List<BomOriginalListVO> mergeResult = mergeBOM(parentChild);
                 Long parentRowId = buildEBomParent(parentEnt);
-                buildEBomChild(mergeResult, parentRowId);
+                buildEBomChild(parentChild, parentRowId);
             } else {  //无子级
 
                 MaterialMateVO materialByRel = getMaterialByRel(parent.getMaterialName(), parent.getMaterialTexture());

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml

@@ -150,7 +150,7 @@
     </select>
 
     <select id="getSelfParentMaterialNo" resultType="java.lang.String">
-        select material_no from t_bom_new_ebom_parent where  last_version_is=1 and created_by=#{createdBy}   material_no in
+        select material_no from t_bom_new_ebom_parent where  last_version_is=1 and created_by=#{createdBy} and  material_no in
             <foreach collection="list" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>