From 126a634f94d8918c18a10a2996fc82c6b668f456 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 16:45:30 +0800
Subject: [PATCH] feat: 导入历史未发货、已发货销售台账数据

---
 src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
index a036f29..9da043b 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
@@ -1,11 +1,14 @@
 package com.ruoyi.purchase.dto;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.purchase.pojo.PaymentRegistration;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class PaymentRegistrationDto extends PaymentRegistration {
 
     // 鏌ヨ鍒楄〃鏌ヨ鐢ㄤ緵搴斿晢鍙峰拰鍚堝悓鍙�
@@ -15,9 +18,11 @@
     private String salesContractNo;
 
     // 閲囪喘鍚堝悓鍙�
+    @Excel(name = "閲囪喘鍚堝悓鍙�")
     private String purchaseContractNumber;
 
     // 渚涘簲鍟嗗悕绉�
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
     // 鍙戠エ鍙�
@@ -29,6 +34,12 @@
     // 寰呬粯娆鹃噾棰�
     private BigDecimal unPaymentAmount;
 
+    // 浠樻閲戦
+    private BigDecimal paymentAmount;
+
+    // 搴斾粯閲戦
+    private BigDecimal payableAmount;
+
     // 绋庣巼
     private String taxRate;
 
@@ -36,4 +47,11 @@
     private String registrant;
 
     private String searchText;
+
+    // 宸蹭粯娆炬�婚噾棰�
+    private BigDecimal paymentAmountTotal;
+
+    private String paymentDateStart;
+
+    private String paymentDateEnd;
 }

--
Gitblit v1.9.3