bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购接口优化

This commit is contained in:
sxu 2024-11-05 17:38:49 +08:00
parent c2eb7afc08
commit ba8c463094
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
View File

@ -75,23 +75,23 @@ public class PurchaseCheckInfo extends BaseEntity {
private Long purchaseMaNumber; private Long purchaseMaNumber;
/** /**
* 采购含税价格 * 采购单价(不含税)
*/ */
@ApiModelProperty(value = "采购含税价格--外层Table字段") @ApiModelProperty(value = "采购单价(不含税)--外层Table字段")
private BigDecimal purchaseTaxPrice; private BigDecimal purchasePrice;
/** /**
* 采购不含税价格 * 采购单价(含税)
*/ */
@ApiModelProperty(value = "采购不含税价格--外层Table字段") @ApiModelProperty(value = "采购单价(含税)--外层Table字段")
private BigDecimal purchasePrice; private BigDecimal purchaseTaxPrice;
/** /**
* 税率 * 税率
*/ */
@ApiModelProperty(value = "税率--Int整形 0~100") @ApiModelProperty(value = "税率 0~100")
@Size(max = 100, message = "税率长度必须介于 0 和 100 之间") @Size(max = 100, message = "税率长度必须介于 0 和 100 之间")
private Integer taxRate; private BigDecimal taxRate;
@ApiModelProperty(value = "操作人名称") @ApiModelProperty(value = "操作人名称")
private String createUserName; private String createUserName;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -129,7 +129,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
// 通过不含税价格及税率，计算出含税价格并赋值 // 通过不含税价格及税率，计算出含税价格并赋值
if (purchaseCheckInfo.getTaxRate() != null && purchaseCheckInfo.getPurchasePrice() != null) { if (purchaseCheckInfo.getTaxRate() != null && purchaseCheckInfo.getPurchasePrice() != null) {
purchaseCheckInfo.setPurchaseTaxPrice( purchaseCheckInfo.setPurchaseTaxPrice(
calculateTaxPrice(purchaseMaTotalPrice.get(), new BigDecimal(purchaseCheckInfo.getTaxRate())) calculateTaxPrice(purchaseMaTotalPrice.get(), purchaseCheckInfo.getTaxRate())
); );
} }
} }