From 9998d74ffbf1fadc9f3de9db2f89a01ee8207daa Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 24 Jan 2024 23:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=9F=90=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=EF=BC=8C=E6=8C=89=E5=9B=9E=E8=BD=A6=E9=94=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E5=8D=95=E5=87=BB=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A1=8C/=E6=9A=82=E5=AD=98/=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6=EF=BC=8C=E6=AD=A4=E7=89=A9=E6=96=99=E4=BC=9A?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 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 fe7b070f..e29442dd 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
@@ -1230,30 +1230,44 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
         BomNewEbomParentEntity bomParent=null;
+        BomNewEbomChildEntity childEntity=null;
 
-        if(query.getBomRowId()!=null){
+        if(query.getBomRowId()!=null && query.getBomRowId().longValue()!=0){
             bomParent= getById(query.getBomRowId());
         }
+        if(query.getRowId()!=null  && query.getRowId().longValue()!=0){
+            childEntity= SpringUtil.getBean(BomNewEbomChildService.class).getById(query.getRowId());
+        }
 
 
 
         if (CollUtil.isNotEmpty(materialMainList)) {
             MaterialMainEntity materialMainEntity = materialMainList.get(0);
             BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO();
+
+            if(childEntity!=null){
+                BeanUtil.copyProperties(childEntity, baseMaterialVO);
+                if(childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo())){
+                    return baseMaterialVO;
+                }
+            }
+
             BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
-
             SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
 
-
          //   baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
             baseMaterialVO.setRowId(query.getRowId());
-            materialMainEntity.setProjectType(null);
+            baseMaterialVO.setParentRowId(query.getBomRowId());
+            baseMaterialVO.setProjectType(null);
             baseMaterialVO.setDeptName(SessionUtil.getDepartName());
             baseMaterialVO.setDeviseUserCode(SessionUtil.getUserCode());
             baseMaterialVO.setDeviseName(SessionUtil.getRealName());
             baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
             baseMaterialVO.setCreatedTime(LocalDateTime.now());
             baseMaterialVO.setModifyTime(LocalDateTime.now());
+            baseMaterialVO.setSource(EBomSourceEnum.FROM_MDM.getValue());
+
+
             if(StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
                 baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
             }