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 | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 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 5001490..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
@@ -12,13 +12,15 @@
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentSaveReqVO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceRespVO;
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.ErpSupplierDO;
-import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+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;
-import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
+import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -40,6 +42,7 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - ERP 浠樻鍗�")
@RestController
@@ -50,9 +53,9 @@
@Resource
private ErpFinancePaymentService financePaymentService;
@Resource
- private ErpSupplierService supplierService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
- private ErpAccountService accountService;
+ private ErpPurchaseInvoiceService invoiceService;
@Resource
private AdminUserApi adminUserApi;
@@ -74,13 +77,20 @@
return success(true);
}
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊浠樻鍗曠殑鐘舵��")
- @PreAuthorize("@ss.hasPermission('erp:finance-payment:update-status')")
- public CommonResult<Boolean> updateFinancePaymentStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- financePaymentService.updateFinancePaymentStatus(id, status);
+ @PostMapping("/submit")
+ @Operation(summary = "鎻愪氦浠樻鍗曞鎵�")
+ @PreAuthorize("@ss.hasPermission('erp:finance-payment:update')")
+ public CommonResult<Boolean> submitFinancePayment(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ Long userId = getLoginUserId();
+ financePaymentService.submitFinancePayment(id, processDefinitionKey, userId);
return success(true);
+ }
+
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇浠樻鍗曞鎵规祦绋嬪垪琛�")
+ public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
+ return success(financePaymentService.getFinancePaymentApproveProcessDefinitionList());
}
@DeleteMapping("/delete")
@@ -95,21 +105,34 @@
@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) {
return success(null);
}
List<ErpFinancePaymentItemDO> paymentItemList = financePaymentService.getFinancePaymentItemListByPaymentId(id);
- return success(BeanUtils.toBean(payment, ErpFinancePaymentRespVO.class, financePaymentVO ->
- financePaymentVO.setItems(BeanUtils.toBean(paymentItemList, ErpFinancePaymentRespVO.Item.class))
- .setAttachmentList(storageAttachmentApi.listAttachments("erp_finance_payment", id))));
+ return success(buildFinancePaymentVO(payment, paymentItemList));
+ }
+
+ private ErpFinancePaymentRespVO buildFinancePaymentVO(ErpFinancePaymentDO payment,
+ List<ErpFinancePaymentItemDO> paymentItemList) {
+ ErpPurchaseInvoiceRespVO invoiceVO = null;
+ if (payment.getInvoiceId() != null) {
+ ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(payment.getInvoiceId());
+ if (invoice != null) {
+ invoiceVO = BeanUtils.toBean(invoice, ErpPurchaseInvoiceRespVO.class);
+ }
+ }
+ 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));
@@ -127,6 +150,11 @@
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) {
if (CollUtil.isEmpty(pageResult.getList())) {
return PageResult.empty(pageResult.getTotal());
@@ -136,21 +164,24 @@
convertSet(pageResult.getList(), ErpFinancePaymentDO::getId));
Map<Long, List<ErpFinancePaymentItemDO>> financePaymentItemMap = convertMultiMap(paymentItemList, ErpFinancePaymentItemDO::getPaymentId);
// 1.2 渚涘簲鍟嗕俊鎭�
- Map<Long, ErpSupplierDO> supplierMap = supplierService.getSupplierMap(
- convertSet(pageResult.getList(), ErpFinancePaymentDO::getSupplierId));
- // 1.3 缁撶畻璐︽埛淇℃伅
- Map<Long, ErpAccountDO> accountMap = accountService.getAccountMap(
- convertSet(pageResult.getList(), ErpFinancePaymentDO::getAccountId));
- // 1.4 绠＄悊鍛樹俊鎭�
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(pageResult.getList(), ErpFinancePaymentDO::getSupplierId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ // 1.3 绠＄悊鍛樹俊鎭�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(),
contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getFinanceUserId())));
+ // 1.4 鏉ョエ淇℃伅
+ Map<Long, ErpPurchaseInvoiceDO> invoiceMap = invoiceService.getPurchaseInvoiceMap(
+ convertSet(pageResult.getList(), ErpFinancePaymentDO::getInvoiceId));
// 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(accountMap, payment.getAccountId(), account -> payment.setAccountName(account.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(payment.getCreator()), user -> payment.setCreatorName(user.getNickname()));
MapUtils.findAndThen(userMap, payment.getFinanceUserId(), user -> payment.setFinanceUserName(user.getNickname()));
+ MapUtils.findAndThen(invoiceMap, payment.getInvoiceId(), invoice ->
+ payment.setInvoice(BeanUtils.toBean(invoice, ErpPurchaseInvoiceRespVO.class)));
});
}
--
Gitblit v1.9.3