From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示

---
 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 55742b0..af3a299 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -4,12 +4,14 @@
 import com.ruoyi.stock.pojo.StockInventory;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class StockInventoryDto extends StockInventory {
 
@@ -50,4 +52,28 @@
     private LocalDateTime weighingDate;
 
     private String  parentName;
+
+    @ApiModelProperty("鍑�閲�(鎬绘暟)")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("杞︾墝鍙�")
+    private String licensePlateNo;
+
+    @ApiModelProperty("姣涢噸")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("鐨噸")
+    private BigDecimal tareWeight;
+
+    @ApiModelProperty("杩囩鍛�")
+    private String weighingOperator;
+
+    @ApiModelProperty("纾呭崟鏂囦欢璺緞")
+    private String weighbridgeDocPath;
+
+    @ApiModelProperty("浜у搧绫诲瀷")
+    private Integer productType;
+
+    @ApiModelProperty("鐜板噣閲�(鍚�)")
+    private BigDecimal currentWeight;
 }

--
Gitblit v1.9.3