From 55db281e1474ec44776842886ec6fe61ce5f764f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 29 Mar 2024 16:07:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8Bbom=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/constant/OriginalConstant.java     |  2 +
 .../service/BomNewOriginalParentService.java  | 37 ++++++++++++-------
 .../util/MaterialshouldBomExistUtil.java      | 15 +++-----
 .../master/BomNewOriginalParentMapper.xml     |  5 ++-
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalConstant.java
index d5ebac36..0d338063 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalConstant.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalConstant.java
@@ -11,4 +11,6 @@ public class OriginalConstant {
     public static final String COMMON_MATERIAL_CATEGORY_CODE = "200901";
 
     public static final String NO_BOM_VERSION="A-1";
+
+    public static final String DEFAULT_BOM_VERSION="A00";
 }
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 c6e062c3..7ba75293 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
@@ -153,20 +153,29 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                 }
             }
             if (CollUtil.isNotEmpty(queryDrawingNos)) {
-                List<BomNewOriginalParentEntity> materialBoms = this.lambdaQuery().in(BomNewOriginalParentEntity::getDrawingNo, queryDrawingNos).eq(BomNewOriginalParentEntity::getLastVersionIs, 1)
-                        .eq(BomNewOriginalParentEntity::getStatus, OriginalStatusEnum.UN_CONVERT.getValue()).list();
-                if(query.getStatus().equals(1) && CollUtil.isEmpty(materialBoms)){
-                    return  result;
-                }
+//                List<BomNewOriginalParentEntity> materialBoms = this.lambdaQuery().in(BomNewOriginalParentEntity::getDrawingNo, queryDrawingNos).eq(BomNewOriginalParentEntity::getLastVersionIs, 1)
+//                        .eq(BomNewOriginalParentEntity::getStatus, OriginalStatusEnum.UN_CONVERT.getValue()).list();
+//                if(query.getStatus().equals(1) && CollUtil.isEmpty(materialBoms)){
+//                    return  result;
+//                }
                 List<String> parentDrawingNos = new ArrayList<>(getParentDrawingNoByMaterialNo(queryDrawingNos));
                 parentDrawingNos.addAll(queryDrawingNos);
                 if (CollUtil.isNotEmpty(parentDrawingNos)) {
                     List<BomOriginalListVO> parents = this.getBaseMapper().getParentForDrawingNoSeach(parentDrawingNos, query.getStatus());
+                    materialMainService.intiMaterialInfo(parents, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
                     List<BomOriginalListVO> childs = this.getBaseMapper().getChildForDrawingNoSeach(parentDrawingNos,query.getStatus());
-                    List<BomOriginalListVO> data = new ArrayList<>();
-                    data.addAll(parents);
-                    data.addAll(childs);
-                    materialMainService.intiMaterialInfo(data, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
+                    materialMainService.intiMaterialInfo(childs, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
+                    childs.stream().filter(f -> StrUtil.isBlank(f.getCurrentVersion())).forEach(f -> {
+                        if (MaterialshouldBomExistUtil.checkShouldBomExist(f.getMaterialCategoryCode(), f.getMaterialGetType())) {
+                            f.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
+                        } else {
+                            f.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
+                        }
+                    });
+//                    List<BomOriginalListVO> data = new ArrayList<>();
+//                    data.addAll(parents);
+//                    data.addAll(childs);
+//                    materialMainService.intiMaterialInfo(data, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
                     result = handSeachToTree(parents, childs);
                 }
             }
@@ -486,11 +495,11 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         //开始转换
         for (BomNewOriginalParentEntity parent : bomNewOriginalParentEntities) {
 
-            if (!Objects.equals(parent.getCreatedBy(), SessionUtil.getUserCode())){
-                importOriginalBomVOList.add(new ImportOriginalBomVO(parent.getDrawingNo(),"非本人创建"));
-                log.warn(SessionUtil.getRealName()+"("+SessionUtil.getUserCode()+")转换原始bom("+parent.getRowId().toString()+")到ebom的操作被阻止");
-                continue;
-            }
+//            if (!Objects.equals(parent.getCreatedBy(), SessionUtil.getUserCode())){
+//                importOriginalBomVOList.add(new ImportOriginalBomVO(parent.getDrawingNo(),"非本人创建"));
+//                log.warn(SessionUtil.getRealName()+"("+SessionUtil.getUserCode()+")转换原始bom("+parent.getRowId().toString()+")到ebom的操作被阻止");
+//                continue;
+//            }
 
             LogRecordContext.putVariable("bom",parent);
             Long ebomRowId = IdWorker.getId();
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java
index 643e59e2..559cf1ab 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MaterialshouldBomExistUtil.java
@@ -28,15 +28,12 @@ public class MaterialshouldBomExistUtil {
     }
 
     public static boolean checkShouldBomExist(BaseMaterialVO material){
-
-            if(StrUtil.isNotBlank(material.getMaterialCategoryCode()) &&
-                    (material.getMaterialCategoryCode().startsWith("30") || material.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)  ||
-                            (  material.getMaterialCategoryCode().startsWith("20") && MaterialGetEnum.developing.equalsValue(material.getMaterialGetType())  ))){
-
-                    return true;
-            }
-            return false;
+        return checkShouldBomExist(material.getMaterialCategoryCode(), material.getMaterialGetType());
+    }
+    public static boolean checkShouldBomExist(String materialCategoryCode, Integer materialGetType){
+        return StrUtil.isNotBlank(materialCategoryCode) &&
+                (materialCategoryCode.startsWith("30") || materialCategoryCode.equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) ||
+                        (materialCategoryCode.startsWith("20") && MaterialGetEnum.developing.equalsValue(materialGetType)));
 
     }
-
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
index 4f560eb6..35ba020a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
@@ -216,8 +216,9 @@
     <!--物料编码搜索-子级-->
     <select id="getChildForDrawingNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomOriginalListVO">
         select if(#{state}=1 and c.status=2,3,c.status) as status ,c.current_version , c.created_by as bomCreatedBy
-        ,c.devise_name,c.devise_user_code,c.dept_name ,
-        c.source, c.row_id as bomRowId, c.row_id as childBomRowId, b.*
+        ,IFNULL(c.devise_name,a.devise_name) as devise_name,IFNULL(c.devise_user_code,a.devise_user_code) AS devise_user_code
+        ,IFNULL(c.dept_name,a.dept_name) AS dept_name,IFNULL(c.source,a.source) AS source,IFNULL(c.row_id,"0") as bomRowId
+        ,IFNULL(c.row_id,"0") as childBomRowId, b.*
         from t_bom_new_original_parent a
         join t_bom_new_original_child b on a.row_id =b.parent_row_id
         left join t_bom_new_original_parent c on b.drawing_no=c.drawing_no and c.last_version_is=1