From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug
---
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 927442b..8a6528d 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -14,10 +14,18 @@
@Data
public class ReceiptPaymentDto extends ReceiptPayment {
+ @ApiModelProperty(value = "true:鏌ヨ瓒呰繃鍗佷簲澶╃殑鏈洖娆捐褰�")
+ private Boolean timeOut;
+
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
+
+ @ApiModelProperty(value = "鐘舵��")
+ @Excel(name = "鐘舵��")
+ private String statusName;
+
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
@@ -29,12 +37,17 @@
@ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
private Date invoiceDate;
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
+
@ApiModelProperty(value = "鏌ヨ鏂囨湰")
private String searchText;
@ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
@Excel(isExport = false)
- private Integer salesLedgerId;
+ private Long salesLedgerId;
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
--
Gitblit v1.9.3