From d6d428777b9e2b67f8ce02d3b585a6d6cc685548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Fri, 13 Mar 2026 22:20:45 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=A7=BB=E4=BD=8D=E6=96=B0=E5=A2=9E=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialInventory/repository/todo/MaterialInventoryDO.java | 3 +++
 .../interfaces/dto/materialInventory/MaterialInventoryDTO.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
index 55ae816b8..4472c28b9 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
@@ -102,6 +102,9 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     @Excel(name = "容器编码")
     private String containerCode;
 
+    @ApiModelProperty("容器号或批次号（PDA单输入框模糊查询，优先于 batchNumber/containerCode 单独传参）")
+    private String containerOrBatch;
+
     @ApiModelProperty("容器类型 数据字典")
     @Excel(name = "容器类型 数据字典")
     private String containerType;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
index 0dfc6f23c..0ed4a3c85 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
@@ -98,6 +98,9 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
     @Excel(name = "容器编码")
     private String containerCode;
 
+    @ApiModelProperty("容器号或批次号（PDA单输入框模糊查询，优先于 batchNumber/containerCode 单独传参）")
+    private String containerOrBatch;
+
     @ApiModelProperty("容器类型 数据字典")
     @Excel(name = "容器类型 数据字典")
     private String containerType;