From 043143306f7d76dd9fcb35368af5b3e0d9055e6b 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, 27 May 2024 15:32:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20sap=E6=8E=92=E5=BA=8F=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java   | 5 +++--
 .../nflg/product/bomnew/service/MaterialMainService.java  | 4 +++-
 .../main/java/com/nflg/product/bomnew/util/BomUtil.java   | 8 ++++++--
 3 files changed, 12 insertions(+), 5 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 dd56f78d..11d50f05 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
@@ -339,7 +339,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         List<BomNewEbomParentVO> parentChild = this.getBaseMapper().getParentChild(rowId);
         //排除项目类别的赋值
-        materialMainService.intiMaterialInfoInPattern(parentChild, "^21 | ^31", EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
+        List<BaseMaterialVO> materialVOS = materialMainService.intiMaterialInfoInPattern(parentChild, "^21 | ^31", EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
         if (CollUtil.isNotEmpty(parentChild)) {
             List<String> materialNos = parentChild.stream().map(BaseMaterialVO::getMaterialNo).filter(StrUtil::isNotBlank).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(materialNos)) {
@@ -411,7 +411,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         }
                     }
                     child.setChildBomRowId(child.getRowId());
-                    child.setSapOrderNum(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode()
+                    BaseMaterialVO mvo = materialVOS.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), child.getMaterialNo())).findFirst().orElse(null);
+                    child.setSapOrderNum(BomUtil.generateSapOrderNum(child.getProjectType(), Objects.isNull(mvo) ? "" : mvo.getMaterialCategoryCode()
                             , "1010", child.getMaterialNo(), child.getBomExist()));
                 }
             }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java
index 0dc86b18..b302c2b7 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java
@@ -132,7 +132,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
     }
 
     //
-    public <T extends BaseMaterialVO> void intiMaterialInfoInPattern(List<T> data , String ignoreMaterialRemarkToNnamePattern , String ... ignorePropertyList) {
+    public <T extends BaseMaterialVO> List<BaseMaterialVO> intiMaterialInfoInPattern(List<T> data, String ignoreMaterialRemarkToNnamePattern, String... ignorePropertyList) {
         List<String> materialNos = data.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(materialNos)) {
             List<BaseMaterialVO> materialBaseInfos = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos);
@@ -146,7 +146,9 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                     }
                 }
             }
+            return materialBaseInfos;
         }
+        return null;
     }
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/BomUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/BomUtil.java
index 4e2ecbe7..dc3e9e8f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/BomUtil.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/BomUtil.java
@@ -61,10 +61,14 @@ public class BomUtil {
             if (StrUtil.equals(categoryCode, "100101")) {
                 orderNum = "0010";
             }
-            if (StrUtil.equals(categoryCode, "102101")
-                    || (Integer.parseInt(categoryCode) >= 100102 && Integer.parseInt(categoryCode) <= 100104)) {
+            if (StrUtil.equals(categoryCode, "102101")) {
                 orderNum = "0020";
             }
+            if (StrUtil.isNotBlank(categoryCode)) {
+                if (Integer.parseInt(categoryCode) >= 100102 && Integer.parseInt(categoryCode) <= 100104) {
+                    orderNum = "0020";
+                }
+            }
             if (StrUtil.equals(categoryCode, "100301") && StrUtil.equals(factoryCode, "1010")) {
                 orderNum = "0050";
             }