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 | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 37b5efe..af3a299 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,12 +2,16 @@
import com.fasterxml.jackson.annotation.JsonFormat;
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 {
@@ -37,4 +41,39 @@
private BigDecimal totalStockIn;
private BigDecimal totalStockOut;
private BigDecimal currentStock;
+
+ private BigDecimal unLockedQuantity;
+
+ private Long parentId;
+
+ @ApiModelProperty("杩囩鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ 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