From 975fe5248cc1f3d999f4d660fc331570110c4968 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 13:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业

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

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java
index cf8d062..cc8d0b6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java
@@ -12,6 +12,9 @@
     @Schema(description = "浠撳簱缂栧彿")
     private Long warehouseId;
 
+    @Schema(description = "浠撳簱绫诲瀷锛�10鏆傚瓨搴擄紝20鍚堟牸搴擄紙鎸夌被鍨嬭繃婊や粨搴擄紝涓� warehouseId 浜岄�変竴锛�", example = "20")
+    private Integer warehouseType;
+
     @Schema(description = "搴撳尯缂栧彿")
     private Long locationId;
 
@@ -27,6 +30,12 @@
     @Schema(description = "鎵规鍙�")
     private String batchCode;
 
+    @Schema(description = "渚涘簲鍟嗙紪鍙�")
+    private Long vendorId;
+
+    @Schema(description = "搴撳瓨鐘舵�侊細10-鏆傚瓨搴擄紝20-鍚堟牸搴擄紝30-宸插嚭搴�")
+    private Integer stockState;
+
     @Schema(description = "寮�濮嬫椂闂达紙鍔ㄦ�佺洏鐐圭敤锛�")
     private LocalDateTime startTime;
 

--
Gitblit v1.9.3