From 827f9fd4c2e9f5013f61536221bdf3f9782460d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 3 Jun 2024 15:42:19 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=88=E5=B9=B6=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/constant/EBomConstant.java | 2 ++ .../domain/OriginalBom/OriginalBomToEBomV2Convert.java | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java index 7f4bd581..7bfb0323 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java @@ -31,6 +31,8 @@ public class EBomConstant { public static final String PROJECT_TYPE_T="T"; + public static final String KG="KG"; + @AllArgsConstructor @Getter diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index 1bb0148c..abcc3c6b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -28,6 +28,7 @@ import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.VUtils; import com.nflg.product.bomnew.util.VersionUtil; import lombok.Getter; +import org.aspectj.weaver.ast.ITestVisitor; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -116,7 +117,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { BigDecimal totalWeightResult = BigDecimal.ZERO; List rowIds=new ArrayList<>(); for (BomOriginalListVO item : list1) { - numResult = NumberUtil.add(numResult, Objects.nonNull(item.getNum()) ? item.getNum() : BigDecimal.ZERO); + BigDecimal numNew=BigDecimal.ZERO; + if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){ + numNew= item.getTotalWeight(); + }else { + numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum()); + } +// numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO); + numResult = NumberUtil.add(numResult, numNew); totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight()); rowIds.add(item.getRowId()); }