diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index 899c544..e7f41f4 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -80,11 +80,11 @@ namespace DOAN.Service.BZFM
                 .Create<MmInventory>()
                 .AndIF(
                     !string.IsNullOrEmpty(parm.MaterialCode),
-                    m => m.MaterialCode.Contains(parm.MaterialCode)
+                    m => m.MaterialCode == parm.MaterialCode
                 )
                 .AndIF(
                     !string.IsNullOrEmpty(parm.SupplierCode),
-                    m => m.SupplierCode.Contains(parm.SupplierCode)
+                    m => m.SupplierCode == parm.SupplierCode
                 )
                 .AndIF(
                     !string.IsNullOrEmpty(parm.WarehouseName),
diff --git a/DOAN.Service/MES/Order/OrderPurchaseService.cs b/DOAN.Service/MES/Order/OrderPurchaseService.cs
index 1b8c85e..8bfc1a9 100644
--- a/DOAN.Service/MES/Order/OrderPurchaseService.cs
+++ b/DOAN.Service/MES/Order/OrderPurchaseService.cs
@@ -187,7 +187,7 @@ namespace DOAN.Service.MES.order
                 .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
                 .AndIF(parm.ImportDate != null && parm.ImportDate[0] > DateTime.MinValue, it => it.ImportDate >= parm.ImportDate[0])
                 .AndIF(parm.ImportDate != null && parm.ImportDate[1] > DateTime.MinValue, it => it.ImportDate <= parm.ImportDate[1])
-                .AndIF(parm.Orderindicator > -1, it => it.Orderindicator == parm.Orderindicator)
+                .AndIF(parm.Orderindicator > -2, it => it.Orderindicator == parm.Orderindicator)
                 ;
 
             return predicate;
diff --git a/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs b/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs
index 1d980ce..c1586b3 100644
--- a/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs
+++ b/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs
@@ -479,7 +479,8 @@ namespace DOAN.Service.MES.product
                 var orderPurchaseList = Context
                     .Queryable<OrderPurchase>()
                     .Where(o => o.MaterialCode == workorderInfo.productionCode)
-                    .Where(it => it.Orderindicator != -1)
+                    .Where(it => it.Orderindicator != 1)
+                    //.Where(it => it.Orderindicator != -1)
                     .OrderBy(it => it.DeliveryDate)
                     .Select(
                         o => new OrderPurchaseDto
@@ -533,7 +534,7 @@ namespace DOAN.Service.MES.product
                     .Queryable<MmInventory>()
                     .Where(it => it.MaterialCode == workorderInfo.productionCode)
                     .Where(it => it.LocationCode == "CP001")
-                    .Where(it => it.CurrentQty > 0)
+                    //.Where(it => it.CurrentQty > 0)
                     .Select(it => new MaterialInventoryDto
                     {
                         MaterialId = it.Id,