From 5d713f84dd644afec3d87bf3787343ec06a9efbf Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Sat, 29 Jun 2024 20:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=BE=83=E6=95=B0=E9=87=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/CompareReportService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java index 3c002ec4..b9ca16f1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java @@ -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()); continue; } @@ -329,7 +332,7 @@ public class CompareReportService { } else { //比较单位 - if (!ObjectUtil.equal(from.getMaterialUnit(), to.getMaterialUnit())) { + if (!ObjectUtil.equal(from.getMaterialUnit().toUpperCase(), to.getMaterialUnit().toUpperCase())) { compareReportVO.setSymbol(ReportConstant.SymbolEnum.NON_EQ.getValue()); continue; }