From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index eaebcdb..20965c5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -363,9 +363,12 @@
private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
- purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
+ // 鏄庣粏鐨� totalPrice 鏄�屾暟閲� 脳 鍚◣鍗曚环銆嶏紝鍗冲惈绋庢�讳环锛涗笉鍚◣閲戦 = 鍚◣鎬讳环 鈭� 绋庨
+ BigDecimal totalPriceWithTax = getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO);
+ BigDecimal totalTaxPrice = getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO);
+ purchaseRequest.setTotalTaxPrice(totalTaxPrice);
+ purchaseRequest.setTotalPrice(totalPriceWithTax);
+ purchaseRequest.setTotalProductPrice(totalPriceWithTax.subtract(totalTaxPrice));
// 璁＄畻浼樻儬浠锋牸
if (purchaseRequest.getDiscountPercent() == null) {
purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
@@ -377,10 +380,9 @@
private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
if (item.getProductPrice() != null && item.getCount() != null) {
+ // 浜у搧鍗曚环涓哄惈绋庡崟浠凤細琛屾�讳环 = 鏁伴噺 脳 鍚◣鍗曚环锛岀◣棰濆啀浠庡惈绋庢�讳环閲屽�掔畻
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
- if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
- }
+ item.setTaxPrice(MoneyUtils.priceCalculateTaxIncluded(item.getTotalPrice(), item.getTaxPercent()));
}
}));
}
--
Gitblit v1.9.3