From d3601f5f7951f79cff64261808de141f553e4a2b Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 22 Jul 2024 15:33:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9F=A5=E5=9B=9E?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=9C=AA?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 021d6249..0e736a59 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
@@ -1863,8 +1863,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             if (childEntity != null) {
 
-                //编辑查询物料id未变化
-                if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) || childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) {
+                //编辑查询物料id未变化原样返回
+                if (childEntity.getMaterialNo().equals(query.getMaterialNo()) || childEntity.getDrawingNo().equals(query.getDrawingNo())) {
                     BeanUtil.copyProperties(childEntity, baseMaterialVO);
                     SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
                     return baseMaterialVO;

From 33e44fb6d1c65e4ee856db3b66bfb0e63be7d72d Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 22 Jul 2024 15:47:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=20||?=
 =?UTF-8?q?=20->&&?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java  | 9 ++++-----
 1 file changed, 4 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 67e98368..fb04f11f 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
@@ -1249,9 +1249,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             newParent.setRevertUserName(null);
             newParent.setAuditUserName(null);
             newParent.setAuditTime(null);
-            newParent.setRootIs(this.getBaseMapper().isRoot(parent.getMaterialNo())>0?0:1);
-            newParent.setUserRootIs(this.getBaseMapper().isUserRoot(parent.getMaterialNo(),SessionUtil.getUserCode())>0?0:1);
-            newParent.setRootIsForWaitReview(this.getBaseMapper().isRootIsForWaitReview(parent.getMaterialNo())>0?0:1);
+            newParent.setRootIs(1);
+            newParent.setUserRootIs(1);
             newParent.setSapState(1);
             newParent.setSapTime(null);
             newParent.setModifyTime(null);
@@ -1864,8 +1863,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             if (childEntity != null) {
 
-                //编辑查询物料id未变化原样返回
-                if (childEntity.getMaterialNo().equals(query.getMaterialNo()) || childEntity.getDrawingNo().equals(query.getDrawingNo())) {
+                //编辑查询物料id未变化
+                if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) && childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) {
                     BeanUtil.copyProperties(childEntity, baseMaterialVO);
                     SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
                     return baseMaterialVO;