From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化

---
 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 8937fbb..128d708 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -1,6 +1,5 @@
 package com.ruoyi.stock.execl;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
 
@@ -8,17 +7,45 @@
 
 @Data
 public class StockInventoryExportData {
-
     @Excel(name = "浜у搧鍚嶇О")
-    private String model;
-
-    @Excel(name = "瑙勬牸")
     private String productName;
 
-    @Excel(name = "搴撳瓨鏁伴噺")
-    private BigDecimal qualitity;
+    @Excel(name = "鍨嬪彿")
+    private String model;
+
+    @Excel(name = "鍗曚綅")
+    private String unit;
+
+    @Excel(name = "鐗╂枡缂栫爜")
+    private String materialCode;
+
+    @Excel(name = "鎴愬搧绫诲埆")
+    private String processCategory;
+
+    @Excel(name = "鐢靛帇")
+    private String voltage;
+
+    @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;
-
 }

--
Gitblit v1.9.3