From 3f3a1ed182e96214e66f6456ee692427bf04d454 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 28 十一月 2025 11:10:23 +0800
Subject: [PATCH] yys 1.库存管理导出修改 2.来票登记分页查询修改
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 9ef5677..ce41cd3 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -24,10 +25,28 @@
@Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
+ private BigDecimal warnNum;
+
/**
* 鍚堝悓鍙�
*/
private String purchaseContractNumber;
+
+
+ /**
+ * 閿�鍞悎鍚屽彿
+ */
+ private String salesContractNo;
+
+ /**
+ * 瀹㈡埛鍚堝悓鍙�
+ */
+ private String customerContractNo;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customerName;
private String salesLedgerProductId;
@@ -42,8 +61,17 @@
*/
@Excel(name = "寰呭嚭搴撴暟閲�")
private BigDecimal inboundNum0;
+ /**
+ * 鍑哄簱鏁伴噺
+ */
+ @Excel(name = "鍑哄簱鏁伴噺")
+ private BigDecimal totalInboundNum;
-
+ /**
+ * 鏈�浣庡簱瀛樻暟閲�
+ */
+ @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+ private BigDecimal minStock;
/**
* 鍑哄叆搴撴椂闂�
*/
@@ -124,5 +152,35 @@
*/
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
+ /**
+ * 鎶ヨ〃鏃ユ姤
+ */
+ @Excel(name = "鎶ヨ〃鏃ユ姤")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate reportDate;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @Excel(name = "鎶ヨ〃鏈堟姤寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate startMonth;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @Excel(name = "鎶ヨ〃鏈堟姤缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate endMonth;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @Excel(name = "鎶ヨ〃浣滀笟寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate startDate;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @Excel(name = "鎶ヨ〃浣滀笟缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate endDate;
}
--
Gitblit v1.9.3