From 86be02946648e7e9bc7cb2b2b6ba159b393cac0c Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 4 Sep 2024 11:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=20=E6=8F=90=E4=BA=A4=20=20?=
 =?UTF-8?q?=E5=AD=90=E6=95=B0=E6=8D=AE=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java   | 15 +++++++++++----
 1 file changed, 11 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 57cafc16..ffd09ea5 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
@@ -2140,6 +2140,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         //            return dto.getParent();
         //        }
 
+        //检查是否在主数据里
+        if (CollUtil.isNotEmpty(dto.getDatas())) {
+            CheckEBomException.checkMaterialNoInMain(dto.getDatas());
+        }
 
         EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_MDM.getValue());
         dto.setOpType(EbomEditStatusEnum.HANDLER_CREATED.getValue());
@@ -2192,14 +2196,17 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         checkUserRoleAuth(dto.getParent().getCreatedBy());
 
 
-        //        //无提交数据后面不处理
-        //        if (CollUtil.isEmpty(dto.getDatas())) {
-        //            return true;
-        //        }
+
+         //检查是否在主数据里
+           if (CollUtil.isNotEmpty(dto.getDatas())) {
+               CheckEBomException.checkMaterialNoInMain(dto.getDatas());
+           }
+        //构建操作数据
         EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_MDM.getValue());
         dto.setOpType(EbomEditStatusEnum.HANDLER_FINISHED.getValue());
         eBomEdit.handleBom(dto);
 
+        //子级的异常码包含不能提交
         List<Integer> checkStatus = CollectionUtil.toList(new Integer[]{
                 EBomExceptionStatusEnum.EXCEPT_NO_2.getValue(),
                 EBomExceptionStatusEnum.EXCEPT_NO_3.getValue(),