From 174c4a75e9dac46cf42399646bf49283583a43f5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 14:38:01 +0800
Subject: [PATCH] 增加废品库存列表和导出接口，以及修改发货逻辑
---
src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java
index 6f90ec4..3497905 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class StockUnInventoryExportData {
@@ -21,18 +22,23 @@
@Excel(name = "鎵瑰彿")
private String batchNo;
+
+ @Excel(name = "搴撳瓨绫诲瀷")
+ private String type;
+
@Excel(name = "搴撳瓨鏁伴噺")
private BigDecimal qualitity;
@Excel(name = "鍐荤粨鏁伴噺")
private BigDecimal lockedQuantity;
+ @Excel(name = "鍙敤鏁伴噺")
+ private BigDecimal unLockedQuantity;
+
@Excel(name = "澶囨敞")
private String remark;
-//
-// @Excel(name = "鏈�鏂版洿鏂版椂闂�")
-// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// private LocalDateTime updateTime;
+
+ @Excel(name = "鏈�鏂版洿鏂版椂闂�", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
}
--
Gitblit v1.9.3