From ba8c4630940311683e141f67e122e79c7f945d9c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 17:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseCheckInfo.java | 16 ++++++++-------- .../impl/PurchaseCheckInfoServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index 75db7091..76f72edf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -75,23 +75,23 @@ public class PurchaseCheckInfo extends BaseEntity { private Long purchaseMaNumber; /** - * 采购含税价格 + * 采购单价(不含税) */ - @ApiModelProperty(value = "采购含税价格--外层Table字段") - private BigDecimal purchaseTaxPrice; + @ApiModelProperty(value = "采购单价(不含税)--外层Table字段") + private BigDecimal purchasePrice; /** - * 采购不含税价格 + * 采购单价(含税) */ - @ApiModelProperty(value = "采购不含税价格--外层Table字段") - private BigDecimal purchasePrice; + @ApiModelProperty(value = "采购单价(含税)--外层Table字段") + private BigDecimal purchaseTaxPrice; /** * 税率 */ - @ApiModelProperty(value = "税率--Int整形 0~100") + @ApiModelProperty(value = "税率 0~100") @Size(max = 100, message = "税率长度必须介于 0 和 100 之间") - private Integer taxRate; + private BigDecimal taxRate; @ApiModelProperty(value = "操作人名称") private String createUserName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index cce05603..a9480ee6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -129,7 +129,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { // 通过不含税价格及税率，计算出含税价格并赋值 if (purchaseCheckInfo.getTaxRate() != null && purchaseCheckInfo.getPurchasePrice() != null) { purchaseCheckInfo.setPurchaseTaxPrice( - calculateTaxPrice(purchaseMaTotalPrice.get(), new BigDecimal(purchaseCheckInfo.getTaxRate())) + calculateTaxPrice(purchaseMaTotalPrice.get(), purchaseCheckInfo.getTaxRate()) ); } }