From 65d2410369591a9128acd4832b362e673772f409 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 10 十一月 2025 15:17:31 +0800
Subject: [PATCH] yys 优化仓储物流整体逻辑
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 387a8b5..8e253da 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -22,15 +22,35 @@
private Long createUser;
/**
+ * 鍏ュ簱绫诲瀷 1-閲囪喘 2-鐢熶骇
+ */
+ private Integer type;
+
+ /**
* 鍏ュ簱鎵规
*/
@Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
/**
- * 鍚堝悓鍙�
+ * 閲囪喘鍚堝悓鍙�
*/
private String purchaseContractNumber;
+
+ /**
+ * 閿�鍞悎鍚屽彿
+ */
+ private String salesContractNo;
+
+ /**
+ * 瀹㈡埛鍚堝悓鍙�
+ */
+ private String customerContractNo;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customerName;
private String salesLedgerProductId;
@@ -39,6 +59,9 @@
*/
@Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
+
+ @Excel(name = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
/**
* 寰呭嚭搴撴暟閲�
@@ -54,6 +77,8 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime createTime;
+ private String timeStr;
+
/**
* 鍑哄叆搴撴椂闂�
*/
--
Gitblit v1.9.3