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;