rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

This commit is contained in:
jing's 2023-12-15 09:49:42 +08:00
parent 3a7c945643
commit 33fbf9e706
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
View File

@ -97,6 +97,8 @@ public class OptionalEbomApi extends BaseApi {
} }
catch (NflgBusinessException ex){ catch (NflgBusinessException ex){
return ResultVO.error(ex.getState(),ex.getMsg()); return ResultVO.error(ex.getState(),ex.getMsg());
}catch (Exception e){
return ResultVO.error(STATE.SystemErr,"出现异常，联系管理员");
} }
} }

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
View File

@ -45,7 +45,7 @@ public class ExportDeviceHelper {
.writerSheet("EBOM导出")//指定写入的sheet .writerSheet("EBOM导出")//指定写入的sheet
.needHead(false)//是否需要head .needHead(false)//是否需要head
.build(); .build();
buildHeader(2, voObj.getDeviceInfo(), sheet, writer, tableNoCounting); buildHeader(3, voObj.getDeviceInfo(), sheet, writer, tableNoCounting);
buildList(voObj.getSingleList(), sheet, writer, tableNoCounting); buildList(voObj.getSingleList(), sheet, writer, tableNoCounting);
writer.finish(); writer.finish();
@ -141,7 +141,7 @@ public class ExportDeviceHelper {
} }
public class HeaderStyleCustomCellWriteHandler extends AbstractCellWriteHandler { public class HeaderStyleCustomCellWriteHandler implements CellWriteHandler {
@Override @Override
public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {

20
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
View File

@ -167,8 +167,6 @@ public class OptionalExcelService {
} }
optionalEbomImportDTO.getChild().add(optionalEbomImportL2); optionalEbomImportDTO.getChild().add(optionalEbomImportL2);
parsecColumn3(v, optionalEbomImportL2); parsecColumn3(v, optionalEbomImportL2);
}); });
@ -177,7 +175,7 @@ public class OptionalExcelService {
private OptionalEbomImportExcelDTO parsecColumn1(List<ImportExcelField> list) { private OptionalEbomImportExcelDTO parsecColumn1(List<ImportExcelField> list) {
OptionalEbomImportExcelDTO optionalEbomInportExcelDTO = new OptionalEbomImportExcelDTO(); OptionalEbomImportExcelDTO optionalEbomInportExcelDTO = new OptionalEbomImportExcelDTO();
int row = 2;
ImportExcelField device = list.get(0); ImportExcelField device = list.get(0);
if(StrUtil.isEmpty(device.getCellFirst())){ if(StrUtil.isEmpty(device.getCellFirst())){
@ -204,7 +202,7 @@ public class OptionalExcelService {
String name = ""; String name = "";
//相同类 //相同类
List<ImportExcelField> classList = new ArrayList<>(); List<ImportExcelField> classList = new ArrayList<>();
int row = 2;
for (; row < list.size(); row++) { for (; row < list.size(); row++) {
ImportExcelField rowField = list.get(row); ImportExcelField rowField = list.get(row);
@ -227,16 +225,14 @@ public class OptionalExcelService {
String finalName = name; String finalName = name;
//黄色根部选项解析 //黄色根部选项解析
int optionParentPos=finalName.indexOf(" "); int optionParentPos=finalName.indexOf(" ");
if(optionParentPos<0){
throw new NflgBusinessException(STATE.Error,StrUtil.format("选项格式错误未使用空格分隔，{}",finalName));
}
OptionalEbomImportDTO optionalEbomImportL1 = new OptionalEbomImportDTO(); OptionalEbomImportDTO optionalEbomImportL1 = new OptionalEbomImportDTO();
optionalEbomImportL1.setOptionDrawingNo(StrUtil.sub(finalName,0,optionParentPos)); optionalEbomImportL1.setOptionDrawingNo(StrUtil.sub(finalName,0,optionParentPos));
optionalEbomImportL1.setOptionName(StrUtil.subSuf(finalName,optionParentPos+1)); optionalEbomImportL1.setOptionName(StrUtil.subSuf(finalName,optionParentPos+1));
if (CollectionUtil.isEmpty(optionalEbomInportExcelDTO.getOptionInfo())) { if (CollectionUtil.isEmpty(optionalEbomInportExcelDTO.getOptionInfo())) {
optionalEbomInportExcelDTO.setOptionInfo(new ArrayList<OptionalEbomImportDTO>()); optionalEbomInportExcelDTO.setOptionInfo(new ArrayList<OptionalEbomImportDTO>());
} }
@ -340,11 +336,11 @@ public class OptionalExcelService {
List<OptionalEbomImportChildDTO> listChild = item1.getChild(); List<OptionalEbomImportChildDTO> listChild = item1.getChild();
for (OptionalEbomImportChildDTO item2 : listChild) { for (OptionalEbomImportChildDTO item2 : listChild) {
if (item2.getError() == OptionalBomConstant.ExcelErrorTagEnum.REPEAT.getValue()) { 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()) { } 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()) { } 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()));
} }
} }