diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index abb97264..56f5e2d1 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -6382,7 +6382,7 @@ namespace AMESCoreStudio.Web.Controllers
                 var ExceptWipKp = model.WipKps.ToList();
                 foreach (var item in BarCodeItems)
                 {
-                    var ByItemWipKp = ExceptWipKp.Where(w => w.KpNo == item.ItemNo).FirstOrDefault();
+                    var ByItemWipKp = ExceptWipKp.Where(w => w.KpNo.Trim().ToUpper() == item.ItemNo.Trim().ToUpper()).FirstOrDefault();
                     if (ByItemWipKp != null)
                         ExceptWipKp.Remove(ByItemWipKp);
                 }
@@ -6501,7 +6501,7 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 // 組件資料
                 var items = await _pcsApi.GetItems();
-                items = items.Where(w => model.WipKps.Any(wi => wi.KpNo == w.ItemNo)).ToList();
+                items = items.Where(w => model.WipKps.Any(wi => wi.KpNo.Trim().ToUpper() == w.ItemNo.Trim().ToUpper())).ToList();
                 // 判斷Input為指定KeyParts順序
                 if (items.Any(a => a.ItemName.ToUpper() == Data.ToUpper()))
                 {