调整模版格式及解析
This commit is contained in:
parent
0df472a26b
commit
2d08411025
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue