From 3841d6424d6cb9cfeb4221435c137628b9f7442d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 02 四月 2026 11:52:13 +0800
Subject: [PATCH] fix:1.采购/销售导入导出模板调整 2.采购/销售导入导出逻辑更改
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 3d5856f..183f4d5 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -3,16 +3,19 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
+@EqualsAndHashCode(callSuper = true)
@Data
public class StockInventoryDto extends StockInventory {
private String productName;
private String model;
+ private String uidNo;
private String unit;
@@ -38,5 +41,9 @@
private BigDecimal totalStockOut;
private BigDecimal currentStock;
- private String unLockedQuantity;
+ private BigDecimal unLockedQuantity;
+ private Long productId; // 浜у搧ID
+ private Long parentId; // 鐖剁骇浜у搧ID
+ private Long productModelId; // 浜у搧鍨嬪彿ID
+ private String productScope; //浜у搧绫诲瀷
}
--
Gitblit v1.9.3