From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java
index 05b1e68..8964ba8 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java
@@ -44,6 +44,15 @@
@ExcelProperty("寮�绁ㄩ噾棰�")
private BigDecimal price;
+ @Schema(description = "鍚堝悓閲戦")
+ private BigDecimal contractAmount;
+ @Schema(description = "棰勪粯娆鹃噾棰�")
+ private BigDecimal prepaymentAmount;
+ @Schema(description = "鍒拌揣娆鹃噾棰�")
+ private BigDecimal deliveryAmount;
+ @Schema(description = "楠屾敹娆鹃噾棰�")
+ private BigDecimal acceptanceAmount;
+
@Schema(description = "寮�绁ㄦ棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-02-02")
@ExcelProperty("寮�绁ㄦ棩鏈�")
private LocalDateTime invoiceTime;
@@ -57,6 +66,10 @@
@Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("鍚堝悓缂栧彿")
private Long contractId;
+ @Schema(description = "鍏宠仈閿�鍞鍗�")
+ private Long saleOrderId;
+ @Schema(description = "鍏宠仈鍑哄簱鍗�")
+ private Long saleOutId;
@Schema(description = "鍚堝悓淇℃伅")
private CrmContractRespVO contract;
@@ -85,6 +98,12 @@
@Schema(description = "鍙戠エ闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
+ @Schema(description = "鏄惁宸蹭笂浼犲彂绁ㄩ檮浠�", example = "true")
+ private Boolean hasAttachment;
+
+ @Schema(description = "鍓╀綑鍙洖娆鹃噾棰濓紝绛変簬 寮�绁ㄩ噾棰� - 璇ュ紑绁ㄥ凡鍥炴閲戦锛堣崏绋�+瀹℃壒涓�+瀹℃壒閫氳繃锛�", example = "1000.00")
+ private BigDecimal remainingInvoicePrice;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.9.3