feat: 打通销售采购财务闭环并完成累计业务优化

gaoluyang

3 天以前 d39e4f7d839167c16425086dfa2f8747bccfdff9

 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());