From 274dd8b724dd4485658e1d2a3f825a007f625bd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 七月 2026 09:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
index 03349b3..8552e20 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
@@ -81,6 +81,22 @@
     @ExcelProperty("鍦ㄥ簱鏁伴噺")
     private BigDecimal quantity;
 
+    @Schema(description = "鍐荤粨鏁伴噺", example = "10.0000")
+    @ExcelProperty("鍐荤粨鏁伴噺")
+    private BigDecimal frozenQuantity;
+
+    @Schema(description = "鍗犵敤閲忥紙宸插垎閰嶅緟鍑哄簱锛�", example = "20.0000")
+    @ExcelProperty("鍗犵敤閲�")
+    private BigDecimal reservedQuantity;
+
+    @Schema(description = "鍦ㄩ�旈噺锛堣皟鎷ㄥ湪閫旓級", example = "5.0000")
+    @ExcelProperty("鍦ㄩ�旈噺")
+    private BigDecimal inTransitQuantity;
+
+    @Schema(description = "鍙敤閲忥紙鍦ㄥ簱鏁伴噺 - 鍐荤粨鏁伴噺 - 鍗犵敤閲忥級", example = "70.0000")
+    @ExcelProperty("鍙敤閲�")
+    private BigDecimal availableQuantity;
+
     @Schema(description = "鍏ュ簱鏃堕棿")
     @ExcelProperty("鍏ュ簱鏃堕棿")
     private LocalDateTime receiptTime;

--
Gitblit v1.9.3