From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新
---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 4d6540c..a4e073c 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,8 +1,9 @@
package com.ruoyi.stock.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+
+import java.math.BigDecimal;
@Data
@@ -15,12 +16,20 @@
* 浜у搧瑙勬牸
*/
private String model;
- /**
- * 浜у搧鍗曚綅
- */
- private String unit;
private String timeStr;
private String createBy;
+
+ //鐜板瓨閲�
+ private String currentStock;
+
+ //鐜板噣閲�
+ private BigDecimal currentWeight;
+
+ //浜у搧绫诲瀷(0-鍘熸潗鏂�)
+ private Integer productType;
+
+ //浜у搧澶х被
+ private String parentName;
}
--
Gitblit v1.9.3