diff --git a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
index 071f267..a59283b 100644
--- a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
+++ b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
@@ -9,6 +9,7 @@ namespace DOAN.Model.MES.product.Dto
 
         public string productionCode { get; set; }
 
+        public string MaterialCode { get; set; }
         public string Workorder { get; set; }
 
         public string RouteCode { get; set; }
diff --git a/DOAN.Service/MES/Order/OrderPurchaseService.cs b/DOAN.Service/MES/Order/OrderPurchaseService.cs
index 1d5f789..749c2b1 100644
--- a/DOAN.Service/MES/Order/OrderPurchaseService.cs
+++ b/DOAN.Service/MES/Order/OrderPurchaseService.cs
@@ -68,7 +68,8 @@ namespace DOAN.Service.MES.order
 
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .OrderBy(it=> it.OrderNoMes)
+                .OrderByDescending(it => it.OrderNoMes)
+                //.OrderBy(it => it.OrderNoMes)
                 .ToPage<OrderPurchase, OrderPurchaseDto>(parm);
 
             return response;
diff --git a/DOAN.Service/MES/Product/ProWorkorderQueryService.cs b/DOAN.Service/MES/Product/ProWorkorderQueryService.cs
index 2452a77..e6f4912 100644
--- a/DOAN.Service/MES/Product/ProWorkorderQueryService.cs
+++ b/DOAN.Service/MES/Product/ProWorkorderQueryService.cs
@@ -43,6 +43,12 @@ namespace DOAN.Service.MES.product
                     !string.IsNullOrEmpty(parm.productionCode),
                     it => it.productionCode.Contains(parm.productionCode)
                 )
+                .AndIF(
+                    !string.IsNullOrEmpty(parm.MaterialCode),
+                    it =>
+                        it.productionCode.Contains(parm.MaterialCode)
+                        || it.MaterialCode.Contains(parm.MaterialCode)
+                )
                 .AndIF(
                     !string.IsNullOrEmpty(parm.FeedOrder),
                     it => it.FeedOrder.Contains(parm.FeedOrder)
@@ -96,6 +102,12 @@ namespace DOAN.Service.MES.product
                     !string.IsNullOrEmpty(parm.productionCode),
                     it => it.productionCode.Contains(parm.productionCode)
                 )
+                .AndIF(
+                    !string.IsNullOrEmpty(parm.MaterialCode),
+                    it =>
+                        it.productionCode.Contains(parm.MaterialCode)
+                        || it.MaterialCode.Contains(parm.MaterialCode)
+                )
                 .AndIF(
                     !string.IsNullOrEmpty(parm.FeedOrder),
                     it => it.FeedOrder.Contains(parm.FeedOrder)