From 6d5ce70c3e2b536c8e4b74269be70029a57cb1cc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 15:36:32 +0800
Subject: [PATCH] feat(approve): 使用通用工具类优化审批流程ID生成逻辑
---
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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 86feed9..93249c1 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -7,9 +7,6 @@
@Data
public class StockInventoryExportData {
-
-
-
@Excel(name = "浜у搧鍚嶇О")
private String productName;
@@ -19,8 +16,29 @@
@Excel(name = "鍗曚綅")
private String unit;
- @Excel(name = "搴撳瓨鏁伴噺")
- private BigDecimal qualitity;
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
+
+ @Excel(name = "鍚堟牸搴撳瓨鎵瑰彿")
+ private String qualifiedBatchNo;
+
+ @Excel(name = "涓嶅悎鏍煎簱瀛樻壒鍙�")
+ private String unQualifiedBatchNo;
+
+ @Excel(name = "鍚堟牸搴撳瓨鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ @Excel(name = "涓嶅悎鏍煎簱瀛樻暟閲�")
+ private BigDecimal unQualifiedQuantity;
+
+ @Excel(name = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
+ @Excel(name = "鍚堟牸鍐荤粨鏁伴噺")
+ private BigDecimal qualifiedLockedQuantity;
+
+ @Excel(name = "涓嶅悎鏍煎喕缁撴暟閲�")
+ private BigDecimal unQualifiedLockedQuantity;
@Excel(name = "澶囨敞")
private String remark;
@@ -30,4 +48,5 @@
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// private LocalDateTime updateTime;
+
}
--
Gitblit v1.9.3