From bb56ba1b0c194360cac56c304fffe2497625a9b3 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, 20 May 2024 09:58:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BC=98=E5=8C=96=E4=BB=8Eexcel?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/product/bomnew/api/user/EbomV2Api.java    | 3 +--
 .../com/nflg/product/bomnew/service/EBomImportService.java  | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java
index 906ef9cd..ff509b2c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java
@@ -76,8 +76,7 @@ public class EbomV2Api extends BaseApi {
     @ApiOperation("从excel导入数据")
     @PostMapping("importBom")
     @Transactional(rollbackFor = Exception.class)
-    @LogRecord(success = "原始BOM-导入：文件名：{{#fileNme}},操作结果:{{#_ret}}",
-            bizNo = "", type = "原始BOM导入")
+    @LogRecord(success = "EBOM-导入：文件名：{{#fileNme}},操作结果:{{#_ret}}", bizNo = "", type = "EBOM导入")
     public ResultVO<List<OperationErrorMsgVO>> importBom(@RequestParam(value = "file") MultipartFile file) throws Exception {
         if (file != null && !file.getOriginalFilename().endsWith("xls") && !file.getOriginalFilename().endsWith("xlsx")) {
             return ResultVO.error("请上传Excel文件");
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
index 2e777592..66301957 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
@@ -333,18 +333,22 @@ public class EBomImportService {
             String maxOrderNum = pcs.get(pcs.size() - 1).getOrderNumber();
             child.setOrderNumber(OrderNoUtil.next(maxOrderNum));
         }
+        child.setMaterialDesc(data.getMaterialDesc());
         BaseMaterialVO vo = materialBaseInfos.stream()
                 .filter(m -> m.getMaterialNo().equals(child.getMaterialNo()))
                 .findFirst()
                 .orElse(null);
         if (!Objects.isNull(vo)) {
             child.setMaterialCategoryCode(vo.getMaterialCategoryCode());
+            child.setMaterialName(vo.getMaterialName());
             child.setDrawingNo(vo.getDrawingNo());
             child.setUnitWeight(vo.getMaterialWeight());
             child.setMaterialUnit(vo.getMaterialUnit());
             child.setMaterialTexture(vo.getMaterialTexture());
+            if (StrUtil.isBlank(child.getMaterialDesc())) {
+                child.setMaterialDesc(vo.getMaterialDesc());
+            }
         }
-        child.setMaterialDesc(data.getMaterialDesc());
         child.setMaterialOriginalUnit(data.getUnit());
         child.setNum(data.getNum());
         child.setRemark(data.getRemark());