From 298a70817e6022cb3902ffaa59f9b3a8fdeb7966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Tue, 2 Jan 2024 19:06:42 +0800
Subject: [PATCH] =?UTF-8?q?1.PBom=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/OriginalBomApi.java | 12 ++++++++++++
 .../domain/OriginalBom/OriginalBomToEBomConvert.java |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
index c691ad0e..9b5dab75 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
@@ -11,9 +11,11 @@ import com.nflg.product.bomnew.pojo.dto.BomNewOriginalExcelDTO;
 import com.nflg.product.bomnew.pojo.dto.OriginalSaveBomDTO;
 import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
 import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
+import com.nflg.product.bomnew.pojo.vo.MaterialMateVO;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
 import com.nflg.product.bomnew.service.BomNewOriginalParentService;
 import com.nflg.product.bomnew.service.MaterialService;
+import com.nflg.product.bomnew.service.cache.MaterialMateCache;
 import com.nflg.product.bomnew.util.EecExcelUtil;
 import com.nflg.product.bomnew.util.TreeNode;
 import com.nflg.product.bomnew.util.VUtils;
@@ -212,6 +214,16 @@ public class OriginalBomApi extends BaseApi {
     }
 
 
+    @ApiOperation("test匹配")
+    @PostMapping("testpiPEI")
+    public ResultVO<String>  test(@RequestParam("mname") String mname , @RequestParam("textrue")String textrue){
+        MaterialMateCache mateCache = new MaterialMateCache();
+        MaterialMateVO materialMate = mateCache.findMaterialByNameOrmaterialTexture(mname, textrue);
+        return ResultVO.success(materialMate.getMaterialNo());
+
+    }
+
+
 
 
 }
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 43d27205..e21bea32 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
@@ -291,6 +291,10 @@ public class OriginalBomToEBomConvert extends BaseConvert {
      * 构建EBom父级
      */
     private Long buildEBomParent(BomOriginalListVO parentEnt) {
+        Map<String, BomNewEbomParentEntity> parentMap = ListCommonUtil.listToMap(this.getEBomParentResult(), BomNewEbomParentEntity::getMaterialNo);
+        if(parentMap.containsKey(parentEnt.getMaterialNo())){
+            return parentMap.get(parentEnt.getMaterialNo()).getRowId();
+        }
         BomNewEbomParentEntity ebom = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).eq(BomNewEbomParentEntity::getLastVersionIs, 1).one();
         BomNewEbomParentEntity eBomParent = new BomNewEbomParentEntity();
         BeanUtil.copyProperties(parentEnt, eBomParent, "materialGetType");