From a0337e5a410b10b98986403ad3ddc7857af9363a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 2 Sep 2024 14:34:15 +0800
Subject: [PATCH] =?UTF-8?q?EBOM-=E7=BC=96=E8=BE=91-=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A1=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/constant/EBomConstant.java |  2 ++
 .../bomnew/service/BomNewEbomParentService.java        | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
index a1823dbd..35b26197 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
@@ -22,6 +22,8 @@ public class EBomConstant {
     public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2 = {"material", "materialTexture", "projectType", "materialUnit","materialNo",
             "materialName","materialDesc","drawingNo"
     };
+    //ebom编辑时，物料信息初始化时需忽略的字段
+    public static  final  String[] EBOM_EDIT_IGNORED_FIELDS = {"material", "materialTexture", "projectType", "materialNo", "materialName","materialDesc","drawingNo"};
 
     public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3 = {"material", "materialTexture", "projectType", "materialUnit","materialWeight"};
 
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 b5ffbb47..f810e6af 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
@@ -1855,7 +1855,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                     childList.addAll(getChild(v.getBomRowId(), 0));
                 });
             }
-            materialMainService.intiMaterialInfo(childList, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
+            materialMainService.intiMaterialInfo(childList, EBomConstant.EBOM_EDIT_IGNORED_FIELDS);
             vo.setDatas(childList);
         }
 
@@ -2341,11 +2341,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
     public List<BomNewEbomParentVO> changeMaterial(BomNewEBomChangeDTO dto) {
         List<BaseMaterialVO> materialVOS = CheckEBomException.checkMaterialNoInMain(dto.getDatas());
-        String[] editEditIgnoredFields = {"material", "materialTexture", "projectType", "materialNo", "materialName","materialDesc","drawingNo"};
-        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(dto.getDatas(), materialVOS, editEditIgnoredFields);
-        for (BomNewEbomParentVO vo : dto.getDatas()) {
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(dto.getDatas(), materialVOS, EBomConstant.EBOM_EDIT_IGNORED_FIELDS);
+
+        for (BomNewEbomParentVO vo :
+                dto.getDatas()) {
             vo.setTotalWeight(NumberUtil.mul(vo.getUnitWeight(), vo.getNum()));
         }
+
         return dto.getDatas();
     }