From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别,电压进行筛选 3.销售页面展示电压,类别 4.生产入库按照电压入库

---
 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 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..128d708 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -7,27 +7,45 @@
 
 @Data
 public class StockInventoryExportData {
-
-
-
     @Excel(name = "浜у搧鍚嶇О")
     private String productName;
 
-    @Excel(name = "瑙勬牸")
+    @Excel(name = "鍨嬪彿")
     private String model;
 
     @Excel(name = "鍗曚綅")
     private String unit;
 
-    @Excel(name = "搴撳瓨鏁伴噺")
-    private BigDecimal qualitity;
+    @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;
-//
-//    @Excel(name = "鏈�鏂版洿鏂版椂闂�")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private LocalDateTime updateTime;
-
 }

--
Gitblit v1.9.3