From 729f300b0a22393014aba22e080b74da73920bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sun, 29 Sep 2024 18:16:31 +0800
Subject: [PATCH] =?UTF-8?q?pbom-=E5=BC=82=E5=B8=B8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=8F=AF=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/api/user/PBomApi.java | 15 ++++++++++-----
 .../bomnew/pojo/dto/PBomCheckExceptionDTO.java    |  4 +++-
 .../bomnew/service/BomNewPbomParentService.java   |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index e168378a..4e6f562a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
 import com.mzt.logapi.context.LogRecordContext;
 import com.mzt.logapi.starter.annotation.LogRecord;
 import com.nflg.product.base.core.api.BaseApi;
@@ -36,10 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -443,8 +441,15 @@ public class PBomApi extends BaseApi {
     @PostMapping("checkException")
     @ApiOperation("PBOM-数据异常检查")
     public ResultVO<Boolean> checkException(@RequestBody PBomCheckExceptionDTO checkExceptionDTO) {
+        VUtils.isTure(CollUtil.isEmpty(checkExceptionDTO.getBomRowIds())).throwMessage("请选择要检查的BOM");
+        List<BomNewPbomParentEntity> pBoms = bomNewPbomParentService.lambdaQuery().in(BomNewPbomParentEntity::getRowId, checkExceptionDTO.getBomRowIds()).list();
+        Set<Long> exitsBoms = pBoms.stream().map(u -> u.getRowId()).collect(Collectors.toSet());
+        Set<Long> noBomParams=  Sets.difference(Sets.newHashSet(checkExceptionDTO.getBomRowIds()) , exitsBoms);
+        VUtils.isTure(CollUtil.isNotEmpty(noBomParams)).throwMessage(StrUtil.join(",", noBomParams)+ "PBom版本不存在,请检查参数是否正确.");
 
-        bomNewPbomParentService.checkException(checkExceptionDTO.getBomRowId(),checkExceptionDTO.getPBomType());
+        for(Long rowId : checkExceptionDTO.getBomRowIds()) {
+            bomNewPbomParentService.checkException(rowId, checkExceptionDTO.getPBomType());
+        };
         return ResultVO.success(true);
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/PBomCheckExceptionDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/PBomCheckExceptionDTO.java
index 9a90a5a0..61b4f00e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/PBomCheckExceptionDTO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/PBomCheckExceptionDTO.java
@@ -3,11 +3,13 @@ package com.nflg.product.bomnew.pojo.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PBomCheckExceptionDTO {
 
     @ApiModelProperty("BOM版本ID")
-    private Long bomRowId;
+    private List<Long>  bomRowIds;
 
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 3a10eba2..19dcd66f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -2029,7 +2029,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
      */
     public void checkException(Long rowId,Integer bomType){
         BomNewPbomParentEntity parent = this.getById(rowId);
-        VUtils.isTure(parent==null).throwMessage("PBom不存在");
         List<BomNewPbomParentVO> allBom =new ArrayList<>();
         if(bomType==0){
             allBom=  this.getAllBom(rowId, 0);