diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
index c61e7ec..8b8da93 100644
--- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
@@ -15,6 +15,8 @@ namespace DOAN.Model.BZFM.Dto
 
         public string SupplierName { get; set; }
         public string BatchNo { get; set; }
+
+        public bool IsHideZero { get; set; }
     }
     public class MmInventoryRevokeDto
     {
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index 0947d7e..f8dbdf9 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -39,6 +39,8 @@ namespace DOAN.Service.BZFM
                     .Where(sub=>sub.BatchNo == it.BatchNo)
                     .Select(sub => sub.StoveCode)
                 },true)
+                .OrderBy(it => it.BatchNo)
+                .OrderBy(it => it.LocationCode)
                 .ToPage(parm);
 
             return response;
@@ -109,6 +111,10 @@ namespace DOAN.Service.BZFM
                     !string.IsNullOrEmpty(parm.SupplierName),
                     m => m.SupplierName.Contains(parm.SupplierName)
                 )
+                .AndIF(
+                    parm.IsHideZero,
+                    m => m.CurrentQty > 0
+                )
                 .AndIF(!string.IsNullOrEmpty(parm.BatchNo), m => m.BatchNo.Contains(parm.BatchNo));
 
             return predicate;