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

优化判断

This commit is contained in:
曹鹏飞 2024-03-15 14:01:58 +08:00
parent eeb2e3fc3c
commit d769eb7de3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,8 +598,6 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
if (CollUtil.isNotEmpty(convert.getResultChild())) {
originalChildService.saveOrUpdateBatch(convert.getResultChild());
}
}else{
errResult.add(new ImportOriginalBomVO(data.getChartNo(),"没有子节点，不导入"));
}
errResult.addAll(convert.getImportErrorResult());
}
@ -616,7 +614,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
if (data.getChartNo().equals("无")) {
data.setChartNo("");
}
if (data.getMaterialNo().equals("无")) {
if (data.getMaterialNo()!=null && "无".contentEquals(StrUtil.trim(data.getMaterialNo()))) {
data.setMaterialNo("");
}
rowNum.set(rowNum.get() + 1);