From 2d08411025cdae7a21c9b3e9da556516cb6a5071 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 18 Dec 2023 15:33:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8F=8A=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/aggreg/OptionalExcelService.java  |  19 +++++++++---------
 .../template/importDataTemplate.xlsx          | Bin 10761 -> 10727 bytes
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
index 726e2754..6a15c714 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
@@ -77,16 +77,15 @@ public class OptionalExcelService {
 
             String materialDesc = item.getCellSecond().trim();
             //替换统一格式
-            materialDesc = materialDesc.replace(":", "：");
+           // materialDesc = materialDesc.replace(":", "：");
+            int optionChildPos=materialDesc.indexOf(" ");
 
-
-            if (!materialDesc.contains("：")) {
-                throw new NflgBusinessException(STATE.Error, StrUtil.format("第{}行，格式错误，物料数据未使用：或:分隔，{}", item.getLineNo(), item.getCellSecond()));
+            if(optionChildPos<0){
+                throw  new NflgBusinessException(STATE.Error,StrUtil.format("第{}行，格式错误，选项使用空格分隔图号和名称 {}",item.getLineNo(), item.getCellSecond()));
             }
 
-
-            levelDto3.setDrawingNo(StrUtil.sub(materialDesc, 0, materialDesc.indexOf("：")));
-            String materialName = StrUtil.subSuf(materialDesc, materialDesc.indexOf("：") + 1);
+            levelDto3.setDrawingNo(StrUtil.sub(materialDesc, 0, optionChildPos));
+            String materialName = StrUtil.subSuf(materialDesc, optionChildPos + 1);
 
 //            if (StrUtil.isEmpty(levelDto3.getDrawingNo())) {
 //                throw new NflgBusinessException(STATE.Error, StrUtil.format("第{}行，格式错误，解析后不包含物料图号", item.getLineNo(), item.getCellSecond()));
@@ -146,7 +145,7 @@ public class OptionalExcelService {
             int optionChildPos=k.indexOf(" ");
 
             if(optionChildPos<0){
-                throw  new NflgBusinessException(STATE.Error,StrUtil.format("第{}行，格式错误，选项使用空格分隔名称和图号",v.get(0).getLineNo()));
+                throw  new NflgBusinessException(STATE.Error,StrUtil.format("第{}行，格式错误，选项使用空格分隔图号和名称",v.get(0).getLineNo()));
             }
             OptionalEbomImportDTO optionalEbomImportL2 = new OptionalEbomImportDTO();
 
@@ -319,9 +318,9 @@ public class OptionalExcelService {
             throw new NflgBusinessException(STATE.Error, hintMsg);
         }
 
-   // return  true;
+   //  return  true;
         //保存db
-    return batchExcelToRepertory(optionalEbomInportExcelDTO);
+   return batchExcelToRepertory(optionalEbomInportExcelDTO);
     }
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/template/importDataTemplate.xlsx b/nflg_project_dev/nflg-bom-new/src/main/resources/template/importDataTemplate.xlsx
index d5e225e548060011bf1326ad22484dd890ac3244..6809946632cc537745519fd43a2bc74b8e8b7425 100644
GIT binary patch
delta 4501
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

delta 4535
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
ZDGn*LTX-;sB-#+Xor4uifbDO=e*gn7d8z;a


From c42b94c04dc84c959bf2f3a9e1d500d4f01feaa7 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 18 Dec 2023 16:11:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/constant/EBomExceptionStatusEnum.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomExceptionStatusEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomExceptionStatusEnum.java
index c75ac3e5..3d304745 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomExceptionStatusEnum.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomExceptionStatusEnum.java
@@ -33,7 +33,7 @@ public enum  EBomExceptionStatusEnum {
     EXCEPT_NO_10(10, "项目赋值异常(当父级物料的项目类型为F时，子级中不能存在项目类型为F的物料)"),
     EXCEPT_NO_11(11, "未填写变更原因和技术通知单"),
     EXCEPT_NO_12(12, "数量需要用户确认"),
-    EXCEPT_NO_13(12, "项目类型需要用户确认")    ;
+    EXCEPT_NO_13(13, "项目类型需要用户确认")    ;