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-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
index 4fc8668..2700294 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
@@ -10,14 +10,17 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceEntryReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceImportExcelVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceImportRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoicePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceRespVO;
+import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceSaleOutRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceSaveReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.invoice.CrmInvoiceDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
@@ -93,6 +96,24 @@
return success(true);
}
+ @PutMapping("/entry")
+ @Operation(summary = "寮�绁ㄧ敵璇峰綍鍏ュ彂绁�", description = "寮�绁ㄧ敵璇峰鎵归�氳繃鍚庯紝褰曞叆鐪熷疄鍙戠エ鍙风爜銆佸紑绁ㄦ棩鏈熴�侀檮浠讹紝骞跺～鍐欐敹娆捐妭鐐�")
+ @PreAuthorize("@ss.hasPermission('crm:invoice:update')")
+ public CommonResult<Boolean> entryInvoice(@Valid @RequestBody CrmInvoiceEntryReqVO entryReqVO) {
+ invoiceService.entryInvoice(entryReqVO);
+ return success(true);
+ }
+
+ @GetMapping("/sale-out-list")
+ @Operation(summary = "鑾峰緱寮�绁ㄥ彲閫夌殑閿�鍞嚭搴撳崟", description = "鎸夐攢鍞鍗曟煡璇� MES 宸插畬鎴愬嚭搴撳崟锛岃繑鍥炲凡寮�绁ㄩ噾棰濅笌鍓╀綑鍙紑绁ㄩ噾棰�")
+ @Parameter(name = "saleOrderId", description = "閿�鍞鍗曠紪鍙�", required = true)
+ @Parameter(name = "id", description = "寮�绁ㄥ崟缂栧彿锛堢紪杈戞椂浼犻�掞紝鐢ㄤ簬鎺掗櫎鑷韩宸插崰鐢ㄩ噾棰濓級")
+ public CommonResult<List<CrmInvoiceSaleOutRespVO>> getSaleOutListForInvoice(
+ @RequestParam("saleOrderId") Long saleOrderId,
+ @RequestParam(value = "id", required = false) Long id) {
+ return success(invoiceService.getSaleOutListForInvoice(saleOrderId, id));
+ }
+
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎寮�绁�")
@Parameter(name = "id", description = "缂栧彿", required = true)
@@ -114,7 +135,26 @@
if (invoice == null) {
return null;
}
- return buildInvoiceDetailList(Collections.singletonList(invoice)).get(0);
+ CrmInvoiceRespVO invoiceVO = buildInvoiceDetailList(Collections.singletonList(invoice)).get(0);
+ // 璇︽儏椤佃ˉ鍏呮敹娆捐妭鐐癸紙鍒楄〃椤典笉杩斿洖锛岄伩鍏� N+1 鏌ヨ锛�
+ List<CrmReceivablePlanDO> plans = invoiceService.getPaymentNodeListByInvoiceId(invoice.getId());
+ if (CollUtil.isNotEmpty(plans)) {
+ List<CrmInvoiceRespVO.PaymentNode> nodes = new ArrayList<>(plans.size());
+ for (CrmReceivablePlanDO plan : plans) {
+ CrmInvoiceRespVO.PaymentNode node = new CrmInvoiceRespVO.PaymentNode();
+ node.setId(plan.getId());
+ node.setStage(plan.getStage());
+ node.setAmount(plan.getPrice());
+ node.setReturnTime(plan.getReturnTime());
+ node.setActualTime(plan.getActualTime());
+ node.setReceiptedPrice(plan.getReceiptedPrice());
+ node.setStatus(plan.getStatus());
+ node.setRemark(plan.getRemark());
+ nodes.add(node);
+ }
+ invoiceVO.setPaymentNodes(nodes);
+ }
+ return invoiceVO;
}
@GetMapping("/page")
@@ -231,8 +271,9 @@
if (CollUtil.isEmpty(invoices)) {
return success(Collections.emptyList());
}
- // 杩囨护锛氬凡涓婁紶鍙戠エ闄勪欢
- invoices.removeIf(invoice -> CollUtil.isEmpty(storageAttachmentApi.listAttachments(
+ // 杩囨护锛氬繀椤绘槸宸插綍鍏ュ彂绁紙entryStatus=10锛夛紱鍘嗗彶鏁版嵁鏃犲綍鍏ョ姸鎬佹椂锛屼互鏄惁瀛樺湪鍙戠エ闄勪欢鍏滃簳
+ invoices.removeIf(invoice -> !Integer.valueOf(10).equals(invoice.getEntryStatus())
+ && CollUtil.isEmpty(storageAttachmentApi.listAttachments(
StorageRecordTypeEnum.CRM_INVOICE.getType(), invoice.getId())));
if (CollUtil.isEmpty(invoices)) {
return success(Collections.emptyList());
--
Gitblit v1.9.3