From 66e910032e4ef806749d958fa15cf3368d411ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 10 四月 2026 10:17:27 +0800
Subject: [PATCH] 仓库字段调整 导入调整

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

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index c3d17a1..06efa6f 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -1,36 +1,42 @@
 package com.ruoyi.stock.execl;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 public class StockInventoryExportData {
 
-    @Excel(name = "浜у搧鍚嶇О")
-    private String model;
+    @Excel(name ="浠撳簱缂栫爜")
+    private String warehouseCode;
+    @Excel(name ="浠撳簱")
+    private String warehouseName;
 
-    @Excel(name = "瑙勬牸")
+    @Excel(name = "瀛樿揣缂栫爜")
+    private String productCode;
+
+    @Excel(name = "瀛樿揣")
     private String productName;
 
-    @Excel(name = "鍗曚綅")
+    @Excel(name = "瑙勬牸鍨嬪彿")
+    private String model;
+
+    @Excel(name = "涓诲崟浣�")
     private String unit;
 
-    @Excel(name = "搴撳瓨鏁伴噺")
+    @Excel(name = "杈呭崟浣�")
+    private String subUnit;
+
+    @Excel(name = "鏁伴噺(涓诲崟浣�)")
     private BigDecimal qualitity;
 
-    @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 = "鏁伴噺(杈呭崟浣�)")
+    private BigDecimal subQualitity;
+//
+//    @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