From 7486f6d6a93d98f96f45f0cc4846be9c8a2345df Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 15:39:20 +0800
Subject: [PATCH] 增加废品库详情接口
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 31a4188..446b931 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +15,7 @@
private String productName;
private String model;
private String unit;
+ private String batchNo;
//鍏ュ簱绫诲瀷
@@ -41,33 +42,66 @@
private BigDecimal unLockedQuantity;
- @ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
private Long topParentProductId;
-
- @ApiModelProperty("搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
+
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
private String stockType;
-
- @ApiModelProperty("鍚堟牸搴撳瓨鏁伴噺")
+
+ @Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
private BigDecimal qualifiedQuantity;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樻暟閲�")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
private BigDecimal unQualifiedQuantity;
-
- @ApiModelProperty("鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
+
+ @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
private BigDecimal qualifiedLockedQuantity;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
private BigDecimal unQualifiedLockedQuantity;
-
- @ApiModelProperty("鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
+
+ @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
private BigDecimal qualifiedUnLockedQuantity;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
private BigDecimal unQualifiedUnLockedQuantity;
-
- @ApiModelProperty("鍚堟牸搴撳瓨ID")
+
+ @Schema(description = "鍚堟牸搴撳瓨寰呭鏍稿嚭搴撴暟閲忥紙涓嶅崰鐢ㄥ簱瀛樹絾宸茬敵璇峰嚭搴擄級")
+ private BigDecimal qualifiedPendingOutQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺緟瀹℃牳鍑哄簱鏁伴噺")
+ private BigDecimal unQualifiedPendingOutQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨ID")
private Long qualifiedId;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛業D")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛業D")
private Long unQualifiedId;
-}
\ No newline at end of file
+
+ @Schema(description = "浜у搧id")
+ private Long productId;
+
+ @Schema(description = "鍚堟牸搴撳瓨鏉ユ簮")
+ private String qualifiedSource;
+
+ @Schema(description = "鍚堟牸搴撳瓨鏉ユ簮鏂囨湰")
+ private String qualifiedSourceText;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻潵婧�")
+ private String unQualifiedSource;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻潵婧愭枃鏈�")
+ private String unQualifiedSourceText;
+
+ @Schema(description = "鏄惁鍚按")
+ private Boolean isContainsWater;
+
+ @Schema(description = "鍚按閲�")
+ private BigDecimal waterContent;
+
+ @Schema(description = "鐞嗚鍏ュ簱鏁伴噺")
+ private BigDecimal theoryStockInNum;
+
+ @Schema(description = "宸锛堢悊璁哄叆搴撴暟閲�-瀹為檯鍏ュ簱鏁伴噺锛�")
+ private BigDecimal differenceNum;
+}
--
Gitblit v1.9.3