From 84ea802dfff6b89ef0b9fd402b4f67dd3bab1525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sat, 25 May 2024 14:38:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E6=B7=BB=E5=8A=A0=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/api/user/EbomApi.java    |  8 +++++++-
 .../bomnew/service/BomNewEbomParentService.java      | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
index 79ecbae0..6d225b67 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
@@ -13,6 +13,7 @@ import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.query.BomExceptionQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomMaterialQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery;
+import com.nflg.product.bomnew.pojo.query.QueryMaterialsQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
 import com.nflg.product.bomnew.service.*;
 import com.nflg.product.bomnew.util.EecExcelUtil;
@@ -20,7 +21,6 @@ import com.nflg.product.bomnew.util.VUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import nflg.product.common.constant.STATE;
-import nflg.product.common.dto.LoginUserInfoDTO;
 import nflg.product.common.vo.ResultVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -451,4 +451,10 @@ public class EbomApi extends BaseApi {
     public ResultVO<List<BomOriginalListVO>> getSource(@Valid @RequestParam("rowId") @NotNull Long rowId) {
         return ResultVO.success(bomNewEbomParentService.getSource(rowId));
     }
+
+    @PostMapping("queryMaterials")
+    @ApiOperation("批量查询物料信息")
+    public ResultVO<List<BaseMaterialVO>> queryMaterials(@Valid @RequestBody QueryMaterialsQuery query) {
+        return ResultVO.success(bomNewEbomParentService.queryMaterials(query));
+    }
 }
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 9acdd0ef..17d8b367 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
@@ -20,6 +20,7 @@ import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.*;
 import com.nflg.product.bomnew.mapper.master.BomNewEbomParentMapper;
+import com.nflg.product.bomnew.mapper.master.MaterialMainMapper;
 import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO;
@@ -27,6 +28,7 @@ import com.nflg.product.bomnew.pojo.entity.*;
 import com.nflg.product.bomnew.pojo.query.BomExceptionQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomMaterialQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery;
+import com.nflg.product.bomnew.pojo.query.QueryMaterialsQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
 import com.nflg.product.bomnew.service.domain.EBom.*;
 import com.nflg.product.bomnew.util.*;
@@ -2347,4 +2349,14 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         }
         return null;
     }
+
+    public List<BaseMaterialVO> queryMaterials(QueryMaterialsQuery query) {
+        if (query.getType() == 0) {
+            return SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(query.getKeys());
+        } else if (query.getType() == 1) {
+            return SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(query.getKeys());
+        } else {
+            throw new NflgBusinessException(STATE.BusinessError, "无效的类别");
+        }
+    }
 }