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 | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 d08ac09..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
@@ -108,7 +108,6 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇閿�鍞鍗曞鎵规祦绋嬪垪琛�")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(saleOrderService.getSaleOrderApproveProcessDefinitionList());
}
@@ -143,7 +142,6 @@
@GetMapping("/item/list-by-order-id")
@Operation(summary = "鏌ヨ閿�鍞鍗曠殑鐗╂枡鏄庣粏鍒楄〃锛堢敤浜庡彂璐ч�氱煡鍗曞垱寤猴級")
@Parameter(name = "orderId", description = "閿�鍞鍗曠紪鍙�", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<List<ErpSaleOrderItemRespVO>> getSaleOrderItemListByOrderId(@RequestParam("orderId") Long orderId) {
List<ErpSaleOrderItemDO> itemList = saleOrderService.getSaleOrderItemListByOrderId(orderId);
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
@@ -157,7 +155,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鍞鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<ErpSaleOrderRespVO> getSaleOrder(@RequestParam("id") Long id) {
ErpSaleOrderDO saleOrder = saleOrderService.getSaleOrder(id);
if (saleOrder == null) {
@@ -192,7 +189,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鍞鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<PageResult<ErpSaleOrderRespVO>> getSaleOrderPage(@Valid ErpSaleOrderPageReqVO pageReqVO) {
PageResult<ErpSaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
return success(buildSaleOrderVOPageResult(pageResult));
@@ -323,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