From 771dbd46e99b0a5db639a9029bf401626699af85 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 28 三月 2026 13:54:10 +0800
Subject: [PATCH] Merge branch 'hxsj' of http://114.132.189.42:9002/r/product-inventory-management-after into hxsj
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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..9b7c280 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -40,6 +40,9 @@
@Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
+ @Excel(name = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
/**
* 寰呭嚭搴撴暟閲�
*/
@@ -53,6 +56,8 @@
// @Excel(name = "鍏ュ簱鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime createTime;
+
+ private String timeStr;
/**
* 鍑哄叆搴撴椂闂�
@@ -146,4 +151,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
+ /**
+ * 缂鸿揣鏁伴噺
+ */
+ private BigDecimal outStockQuantity;
+
+ /**
+ * 缂鸿揣鎯呭喌
+ */
+ private String shortageDescription;
+
}
--
Gitblit v1.9.3