diff --git a/DOAN.Model/MES/Material/Dto/MmLocationDto.cs b/DOAN.Model/MES/Material/Dto/MmLocationDto.cs
index e681e31..00c3a91 100644
--- a/DOAN.Model/MES/Material/Dto/MmLocationDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmLocationDto.cs
@@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmLocationQueryDto : PagerInfo 
     {
+        public string LocationCode { get; set; }
+
+        public string WarehouseCode { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
index f255b40..12845a1 100644
--- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
@@ -6,6 +6,11 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmRecordInboundQueryDto : PagerInfo 
     {
+        public string SupplierCode { get; set; }
+
+        public string Operator { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
index 96ad96f..587ea98 100644
--- a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
@@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmRecordOutboundQueryDto : PagerInfo 
     {
+        public string MaterialCode { get; set; }
+
+        public string OutboundNo { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Model/MES/Material/Dto/MmTransactionTypeDto.cs b/DOAN.Model/MES/Material/Dto/MmTransactionTypeDto.cs
index 000944e..a96e3b9 100644
--- a/DOAN.Model/MES/Material/Dto/MmTransactionTypeDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmTransactionTypeDto.cs
@@ -6,6 +6,9 @@ namespace DOAN.Model.BZFM.Dto
     /// </summary>
     public class MmTransactionTypeQueryDto : PagerInfo 
     {
+        public string TypeName { get; set; }
+
+        public string TransactionDirection { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/Material/MmLocationService.cs b/DOAN.Service/MES/Material/MmLocationService.cs
index 40afcfc..e6d05ca 100644
--- a/DOAN.Service/MES/Material/MmLocationService.cs
+++ b/DOAN.Service/MES/Material/MmLocationService.cs
@@ -71,7 +71,9 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         private static Expressionable<MmLocation> QueryExp(MmLocationQueryDto parm)
         {
-            var predicate = Expressionable.Create<MmLocation>();
+            var predicate = Expressionable.Create<MmLocation>()
+                .AndIF(!string.IsNullOrEmpty(parm.LocationCode), it => it.LocationCode.Contains(parm.LocationCode))
+                .AndIF(!string.IsNullOrEmpty(parm.WarehouseCode), it => it.WarehouseCode.Contains(parm.WarehouseCode));
 
             return predicate;
         }
diff --git a/DOAN.Service/MES/Material/MmRecordInboundService.cs b/DOAN.Service/MES/Material/MmRecordInboundService.cs
index 9febd2a..9aa2b05 100644
--- a/DOAN.Service/MES/Material/MmRecordInboundService.cs
+++ b/DOAN.Service/MES/Material/MmRecordInboundService.cs
@@ -1,9 +1,10 @@
-using Infrastructure.Attribute;
-using Infrastructure.Extensions;
-using DOAN.Model.BZFM.Dto;
 using DOAN.Model.BZFM;
+using DOAN.Model.BZFM.Dto;
 using DOAN.Repository;
 using DOAN.Service.BZFM.IBZFMService;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using Microsoft.IdentityModel.Tokens;
 
 namespace DOAN.Service.BZFM
 {
@@ -71,7 +72,11 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         private static Expressionable<MmRecordInbound> QueryExp(MmRecordInboundQueryDto parm)
         {
-            var predicate = Expressionable.Create<MmRecordInbound>();
+            var predicate = Expressionable.Create<MmRecordInbound>()
+                .AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode))
+                .AndIF(!string.IsNullOrEmpty(parm.Operator), it => it.Operator.Contains(parm.Operator))
+                //.AndIF(!string.IsNullOrEmpty(parm.CreatedTime), it => it.CreatedTime.Contains(parm.CreatedTime))
+                ;
 
             return predicate;
         }
diff --git a/DOAN.Service/MES/Material/MmRecordOutboundService.cs b/DOAN.Service/MES/Material/MmRecordOutboundService.cs
index d50291d..f7fe524 100644
--- a/DOAN.Service/MES/Material/MmRecordOutboundService.cs
+++ b/DOAN.Service/MES/Material/MmRecordOutboundService.cs
@@ -71,7 +71,10 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         private static Expressionable<MmRecordOutbound> QueryExp(MmRecordOutboundQueryDto parm)
         {
-            var predicate = Expressionable.Create<MmRecordOutbound>();
+            var predicate = Expressionable.Create<MmRecordOutbound>()
+                .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
+                .AndIF(!string.IsNullOrEmpty(parm.OutboundNo), it => it.OutboundNo.Contains(parm.OutboundNo))
+                ;
 
             return predicate;
         }
diff --git a/DOAN.Service/MES/Material/MmTransactionTypeService.cs b/DOAN.Service/MES/Material/MmTransactionTypeService.cs
index 9f75a29..acccae3 100644
--- a/DOAN.Service/MES/Material/MmTransactionTypeService.cs
+++ b/DOAN.Service/MES/Material/MmTransactionTypeService.cs
@@ -71,7 +71,9 @@ namespace DOAN.Service.BZFM
         /// <returns></returns>
         private static Expressionable<MmTransactionType> QueryExp(MmTransactionTypeQueryDto parm)
         {
-            var predicate = Expressionable.Create<MmTransactionType>();
+            var predicate = Expressionable.Create<MmTransactionType>()
+                .AndIF(!string.IsNullOrEmpty(parm.TypeName), it => it.TypeName.Contains(parm.TypeName))
+                .AndIF(!string.IsNullOrEmpty(parm.TransactionDirection), it => it.TransactionDirection.Contains(parm.TransactionDirection));
 
             return predicate;
         }