From 01436b7b9c7b97d4c46ab94fca4c0fc1de5601df 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, 13 May 2024 10:47:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E4=BB=8Eexcel=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9T=E9=A1=B9?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/EBomImportService.java     | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

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 42424027..fb3a98a5 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
@@ -3,6 +3,7 @@ package com.nflg.product.bomnew.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -194,13 +195,19 @@ public class EBomImportService {
         return isSame;
     }
 
-    private void handlerExcelRow(EbomExcelDTO dQbomExcelVO) {
+    private void handlerExcelRow(EbomExcelDTO dto) {
         rowNum.set(rowNum.get() + 1);
-        log.debug("ebom导入excel，第{}行，处理前：{}", rowNum.get(), JSON.toJSONString(dQbomExcelVO));
+        log.debug("ebom导入excel，第{}行，处理前：{}", rowNum.get(), JSON.toJSONString(dto));
 
-        dQbomExcelVO.setRowNum(rowNum.get());
+        dto.setRowNum(rowNum.get());
 
-        excelContextTL.get().add(dQbomExcelVO);
+        if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) {
+            String id = RandomUtil.randomNumbers(9);
+            dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);
+            dto.setDrawingNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);
+        }
+
+        excelContextTL.get().add(dto);
     }
 
     private List<OperationErrorMsgVO> checkExcel(List<EbomExcelDTO> datas) {
@@ -224,6 +231,16 @@ public class EBomImportService {
             );
         }
 
+        numError = datas.stream().filter(u -> StrUtil.equals(u.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)
+                        && StrUtil.isBlank(u.getMaterialDesc()))
+                .map(BaseImportExcelDTO::getRowNum)
+                .collect(Collectors.toList());
+        if (!numError.isEmpty()) {
+            errorMsg.addAll(numError.stream().map(n -> OperationErrorMsgVO.create("第" + n + "行", "T项目的物料描述为空"))
+                    .collect(Collectors.toList())
+            );
+        }
+
         numError = datas.stream().filter(u -> Objects.isNull(u.getNum()) || BigDecimal.ZERO.compareTo(u.getNum()) >= 0)
                 .map(BaseImportExcelDTO::getRowNum)
                 .collect(Collectors.toList());