From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
index 4d70b76..e4a070c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
@@ -16,6 +16,7 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
+import cn.iocoder.yudao.module.erp.enums.finance.ErpFinancePaymentSourceTypeEnum;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.erp.service.finance.ErpFinancePaymentService;
@@ -88,7 +89,6 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇浠樻鍗曞鎵规祦绋嬪垪琛�")
- @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(financePaymentService.getFinancePaymentApproveProcessDefinitionList());
}
@@ -105,7 +105,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱浠樻鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')")
public CommonResult<ErpFinancePaymentRespVO> getFinancePayment(@RequestParam("id") Long id) {
ErpFinancePaymentDO payment = financePaymentService.getFinancePayment(id);
if (payment == null) {
@@ -127,13 +126,13 @@
ErpPurchaseInvoiceRespVO invoiceFinal = invoiceVO;
return BeanUtils.toBean(payment, ErpFinancePaymentRespVO.class, financePaymentVO ->
financePaymentVO.setInvoice(invoiceFinal)
+ .setSourceTypeName(resolveSourceTypeName(payment.getSourceType()))
.setItems(BeanUtils.toBean(paymentItemList, ErpFinancePaymentRespVO.Item.class))
.setAttachmentList(storageAttachmentApi.listAttachments("erp_finance_payment", payment.getId())));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱浠樻鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')")
public CommonResult<PageResult<ErpFinancePaymentRespVO>> getFinancePaymentPage(@Valid ErpFinancePaymentPageReqVO pageReqVO) {
PageResult<ErpFinancePaymentDO> pageResult = financePaymentService.getFinancePaymentPage(pageReqVO);
return success(buildFinancePaymentVOPageResult(pageResult));
@@ -149,6 +148,11 @@
List<ErpFinancePaymentRespVO> list = buildFinancePaymentVOPageResult(financePaymentService.getFinancePaymentPage(pageReqVO)).getList();
// 瀵煎嚭 Excel
ExcelUtils.write(response, "浠樻鍗�.xls", "鏁版嵁", ErpFinancePaymentRespVO.class, list);
+ }
+
+ private String resolveSourceTypeName(Integer sourceType) {
+ ErpFinancePaymentSourceTypeEnum sourceTypeEnum = ErpFinancePaymentSourceTypeEnum.valueOf(sourceType);
+ return sourceTypeEnum != null ? sourceTypeEnum.getName() : null;
}
private PageResult<ErpFinancePaymentRespVO> buildFinancePaymentVOPageResult(PageResult<ErpFinancePaymentDO> pageResult) {
@@ -172,6 +176,7 @@
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpFinancePaymentRespVO.class, payment -> {
payment.setItems(BeanUtils.toBean(financePaymentItemMap.get(payment.getId()), ErpFinancePaymentRespVO.Item.class));
+ payment.setSourceTypeName(resolveSourceTypeName(payment.getSourceType()));
MapUtils.findAndThen(supplierMap, payment.getSupplierId(), supplier -> payment.setSupplierName(supplier.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(payment.getCreator()), user -> payment.setCreatorName(user.getNickname()));
MapUtils.findAndThen(userMap, payment.getFinanceUserId(), user -> payment.setFinanceUserName(user.getNickname()));
--
Gitblit v1.9.3