From 2ec6b477938b95608873feefa819c687d69c4a88 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 25 四月 2026 15:09:56 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

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

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 9cc1fe6..2be6512 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -43,31 +43,37 @@
 
     @Schema(description = "椤堕儴鐖朵骇鍝乮d")
     private Long topParentProductId;
-    
+
     @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
     private String stockType;
-    
+
     @Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
     private BigDecimal qualifiedQuantity;
-    
+
     @Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
     private BigDecimal unQualifiedQuantity;
-    
+
     @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
     private BigDecimal qualifiedLockedQuantity;
-    
+
     @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
     private BigDecimal unQualifiedLockedQuantity;
-    
+
     @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
     private BigDecimal qualifiedUnLockedQuantity;
-    
+
     @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
     private BigDecimal unQualifiedUnLockedQuantity;
-    
+
+    @Schema(description = "鍚堟牸搴撳瓨寰呭鏍稿嚭搴撴暟閲忥紙涓嶅崰鐢ㄥ簱瀛樹絾宸茬敵璇峰嚭搴擄級")
+    private BigDecimal qualifiedPendingOutQuantity;
+
+    @Schema(description = "涓嶅悎鏍煎簱瀛樺緟瀹℃牳鍑哄簱鏁伴噺")
+    private BigDecimal unQualifiedPendingOutQuantity;
+
     @Schema(description = "鍚堟牸搴撳瓨ID")
     private Long qualifiedId;
-    
+
     @Schema(description = "涓嶅悎鏍煎簱瀛業D")
     private Long unQualifiedId;
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3