diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs index e6acbfe..6fa4934 100644 --- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs @@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto /// public class MmInventoryQueryDto : PagerInfo { + public string WarehouseCode { get; set; } + public string MaterialCode { get; set; } + public string MaterialCode { get; set; } } /// diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs index 8f55bd6..12b6230 100644 --- a/DOAN.Service/MES/Material/MmInventoryService.cs +++ b/DOAN.Service/MES/Material/MmInventoryService.cs @@ -71,7 +71,8 @@ namespace DOAN.Service.BZFM /// private static Expressionable QueryExp(MmInventoryQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.WarehouseCode), m => m.WarehouseCode.Contains(parm.WarehouseCode)); return predicate; }