From 0dc234ff71def86be8824a70a5be3c4a284f4ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 18 Jun 2024 15:35:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E4=BF=AE=E5=A4=8D=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=A3=80=E6=9F=A5=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E6=A3=80=E6=9F=A5=E6=A0=B9=E8=8A=82=E7=82=B9=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=A1=B9=E7=9B=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java       | 18 +++++++++++++-----
 .../domain/EBom/CheckEBomException.java        | 11 ++++++++++-
 2 files changed, 23 insertions(+), 6 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 0785aff4..0b38ee77 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
@@ -678,7 +678,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * @param bomRowId bom行ID
      */
     public void initBomException(Long bomRowId) throws ExecutionException, InterruptedException {
-        CheckEBomException checkEBomException = new CheckEBomException(bomRowId);
+        CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null);
         checkEBomException.initException();
 
         //保存异常
@@ -686,7 +686,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     }
 
     public void initBomException(Long bomRowId, List<Integer> ignoreCheckException) throws ExecutionException, InterruptedException {
-        CheckEBomException checkEBomException = new CheckEBomException(bomRowId);
+        CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null);
         checkEBomException.initException(ignoreCheckException);
 
         //保存异常
@@ -731,7 +731,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * 检查 并保存异常信息
      */
     public void checkAndSaveEBomException(Long bomRowId) throws ExecutionException, InterruptedException {
-        CheckEBomException checkEBomException = new CheckEBomException(bomRowId);
+        CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null);
         checkEBomException.initException();
 
         //保存异常
@@ -756,7 +756,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      */
     public void batchCheckAndSaveEBomException(List<Long> bomRowIds) {
         for (Long bomRowId : bomRowIds) {
-            CheckEBomException checkEBomException = new CheckEBomException(bomRowId);
+            CheckEBomException checkEBomException = new CheckEBomException(bomRowId, null);
             checkEBomException.initException();
 
             //保存异常
@@ -765,6 +765,14 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
     }
 
+    public void checkAndSaveEBomException(Long bomRowId, Long childRowId) {
+        CheckEBomException checkEBomException = new CheckEBomException(bomRowId, childRowId);
+        checkEBomException.initException();
+
+        //保存异常
+        saveException(checkEBomException);
+    }
+
     public void checkAndInitVirtualPackageEnum(VirtualPackageParamDto paramDto, BomNewEbomParentEntity root) {
         if (root.getVirtrualPackageEnum() <= 0) {
             if (root.getMaterialNo().startsWith("31")) {
@@ -2381,7 +2389,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             BomExceptionQuery bom = query.get(index);
             BomExceptionVO vo = new BomExceptionVO();
             if (index == 0) {
-                batchCheckAndSaveEBomException(Collections.singletonList(bom.getBomRowId()));
+                checkAndSaveEBomException(bom.getBomRowId(), bom.getRowId());
 
                 BomNewEbomParentEntity parent = getById(bom.getBomRowId());
                 vo.setMaterialNo(parent.getMaterialNo());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
index 3c150253..2a925bde 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
@@ -9,9 +9,11 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.*;
+import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
+import com.nflg.product.bomnew.service.BomNewEbomChildService;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
 import com.nflg.product.bomnew.service.MaterialMainService;
 import com.nflg.product.bomnew.util.*;
@@ -52,7 +54,7 @@ public class CheckEBomException {
     }
 
 
-    public CheckEBomException(Long bomRowId) {
+    public CheckEBomException(Long bomRowId, Long childRowId) {
 
         allBomDetail = SpringUtil.getBean(BomNewEbomParentService.class).getBomTree(bomRowId, true);
         //只检查待复核和自己的
@@ -65,6 +67,13 @@ public class CheckEBomException {
         convert.setBomRowId(convert.getRowId());
         convert.setParentRowId(0L);
         convert.setLevelNumber(BigDecimal.ZERO);
+        if (Objects.nonNull(childRowId) && childRowId > 0) {
+            BomNewEbomChildEntity c = SpringUtil.getBean(BomNewEbomChildService.class).getById(childRowId);
+            if (Objects.nonNull(c)) {
+                convert.setProjectType(c.getProjectType());
+                convert.setNum(c.getNum());
+            }
+        }
         allBomDetail.add(convert);
         checkWaring=true;