diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 342824be..2a6228b7 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1622,7 +1622,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO);
             if (q.Count() == 0)
-            {     
+            {
                 ModelState.AddModelError("error", "找不到工單號碼【" + model.WipNO + "】");
                 return View(model);
             }
@@ -2090,6 +2090,14 @@ namespace AMESCoreStudio.Web.Controllers
 
                 // 工單流程ID 取站別
                 var ruleStations = await GetRuleStationByFlowRuleID(model.FlowRuleID);
+                if (model.Station != 0)
+                {
+                    model.RuleStation = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().RuleStationID;
+                }
+                else
+                {
+                    model.RuleStation = ruleStations.FirstOrDefault().RuleStationID;
+                }
 
                 // 料號檔案
                 model.MaterialItem = await _pcsApi.GetMaterialItemByItemNO(model.ItemNO);
@@ -2098,7 +2106,7 @@ namespace AMESCoreStudio.Web.Controllers
                     model.MaterialKps = await _pcsApi.GetMaterialKpByItemID(model.MaterialItem.ItemID);
                     model.MaterialKps = model.MaterialKps.Where(w => w.StationType == model.UnitNO).OrderBy(o => o.KpSeq).ToList();
                     model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID);
-
+                    model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.RuleStationID == model.RuleStation).ToList();
                     if (model.MaterialStationsItems.Count() == 0)
                     {
                         ModelState.AddModelError("error", "找不到該站別作業工項");
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
index 939445b7..0745875b 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
@@ -401,6 +401,10 @@
                 //getRuleStationList(data.value);
             });
 
+            form.on('select(stations)', function (data) {
+                $("#GetWipData").click();
+            });
+
         });
 
         // 新增trRow