From e3488681d13686f57b8700e19fc4a5eafd1c0db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 27 May 2024 08:39:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(dqbom):=20=E6=96=B0=E5=A2=9E=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8D=95=E4=B8=AA=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=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/DQBomApi.java  | 11 +++++++++++
 .../nflg/product/bomnew/service/DQBomService.java   | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
index 26144656..aa3acb8d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
@@ -259,4 +259,15 @@ public class DQBomApi extends BaseApi {
     public ResultVO<List<QueryMaterialsVO>> queryMaterials(@Valid @RequestBody @NotEmpty List<QueryMaterialsQuery> query) {
         return ResultVO.success(dQBomService.queryMaterials(query));
     }
+
+    /**
+     * 查询物料信息
+     * @param query 查询条件
+     * @return
+     */
+    @PostMapping("queryMaterial")
+    @ApiOperation("查询物料信息")
+    public ResultVO<QueryMaterialsVO> queryMaterial(@Valid @RequestBody @NotEmpty QueryMaterialsQuery query) {
+        return ResultVO.success(dQBomService.queryMaterial(query));
+    }
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
index a9f69cce..7ac05094 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
@@ -685,4 +685,17 @@ public class DQBomService {
         }
         return Convert.toList(QueryMaterialsVO.class, datas);
     }
+
+    public QueryMaterialsVO queryMaterial(QueryMaterialsQuery query) {
+        List<BaseMaterialVO> vos = null;
+        if (StrUtil.isNotBlank(query.getMaterialNo())) {
+            vos = SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(Collections.singletonList(query.getMaterialNo()));
+        } else if (StrUtil.isNotBlank(query.getDrawingNo())) {
+            vos = SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(Collections.singletonList(query.getDrawingNo()));
+        }
+        if (CollUtil.isNotEmpty(vos)) {
+            return Convert.convert(QueryMaterialsVO.class, vos.get(0));
+        }
+        return null;
+    }
 }