From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 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..c3d901e 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
@@ -46,6 +46,12 @@
@ExcelProperty("鎵规鍙�")
private String batchCode;
+ @Schema(description = "褰撳墠琚嬬爜鏁伴噺", example = "10")
+ private Long bagCount;
+
+ @Schema(description = "鏄惁瀛樺湪琚嬬爜鏄庣粏", example = "true")
+ private Boolean bagDetailSupported;
+
@Schema(description = "浠撳簱缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long warehouseId;
@@ -81,10 +87,30 @@
@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;
+ @Schema(description = "搴撳瓨鐘舵�侊細10-鏆傚瓨搴擄紝20-鍚堟牸搴擄紝30-宸插嚭搴�", example = "20")
+ @ExcelProperty("搴撳瓨鐘舵��")
+ private Integer stockState;
+
@Schema(description = "鏄惁鍐荤粨", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
@ExcelProperty("鏄惁鍐荤粨")
private Boolean frozen;
--
Gitblit v1.9.3