From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面,新增一个编辑按钮,可以对已审核的订单进行单价修 改。 3.新增反审核按钮,对已审核的订单进行反审核,反审核之后会保存当前订 单的数据快照,便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
index b2db4f4..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,24 @@
// 寰呬粯娆鹃噾棰�
private BigDecimal unPaymentAmount;
+ // 浠樻閲戦
+ private BigDecimal paymentAmount;
+
+ // 搴斾粯閲戦
+ private BigDecimal payableAmount;
+
// 绋庣巼
- private BigDecimal taxRate;
+ private String taxRate;
+
+ // 鐧昏浜�
+ private String registrant;
+
+ private String searchText;
+
+ // 宸蹭粯娆炬�婚噾棰�
+ private BigDecimal paymentAmountTotal;
+
+ private String paymentDateStart;
+
+ private String paymentDateEnd;
}
--
Gitblit v1.9.3