From b2859e20392f07094ec84166b83e6189665404c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 12 七月 2025 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index dcc8b06..02bc251 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -1,10 +1,13 @@
package com.ruoyi.purchase.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -116,4 +119,42 @@
* 浜у搧瑙勬牸id
*/
private Long productModelId;
+
+ /**
+ * 鍙戠エ鍙�
+ */
+ private String invoiceNumber;
+
+ /**
+ * 鍙戠エ閲戦锛堝厓锛�
+ */
+ private BigDecimal invoiceAmount;
+
+ /**
+ * 鏉ョエ鐧昏id
+ */
+ private Long ticketRegistrationId;
+
+ /**
+ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
+ */
+ private BigDecimal contractAmount = BigDecimal.ZERO;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("鏉ョエ閲戦")
+ private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @TableField(exist = false)
+ private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
+
+ @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @TableField(exist = false)
+ private Integer type;
+
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
}
--
Gitblit v1.9.3