From 1bbfbb26d3ef0b91e06f3074a73bf9f22c3fcfc7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 28 九月 2026 23:29:35 +0800
Subject: [PATCH] fix(config): 统一日期格式为yyyy-MM-dd并更新数据库配置

---
 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 4b7553f..0f4661a 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -19,21 +19,31 @@
     @Excel(name = "鍗曚綅")
     private String unit;
 
-    @Excel(name = "搴撳瓨鏁伴噺")
-    private BigDecimal qualitity;
+    @Excel(name = "鎵瑰彿")
+    private String batchNo;
+
+
+    @Excel(name = "鍚堟牸搴撳瓨鏁伴噺")
+    private BigDecimal qualifiedQuantity;
+
+    @Excel(name = "涓嶅悎鏍煎簱瀛樻暟閲�")
+    private BigDecimal unQualifiedQuantity;
 
     @Excel(name = "棰勮鏁伴噺")
     private BigDecimal warnNum;
 
-    @Excel(name = "鍐荤粨鏁伴噺")
-    private BigDecimal lockedQuantity;
+    @Excel(name = "鍚堟牸鍐荤粨鏁伴噺")
+    private BigDecimal qualifiedLockedQuantity;
+
+    @Excel(name = "涓嶅悎鏍煎喕缁撴暟閲�")
+    private BigDecimal unQualifiedLockedQuantity;
 
     @Excel(name = "澶囨敞")
     private String remark;
 //
 //    @Excel(name = "鏈�鏂版洿鏂版椂闂�")
 //    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
 //    private LocalDateTime updateTime;
 
 }

--
Gitblit v1.9.3