diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index f6bf8e85..b9a30ca9 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -3904,26 +3904,15 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         public async Task<IActionResult> PCS002QueryAsync(string unitno, string wipNo, string itemNo, int page = 0, int limit = 10)
         {
-            if (unitno == null)
-            {
-                string unit_no = Request.Path.ToString().Replace("/PCS/PCS005Query/", "");
-                if (unit_no != "")
-                {
-                    unitno = unit_no;
-                }
-            }
-
             IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
                 , wipno: wipNo
                 , itemno: itemNo
                 , page: page
                 , limit: limit);
 
-
-
             if (result.Data != null)
             {
-                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+                return Json(new Table() { code = 0, msg = "", data = result.Data.Where(w => w.statusNo != 'C' && w.statusNo != 'E'), count = result.DataTotal });
             }
             return Json(new Table() { count = 0, data = null });
         }
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml
index 51dda48c..e92e7ac5 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml
@@ -197,7 +197,7 @@
         }
 
         //基本数据表格
-        var table = hg.table.datatable('query', '工單資料修改', '/PCS/PCS005Query/' + unitNo.value, {}, tableCols, {}, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('query', '工單資料修改', '/PCS/PCS002Query/' + unitNo.value, {}, tableCols, {}, true, 'full-100', ['filter', 'print', 'exports']);
 
         $(document).off('mousedown', '.layui-table-grid-down').
             on('mousedown', '.layui-table-grid-down', function (event) {
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml
index 65585e81..3fa3d5bc 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml
@@ -220,7 +220,7 @@
         //}
         //];
         //基本数据表格
-        var table = hg.table.datatable('query', '工單資料查詢', '/PCS/PCS005Query/' + unitNo.value, {}, tableCols, "", true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('query', '工單資料查詢', '/PCS/PCS002Query/' + unitNo.value, {}, tableCols, "", true, 'full-100', ['filter', 'print', 'exports']);
 
         $(document).off('mousedown', '.layui-table-grid-down').
             on('mousedown', '.layui-table-grid-down', function (event) {