From cea4e4e9c6dad4d4f1b04b750ffca73cc252b22f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 10:23:00 +0800
Subject: [PATCH] 生产工单流转卡去掉logo,增加产品单位

---
 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index b8b2bc4..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;
 
@@ -22,14 +19,26 @@
     @Excel(name = "鏂欏彿")
     private String materialCode;
 
-    @Excel(name = "搴撳瓨鏁伴噺")
-    private BigDecimal qualitity;
+    @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 lockedQuantity;
+    @Excel(name = "鍚堟牸鍐荤粨鏁伴噺")
+    private BigDecimal qualifiedLockedQuantity;
+
+    @Excel(name = "涓嶅悎鏍煎喕缁撴暟閲�")
+    private BigDecimal unQualifiedLockedQuantity;
 
     @Excel(name = "澶囨敞")
     private String remark;
@@ -39,4 +48,5 @@
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 //    private LocalDateTime updateTime;
 
+
 }

--
Gitblit v1.9.3