From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 6a9b1e8..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.SalesLedgerFile;
+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;
@@ -17,6 +20,12 @@
* 閲囪喘鍚堝悓鍙�
*/
private String purchaseContractNumber;
+
+
+ /**
+ * 渚涘簲鍟嗗悕绉癷d
+ */
+ private Long supplierId;
/**
* 渚涘簲鍟嗗悕绉�
@@ -90,11 +99,62 @@
private List<String> tempFileIds;
- private List<SalesLedgerFile> SalesLedgerFiles;
+ private List<CommonFile> SalesLedgerFiles;
+ /**
+ * 涓氬姟鍛樻墜鏈哄彿
+ */
+ private String phoneNumber;
/**
* 涓氬姟鍛榠d
*/
private Long businessPersonId;
+ /**
+ * 浜у搧id
+ */
+ private Long productId;
+
+ /**
+ * 浜у搧瑙勬牸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