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, "项目类型需要用户确认") ; 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 d5e225e5..68099466 100644 Binary files a/nflg_project_dev/nflg-bom-new/src/main/resources/template/importDataTemplate.xlsx and b/nflg_project_dev/nflg-bom-new/src/main/resources/template/importDataTemplate.xlsx differ