diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index 31ba319e..45c27330 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java @@ -97,6 +97,8 @@ public class OptionalEbomApi extends BaseApi { } catch (NflgBusinessException ex){ return ResultVO.error(ex.getState(),ex.getMsg()); + }catch (Exception e){ + return ResultVO.error(STATE.SystemErr,"出现异常,联系管理员"); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java index 63aff154..1845e5ba 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java @@ -45,7 +45,7 @@ public class ExportDeviceHelper { .writerSheet("EBOM导出")//指定写入的sheet .needHead(false)//是否需要head .build(); - buildHeader(2, voObj.getDeviceInfo(), sheet, writer, tableNoCounting); + buildHeader(3, voObj.getDeviceInfo(), sheet, writer, tableNoCounting); buildList(voObj.getSingleList(), sheet, writer, tableNoCounting); writer.finish(); @@ -141,7 +141,7 @@ public class ExportDeviceHelper { } - public class HeaderStyleCustomCellWriteHandler extends AbstractCellWriteHandler { + public class HeaderStyleCustomCellWriteHandler implements CellWriteHandler { @Override public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { 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 7ceccd0f..73795197 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 @@ -167,8 +167,6 @@ public class OptionalExcelService { } optionalEbomImportDTO.getChild().add(optionalEbomImportL2); - - parsecColumn3(v, optionalEbomImportL2); }); @@ -177,7 +175,7 @@ public class OptionalExcelService { private OptionalEbomImportExcelDTO parsecColumn1(List list) { OptionalEbomImportExcelDTO optionalEbomInportExcelDTO = new OptionalEbomImportExcelDTO(); - int row = 2; + ImportExcelField device = list.get(0); if(StrUtil.isEmpty(device.getCellFirst())){ @@ -204,7 +202,7 @@ public class OptionalExcelService { String name = ""; //相同类 List classList = new ArrayList<>(); - + int row = 2; for (; row < list.size(); row++) { ImportExcelField rowField = list.get(row); @@ -227,16 +225,14 @@ public class OptionalExcelService { String finalName = name; //黄色根部选项解析 int optionParentPos=finalName.indexOf(" "); - if(optionParentPos<0){ - throw new NflgBusinessException(STATE.Error,StrUtil.format("选项格式错误未使用空格分隔,{}",finalName)); - } - - OptionalEbomImportDTO optionalEbomImportL1 = new OptionalEbomImportDTO(); optionalEbomImportL1.setOptionDrawingNo(StrUtil.sub(finalName,0,optionParentPos)); optionalEbomImportL1.setOptionName(StrUtil.subSuf(finalName,optionParentPos+1)); + + + if (CollectionUtil.isEmpty(optionalEbomInportExcelDTO.getOptionInfo())) { optionalEbomInportExcelDTO.setOptionInfo(new ArrayList()); } @@ -340,11 +336,11 @@ public class OptionalExcelService { List listChild = item1.getChild(); for (OptionalEbomImportChildDTO item2 : listChild) { if (item2.getError() == OptionalBomConstant.ExcelErrorTagEnum.REPEAT.getValue()) { - title.append(String.format("第%d行 %s ", item2.getLineNo(), OptionalBomConstant.ExcelErrorTagEnum.REPEAT.getDescription())); + title.append(String.format("第%d行 %s ,", item2.getLineNo(), OptionalBomConstant.ExcelErrorTagEnum.REPEAT.getDescription())); } else if (item2.getError() == OptionalBomConstant.ExcelErrorTagEnum.MATERIA_NO_UNKOWN.getValue()) { - title.append(String.format("第%d行 %s ", item2.getLineNo(), OptionalBomConstant.ExcelErrorTagEnum.MATERIA_NO_UNKOWN.getDescription())); + title.append(String.format("第%d行 %s ,", item2.getLineNo(), OptionalBomConstant.ExcelErrorTagEnum.MATERIA_NO_UNKOWN.getDescription())); } else if (item2.getError() == OptionalBomConstant.ExcelErrorTagEnum.ALL.getValue()) { - title.append(String.format("第%d行 %s ", item2.getLineNo(), OptionalBomConstant.ExcelErrorTagEnum.ALL.getDescription())); + title.append(String.format("第%d行 %s ,", item2.getLineNo(), OptionalBomConstant.ExcelErrorTagEnum.ALL.getDescription())); } }