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

比较数量调整

This commit is contained in:
BF-202309241046\Administrator 2024-06-29 20:49:49 +08:00
parent 79630893c6
commit 5d713f84dd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,10 @@ public class CompareReportService {
} }
//比较数量 //比较数量
if (!ObjectUtil.equal(from.getNum(), to.getNum())) { if(ObjectUtil.isNull(from.getNum()) || ObjectUtil.isNull(to.getNum())){
continue;
}
if ( from.getNum().compareTo(to.getNum()) !=0) {
compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue()); compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue());
continue; continue;
} }
@ -329,7 +332,7 @@ public class CompareReportService {
} else { } else {
//比较单位 //比较单位
if (!ObjectUtil.equal(from.getMaterialUnit(), to.getMaterialUnit())) { if (!ObjectUtil.equal(from.getMaterialUnit().toUpperCase(), to.getMaterialUnit().toUpperCase())) {
compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue()); compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue());
continue; continue;
} }