diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index f9785462..18fc7fdc 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -476,7 +476,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
                                                     try
                                                     {
-                                                        if (kp_no == "MB")
+                                                        if (kp_no.StartsWith("MB") && !kp_no.StartsWith("MB_MAC"))
                                                         {
                                                             ESUNContext _esun_context = new ESUNContext();
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs
index b11a7a0f..548ac3a4 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs
@@ -199,7 +199,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                             a.StatusNO,
                             b.ItemNO
                         };
-                q = q.Where(w => w.StatusNO.Equals("A"));
+                q = q.Where(w => !w.StatusNO.Equals("E")&& !w.StatusNO.Equals("C"));
 
                 if (itemNo != null)
                 {