From 520a715610bd67a6401e989ada8b1c43a312163b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 11 九月 2026 08:09:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 9f47fd6..2f2c4b0 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,29 +1,56 @@
package com.ruoyi.stock.dto;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
+import java.util.List;
@Data
+@ExcelIgnoreUnannotated
public class StockInRecordDto extends StockInRecord {
/**
* 浜у搧鍚嶇О
*/
+ @Excel(name = "浜у搧鍚嶇О")
private String productName;
/**
* 浜у搧瑙勬牸
*/
+ @Excel(name = "浜у搧瑙勬牸")
private String model;
+ /**
+ * 鎵规鍙�
+ */
+ @Excel(name = "鎵规鍙�")
+ private String batchNo;
+
/**
* 浜у搧鍗曚綅
*/
+ @Excel(name = "浜у搧鍗曚綅")
private String unit;
private String timeStr;
+ @Excel(name = "鍏ュ簱浜�")
private String createBy;
//鐜板瓨閲�
+ @Excel(name = "鐜板瓨閲�")
private String currentStock;
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+ private Long topParentProductId;
+
+ @Schema(description = "璁板綍ID鍒楄〃")
+ private List<Long> ids;
+
+ @Schema(description = "婧愬崟鍙�")
+ @Excel(name = "婧愬崟鍙�")
+ private String sourceOrderNo;
+
}
--
Gitblit v1.9.3