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/controller/admin/sale/ErpSaleOrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index 3c92677..8e94ca1 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -319,15 +319,15 @@
/**
* 濉厖璁㈠崟椤圭殑閲戦瀛楁
*
- * DO 涓� totalPrice 涓轰骇鍝侀噾棰濓紙涓嶅惈绋庯級锛孯espVO 闇�瑕佽ˉ鍏細
- * - totalProductPrice锛氫骇鍝侀噾棰�
- * - totalPrice锛氬惈绋庨噾棰濓紙浜у搧閲戦 + 绋庨锛�
+ * DO 涓� totalPrice 涓哄惈绋庢�讳环锛堝崟浠� 脳 鏁伴噺锛夛紝RespVO 闇�瑕佽ˉ鍏細
+ * - totalProductPrice锛氫笉鍚◣閲戦锛堝惈绋庢�讳环 - 绋庨锛�
+ * - totalPrice锛氬惈绋庢�讳环锛堜繚鎸� DO 鍘熷�硷級
*/
private void fillItemPrice(ErpSaleOrderRespVO.Item item) {
- BigDecimal productAmount = item.getTotalPrice() != null ? item.getTotalPrice() : BigDecimal.ZERO;
+ BigDecimal totalPriceWithTax = item.getTotalPrice() != null ? item.getTotalPrice() : BigDecimal.ZERO;
BigDecimal tax = item.getTaxPrice() != null ? item.getTaxPrice() : BigDecimal.ZERO;
- item.setTotalProductPrice(productAmount);
- item.setTotalPrice(productAmount.add(tax));
+ item.setTotalProductPrice(totalPriceWithTax.subtract(tax));
+ item.setTotalPrice(totalPriceWithTax);
}
}
--
Gitblit v1.9.3