From 020b18afd4df30ef6c483e88a88a6c4863b4842d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sun, 6 Oct 2024 17:42:13 +0800 Subject: [PATCH] =?UTF-8?q?pbom-=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86,?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=98=E6=9B=B4-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java | 4 ++++ .../nflg/product/bomnew/service/BomNewPbomParentService.java | 2 +- .../com/nflg/product/bomnew/service/ForwardReportService.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java index 81c7e4d4..71c72567 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java @@ -33,6 +33,10 @@ public class UpdateLogVO { @ApiModelProperty(value = "数量") private BigDecimal num; + public BigDecimal getNum() { + return num!=null ?num.stripTrailingZeros():null; + } + @ApiModelProperty("单位") private String materialUnit; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index cd805fbd..a76bb7e5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -2060,7 +2060,7 @@ public class BomNewPbomParentService extends ServiceImpl child = allBom.stream().filter(u -> u.getRowId() != null && u.getRowId() > 0 && u.getExceptionStatus()>1).collect(Collectors.toList()); + List child = allBom.stream().filter(u -> u.getRowId() != null && u.getRowId() > 0).collect(Collectors.toList()); if (CollUtil.isNotEmpty(parents)) { List childList = new ArrayList<>(); child.forEach(k -> { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java index 232a685f..762e7333 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java @@ -507,7 +507,7 @@ public class ForwardReportService { for (String item: intersection) { UpdateLogVO oldEnt = oldBom.stream().filter(u -> u.getOrderNumber().equals(item)).findFirst().get(); UpdateLogVO newEnt = newBom.stream().filter(u -> u.getOrderNumber().equals(item)).findFirst().get(); - if(!oldEnt.getMaterialNo().equals(newEnt.getMaterialNo()) || ! oldEnt.getNum().equals(newEnt.getNum()) || oldEnt.getProjectType().equals(newEnt.getProjectType())){ + if(!oldEnt.getMaterialNo().equals(newEnt.getMaterialNo()) || !oldEnt.getNum().equals(newEnt.getNum()) || !oldEnt.getProjectType().equals(newEnt.getProjectType())){ result.add(oldEnt); newEnt.setOpType(BomConstant.UP); result.add(newEnt);