From 542ceb23c19d0c53c4bdb04a3a83cbff58e4e301 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Mon, 2 Sep 2024 17:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7=E3=80=91=E5=88=B6?=
 =?UTF-8?q?=E4=BD=9C=E7=89=A9=E6=96=99=E8=8B=B1=E6=96=87=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MaterialExcelService.java         | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
index 5f9904ad..2c490305 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
@@ -248,7 +248,11 @@ public class MaterialExcelService {
         List<MaterialCategoryEntity> cate22Ents = materialCategoryService.lambdaQuery()
                 .eq(MaterialCategoryEntity::getRelCategoryCode, MaterialRelCategoryCodeEnum.relCategoryCode_22.getRelCategoryCode()).select(MaterialCategoryEntity::getCategoryCode).list();
         List<String> cate22List = cate22Ents.stream().map(MaterialCategoryEntity::getCategoryCode).collect(Collectors.toList());
+        StringBuilder materialDescEnMsgBuilder = new StringBuilder();
+        boolean materialDescEnPass = true;
+        int counter = 1; // 第一行是表头
         for (MaterialSelfExcelDTO excelEnt : datas) {
+            counter++;
             if (StringUtils.isNotEmpty(excelEnt.getMaterialType())) {
                 MaterialMainGetTypeEnum materialMainGetTypeEnum = MaterialMainGetTypeEnum.findCodeByDescription(excelEnt.getMaterialType());
                 if (materialMainGetTypeEnum == null) {
@@ -297,8 +301,21 @@ public class MaterialExcelService {
                         excelEnt.setMaterialDescEn("Assembly before Shipment");
                     }
                 }
+                if (!"201301".equals(excelEnt.getMaterialCategoryCode()) && ObjectUtil.isEmpty(excelEnt.getMaterialDescEn())) {
+                    materialDescEnMsgBuilder.append("第");
+                    materialDescEnMsgBuilder.append(counter);
+                    materialDescEnMsgBuilder.append("行名称为“");
+                    materialDescEnMsgBuilder.append(excelEnt.getMaterialName());
+                    materialDescEnMsgBuilder.append("“");
+                    materialDescEnPass = false;
+                }
             }
         }
+        // 检查英文描述不能为空
+        if (!materialDescEnPass) {
+            materialDescEnMsgBuilder.append("的物料命名不规范(未匹配到英文描述)");
+            throw new NflgBusinessException(STATE.ParamErr, materialDescEnMsgBuilder.toString());
+        }
 
         //检查图号不能重复
         List<String> drawingNoList = datas.stream().map(MaterialSelfExcelDTO::getDrawingNo).collect(Collectors.toList());
@@ -317,14 +334,6 @@ public class MaterialExcelService {
             List<String> descDbExites = dbExitstDesc.stream().map(MaterialMainEntity::getMaterialDesc).collect(Collectors.toList());
             throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", descDbExites).concat("图号+名称在数据库中已存在"));
         }
-        // 检查英文描述不能为空
-        List<MaterialSelfExcelDTO> emptyMaterialDescEnList = datas.stream()
-                .filter(item -> !"201301".equals(item.getMaterialCategoryCode()) && ObjectUtil.isEmpty(item.getMaterialDescEn()))
-                .collect(Collectors.toList());
-        if (CollUtil.isNotEmpty(emptyMaterialDescEnList)) {
-            List<String> emptyDescEnList = emptyMaterialDescEnList.stream().map(MaterialSelfExcelDTO::getMaterialName).collect(Collectors.toList());
-            throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", emptyDescEnList).concat("未匹配到英文描述"));
-        }
         List<MaterialMainEntity> result = Convert.convert(new TypeReference<List<MaterialMainEntity>>() {
         }, datas);