From 26da8f93be85271e61bf6206a6c78215d4933e61 Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 15 Aug 2024 17:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B4=9F=E6=95=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/EBomImportService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 8d923d12..86fbbaed 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -308,13 +308,13 @@ public class EBomImportService { .collect(Collectors.toList()) ); } - //2024.8.15 BigDecimal.ZERO.compareTo(u.getNum()) >= 0 取消负数限制 - numError = datas.stream().filter(u -> Objects.isNull(u.getNum())) + + numError = datas.stream().filter(u -> Objects.isNull(u.getNum()) || BigDecimal.ZERO.compareTo(u.getNum()) == 0) .map(BaseImportExcelDTO::getRowNum) .collect(Collectors.toList()); if (!numError.isEmpty()) { - errorMsg.addAll(numError.stream().map(n -> OperationErrorMsgVO.create("第" + n + "行", "数量不正确")) + errorMsg.addAll(numError.stream().map(n -> OperationErrorMsgVO.create("第" + n + "行", "数量不正确(不能为空或0)")) .collect(Collectors.toList()) ); }