1.修改REP模组有关RuleStationID部分

2.修改QRS模组有关RuleStationID部分

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -6660,7 +6660,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 foreach (var item in result)
                 {
-                    var FlowStation_result = await _basApi.GetRuleStation(item.RuleStationID);
+                    var FlowStation_result = await _basApi.GetRuleStation(item.StationID);
                     if (FlowStation_result.Count() != 0)
                     {
                         var FlowRule_result = await _basApi.GetRuleStationsByFlow(FlowStation_result.Select(s => s.FlowRuleID).First());
@@ -6668,7 +6668,7 @@ namespace AMESCoreStudio.Web.Controllers
                         {
                             var LastRuleStationID = FlowRule_result.Where(w => w.StationID != 1000).OrderBy(o => o.Sequence).Select(s => s.RuleStationID).Last();
 
-                            if (item.RuleStationID != LastRuleStationID || item.RuleStatus != "P" || item.StatusID != -1)
+                            if (item.StationID != LastRuleStationID || item.RuleStatus != "P" || item.StatusID != -1)
                             {
                                 _msg += "序號【" + item.BarcodeNo + "】，流程尚未完成，不可入庫!<br>";
                             }
@@ -6709,7 +6709,7 @@ namespace AMESCoreStudio.Web.Controllers
                                 BarcodeID = item.BarcodeID,
                                 BarcodeNo = item.BarcodeNo,
                                 StatusNo = item.StatusNo,
-                                RuleStationID = RuleStationID,
+                                StationID = RuleStationID,
                                 RuleStatus = "P",//F 不良 
                                 BoxNo = item.BoxNo,
                                 WipID = item.WipID,
@@ -6727,7 +6727,7 @@ namespace AMESCoreStudio.Web.Controllers
                             {
                                 BarcodeID = item.BarcodeID,
                                 WipID = item.WipID,
-                                RuleStationID = RuleStationID,
+                                StationID = RuleStationID,
                                 RuleStatus = "P",
                                 InputDate = DateTime.Now,
                                 LineId = (int)Wipinfo_LineID,

AMESCoreStudio.Web/Controllers/PDSController.cs

@@ -350,7 +350,7 @@ namespace AMESCoreStudio.Web.Controllers
                                     wipNo = wipNO,
                                     barcode = Cell3,
                                     barcodeType = "S",
-                                    station = stationID,
+                                    stationID = stationID,
                                     line = lineId,
                                     unitNo = unitNo,
                                     inputItems = null,

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -389,7 +389,7 @@ namespace AMESCoreStudio.Web.Controllers
                     {
                         if (rule_sation[j].StationID != 1000 && rule_sation[j].StationType == "M")
                         {
-                            stationList = stationList + rule_sation[j].RuleStationID + ",";
+                            stationList = stationList + rule_sation[j].StationID + ",";
 
                             wipDataList = wipDataList + "<td width='150' style='text-align:left'>" + rule_sation[j].StationDesc + "</td>";
 
@@ -753,7 +753,7 @@ namespace AMESCoreStudio.Web.Controllers
                         PlanQTY = int.Parse(jo["planQTY"].ToString()),
                         RuleStationID = int.Parse(jo["ruleStationID"].ToString()),
                         StationID = int.Parse(jo["stationID"].ToString()),
-                        StationDesc = jo["stationDesc"].ToString(),
+                        StationDesc = jo["stationName"].ToString(),
                         ItemNO = jo["itemNO"].ToString(),
                         LineDesc = jo["lineDesc"].ToString(),
                         ModelNO = jo["modelNO"].ToString(),
@@ -804,7 +804,7 @@ namespace AMESCoreStudio.Web.Controllers
                         PlanQTY = int.Parse(jo["planQTY"].ToString()),
                         RuleStationID = int.Parse(jo["ruleStationID"].ToString()),
                         StationID = int.Parse(jo["stationID"].ToString()),
-                        StationDesc = jo["stationDesc"].ToString(),
+                        StationDesc = jo["stationName"].ToString(),
                         ItemNO = jo["itemNO"].ToString(),
                         LineDesc = jo["lineDesc"].ToString(),
                         ModelNO = jo["modelNO"].ToString(),

AMESCoreStudio.Web/Controllers/REPController.cs

@@ -562,7 +562,7 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 //判断全部维修完成过站
                 int repairStationID = -1;
-                var rules = await _basApi.GetRules(model.ngInfo.Barcode.RuleStationID,model.ngInfo.Barcode.RuleStatus, repairStationID);
+                var rules = await _basApi.GetRules(model.ngInfo.Barcode.StationID,model.ngInfo.Barcode.RuleStatus, repairStationID);
                 if (rules.Count > 0)
                 {
                     for (int i = 0; i < rules.Count; i++)
@@ -587,7 +587,7 @@ namespace AMESCoreStudio.Web.Controllers
                     wipNo = model.ngInfo.Wip.WipNO,
                     barcode = model.ngInfo.Barcode.BarcodeNo,
                     barcodeType = "S",
-                    station = repairStationID,
+                    stationID = repairStationID,
                     line = lineID,
                     unitNo = model.ngInfo.Wip.UnitNO,
                     inputItems = items,
@@ -914,7 +914,7 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 //判断全部维修完成过站
                 int repairStationID = -1;
-                var rules = await _basApi.GetRules(model.ngInfo.Barcode.RuleStationID, model.ngInfo.Barcode.RuleStatus, repairStationID);
+                var rules = await _basApi.GetRules(model.ngInfo.Barcode.StationID, model.ngInfo.Barcode.RuleStatus, repairStationID);
                 if (rules.Count > 0)
                 {
                     for (int i = 0; i < rules.Count; i++)
@@ -939,7 +939,7 @@ namespace AMESCoreStudio.Web.Controllers
                     wipNo = model.ngInfo.Wip.WipNO,
                     barcode = model.ngInfo.Barcode.BarcodeNo,
                     barcodeType = "S",
-                    station = repairStationID,
+                    stationID = repairStationID,
                     line = lineID,
                     unitNo = model.ngInfo.Wip.UnitNO,
                     inputItems = items
@@ -1037,7 +1037,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             model.barcodeQngInfo.BarcodeID = model.barcodeInfo.BarcodeID;
             model.barcodeQngInfo.WipID = model.barcodeInfo.WipID;
-            model.barcodeQngInfo.RuleStationID = model.barcodeInfo.RuleStationID;
+            model.barcodeQngInfo.StationID = model.barcodeInfo.StationID;
             model.barcodeQngInfo.UnitNo = model.barcodeInfo.GetWipInfo.UnitNO;
 
             var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
@@ -1114,7 +1114,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             model.barcodeQngInfo.BarcodeID = model.barcodeInfo.BarcodeID;
             model.barcodeQngInfo.WipID = model.barcodeInfo.WipID;
-            model.barcodeQngInfo.RuleStationID = model.barcodeInfo.RuleStationID;
+            model.barcodeQngInfo.StationID = model.barcodeInfo.StationID;
             model.barcodeQngInfo.UnitNo = model.barcodeInfo.GetWipInfo.UnitNO;
 
             var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);

AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml

@@ -31,7 +31,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">站別</label>
-                <select asp-for="RuleStationID" name="Role" id="Role" lay-filter="RoleInfo" asp-items="@ViewBag.GetStationsList" class="custom-select col-sm-9">
+                <select asp-for="StationID" name="Role" id="Role" lay-filter="RoleInfo" asp-items="@ViewBag.GetStationsList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <input type="hidden" name="RuleStationID" id="RuleStationID" />

AMESCoreStudio.Web/Views/PCS/PCS025U.cshtml

@@ -21,7 +21,7 @@
             <input type="hidden" asp-for="CreateDate" />
             <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
             <input type="hidden" asp-for="SysType" />
-            <input type="hidden" asp-for="RuleStationID" />
+            <input type="hidden" asp-for="StationID" />
             <input type="hidden" asp-for="ItemNo" />
 
             <div class="form-group form-inline my-sm-1">

AMESCoreStudio.Web/Views/QRS/QRS010.cshtml

@@ -300,7 +300,7 @@
                 sort: true
             },
             {
-                field: 'stationDesc',
+                field: 'stationName',
                 width: 120,
                 title: '站別',
                 sort: true

AMESCoreStudio.Web/Views/REP/REP001R.cshtml

@@ -70,7 +70,7 @@
             <input type="hidden" asp-for="ngInfo.Barcode.CreateUserID" />
             <input type="hidden" asp-for="ngInfo.Barcode.ExtraBarcodeNo" />
             <input type="hidden" asp-for="ngInfo.Barcode.LocationID" />
-            <input type="hidden" asp-for="ngInfo.Barcode.RuleStationID" />
+            <input type="hidden" asp-for="ngInfo.Barcode.StationID" />
             <input type="hidden" asp-for="ngInfo.Barcode.RuleStatus" />
             <input type="hidden" asp-for="ngInfo.Barcode.StatusID" />
             <input type="hidden" asp-for="ngInfo.Barcode.StatusNo" />

AMESCoreStudio.Web/Views/REP/REP002C.cshtml

@@ -53,7 +53,7 @@
             <input type="hidden" asp-for="ngInfo.Barcode.CreateUserID" />
             <input type="hidden" asp-for="ngInfo.Barcode.ExtraBarcodeNo" />
             <input type="hidden" asp-for="ngInfo.Barcode.LocationID" />
-            <input type="hidden" asp-for="ngInfo.Barcode.RuleStationID" />
+            <input type="hidden" asp-for="ngInfo.Barcode.StationID" />
             <input type="hidden" asp-for="ngInfo.Barcode.RuleStatus" />
             <input type="hidden" asp-for="ngInfo.Barcode.StatusID" />
             <input type="hidden" asp-for="ngInfo.Barcode.StatusNo" />

AMESCoreStudio.Web/Views/REP/REP002R.cshtml

@@ -70,7 +70,7 @@
             <input type="hidden" asp-for="ngInfo.Barcode.CreateUserID" />
             <input type="hidden" asp-for="ngInfo.Barcode.ExtraBarcodeNo" />
             <input type="hidden" asp-for="ngInfo.Barcode.LocationID" />
-            <input type="hidden" asp-for="ngInfo.Barcode.RuleStationID" />
+            <input type="hidden" asp-for="ngInfo.Barcode.StationID" />
             <input type="hidden" asp-for="ngInfo.Barcode.RuleStatus" />
             <input type="hidden" asp-for="ngInfo.Barcode.StatusID" />
             <input type="hidden" asp-for="ngInfo.Barcode.StatusNo" />

AMESCoreStudio.Web/Views/REP/REP006C.cshtml

@@ -34,7 +34,7 @@
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="barcodeInfo.BarcodeID" />
             <input type="hidden" asp-for="barcodeInfo.WipID" />
-            <input type="hidden" asp-for="barcodeInfo.RuleStationID" />
+            <input type="hidden" asp-for="barcodeInfo.StationID" />
             <input type="hidden" asp-for="barcodeInfo.GetWipInfo.UnitNO" />
 
             <div class="layui-form-item">

AMESCoreStudio.Web/Views/REP/REP007C.cshtml

@@ -34,7 +34,7 @@
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="barcodeInfo.BarcodeID" />
             <input type="hidden" asp-for="barcodeInfo.WipID" />
-            <input type="hidden" asp-for="barcodeInfo.RuleStationID" />
+            <input type="hidden" asp-for="barcodeInfo.StationID" />
             <input type="hidden" asp-for="barcodeInfo.GetWipInfo.UnitNO" />
 
             <div class="layui-form-item">

AMESCoreStudio.Web/Views/REP/REP008.cshtml

@@ -174,7 +174,7 @@
                 sort: true
             },
             {
-                field: 'stationDesc',
+                field: 'stationName',
                 width: 100,
                 title: '站別',
                 sort: true

AMESCoreStudio.Web/Views/REP/REP009.cshtml

@@ -174,7 +174,7 @@
                 sort: true
             },
             {
-                field: 'stationDesc',
+                field: 'stationName',
                 width: 100,
                 title: '站別',
                 sort: true

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemChangesController.cs

@@ -71,14 +71,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <summary>
         /// 用barcodeID獲取資料 By生產履歷
         /// </summary>
-        /// <param name="barcodeID">barcodeID</param>
+        /// <param name="id">id</param>
         /// <returns></returns>
         [HttpGet("ByBarCodeIDPCS009/{id}")]
         public async Task<ActionResult<IEnumerable<BarcodeItemChangeDTO>>> GetBarcodeItemChangesByBarCodeIDPCS009(int id)
         {
             var q = from q1 in _context.BarcodeItemChanges.Where(w => w.BarcodeID == id)
                     join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
-                    join q3 in _context.RuleStations on q1.RuleStationID equals q3.RuleStationID
+                    join q3 in _context.RuleStations on q1.StationID equals q3.StationID
                     join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
                     select new BarcodeItemChangeDTO
                     {
@@ -88,7 +88,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         KpItemNo = q1.KpItemNo,
                         ItemNoName = q2.ItemName,
                         StationName = q3.StationDesc,
-                        RuleStationID = q1.RuleStationID,
+                        StationID = q1.StationID,
                         CreateUser = q4.UserName,
                         CreateDate = q1.CreateDate,
                         ChangeType = q1.ChangeType

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs

@@ -51,7 +51,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 data.B = _context.BarcodeInfoes.Find(data.BarcodeID);
                 data.I = _context.Items.Find(data.ItemNo);
-                data.S = _context.RuleStations.Find(data.RuleStationID);
+                data.S = _context.RuleStations.Find(data.StationID);
             }
 
 
@@ -103,7 +103,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 data.B = _context.BarcodeInfoes.Find(data.BarcodeID);
                 data.I = _context.Items.Find(data.ItemNo);
-                data.S = _context.RuleStations.Find(data.RuleStationID);
+                data.S = _context.RuleStations.Find(data.StationID);
             }
 
             if (barcodeItem == null)
@@ -138,7 +138,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 //data.Serial = i + 1;
                 data.B = _context.BarcodeInfoes.Find(data.BarcodeID);
                 data.I = _context.Items.Find(data.ItemNo);
-                data.S = _context.RuleStations.Find(data.RuleStationID);
+                data.S = _context.RuleStations.Find(data.StationID);
             }
 
             if (barcodeItem == null)
@@ -176,7 +176,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 //data.Serial = i + 1;
                 data.B = _context.BarcodeInfoes.Find(data.BarcodeID);
                 data.I = _context.Items.Find(data.ItemNo);
-                data.S = _context.RuleStations.Find(data.RuleStationID);
+                data.S = _context.RuleStations.Find(data.StationID);
             }
 
             if (barcodeItem == null)

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs

@@ -141,7 +141,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     join b in _context.BarcodeInfoes on a.BarcodeID equals b.BarcodeID
                     join c in _context.WipInfos on a.WipID equals c.WipID
                     join d in _context.WipAtts on c.WipNO equals d.WipNO
-                    join e in _context.RuleStations on a.RuleStationID equals e.RuleStationID
+                    join e in _context.Stationses on a.StationID equals e.StationID
                     join f in _context.RepairResponsibleUnitses on a.DeptID equals f.RRID
                     select new
                     {
@@ -150,7 +150,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         c.WipNO,
                         d.ModelNO,
                         d.ItemNO,
-                        e.StationDesc,
+                        e.StationName,
                         ScrapDate = a.ScrapTime,
                         OpUserNo = helper.GetUserNo(a.OperatorID).Result,
                         IPQAUserNo = helper.GetUserNo(a.IPQAID).Result,
@@ -243,7 +243,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     join b in _context.BarcodeInfoes on a.BarcodeID equals b.BarcodeID
                     join c in _context.WipInfos on a.WipID equals c.WipID
                     join d in _context.WipAtts on c.WipNO equals d.WipNO
-                    join e in _context.RuleStations on a.RuleStationID equals e.RuleStationID
+                    join e in _context.Stationses on a.StationID equals e.StationID
                     join f in _context.RepairResponsibleUnitses on a.DeptID equals f.RRID
                     select new
                     {
@@ -252,7 +252,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         c.WipNO,
                         d.ModelNO,
                         d.ItemNO,
-                        e.StationDesc,
+                        e.StationName,
                         ScrapDate = a.ScrapTime,
                         OpUserNo = helper.GetUserNo(a.OperatorID).Result,
                         IPQAUserNo = helper.GetUserNo(a.IPQAID).Result,

AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs

@@ -164,7 +164,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
             var q = from a in _context.WipStations
-                    join b in _context.RuleStations on a.RuleStationID equals b.RuleStationID
+                    join b in _context.Stationses on a.StationID equals b.StationID
                     join c in _context.WipInfos on a.WipID equals c.WipID
                     join d in _context.WipAtts on c.WipNO equals d.WipNO
                     join e in _context.LineInfoes on c.LineID equals e.LineID
@@ -176,9 +176,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         c.PlanQTY,
                         d.ModelNO,
                         e.LineDesc,
-                        a.RuleStationID,
                         b.StationID,
-                        b.StationDesc,
+                        b.StationName,
                         a.RuleStatus,
                         a.FirstCnt,
                         a.PassCnt,
@@ -235,16 +234,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 }
             }
 
-            q = q.OrderBy(w => w.WipID + w.RuleStationID);
+            q = q.OrderBy(w => w.WipID + w.StationID);
 
-            var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.RuleStationID, x.StationID, x.StationDesc, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
+            var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
             {
                 WipID = y.Key.WipID,
                 WipNO = y.Key.WipNO,
                 PlanQTY = y.Key.PlanQTY,
-                RuleStationID = y.Key.RuleStationID,
                 StationID = y.Key.StationID,
-                StationDesc = y.Key.StationDesc,
+                StationName = y.Key.StationName,
                 RuleStatus = y.Key.RuleStatus,
                 ItemNO = y.Key.ItemNO,
                 LineDesc = y.Key.LineDesc,
@@ -254,14 +252,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 Yield = (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100)
             });
 
-            var g1 = g.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.RuleStationID, x.StationID, x.StationDesc, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
+            var g1 = g.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
             {
                 WipID = y.Key.WipID,
                 WipNO = y.Key.WipNO,
                 PlanQTY = y.Key.PlanQTY,
-                RuleStationID = y.Key.RuleStationID,
                 StationID = y.Key.StationID,
-                StationDesc = y.Key.StationDesc,
+                StationName = y.Key.StationName,
                 ItemNO = y.Key.ItemNO,
                 LineDesc = y.Key.LineDesc,
                 ModelNO = y.Key.ModelNO,
@@ -306,7 +303,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
             var q = from a in _context.WipStations
-                    join b in _context.RuleStations on a.RuleStationID equals b.RuleStationID
+                    join b in _context.Stationses on a.StationID equals b.StationID
                     join c in _context.WipInfos on a.WipID equals c.WipID
                     join d in _context.WipAtts on c.WipNO equals d.WipNO
                     join e in _context.LineInfoes on c.LineID equals e.LineID
@@ -318,9 +315,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         c.PlanQTY,
                         d.ModelNO,
                         e.LineDesc,
-                        a.RuleStationID,
                         b.StationID,
-                        b.StationDesc,
+                        b.StationName,
                         a.RuleStatus,
                         a.FirstCnt,
                         a.PassCnt,
@@ -355,16 +351,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 }
             }
 
-            q = q.OrderBy(w => w.WipID + w.RuleStationID);
+            q = q.OrderBy(w => w.WipID + w.StationID);
 
-            var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.RuleStationID, x.StationID, x.StationDesc, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
+            var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
             {
                 WipID = y.Key.WipID,
                 WipNO = y.Key.WipNO,
                 PlanQTY = y.Key.PlanQTY,
-                RuleStationID = y.Key.RuleStationID,
                 StationID = y.Key.StationID,
-                StationDesc = y.Key.StationDesc,
+                StationName = y.Key.StationName,
                 RuleStatus = y.Key.RuleStatus,
                 ItemNO = y.Key.ItemNO,
                 LineDesc = y.Key.LineDesc,

AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs

@@ -157,10 +157,10 @@ FROM JHAMES.WIP_STATION";
         /// 基本查詢
         /// </summary>
         /// <param name="wipID">工單ID</param>
-        /// <param name="ruleStationID">流程ID</param>
+        /// <param name="stationID">流程ID</param>
         /// <returns></returns>
         [HttpGet("GetWipStation4QRS009Group")]
-        public async Task<ResultModel<dynamic>> GetWipStation4QRS009Group(int wipID, int ruleStationID)
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS009Group(int wipID, int stationID)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
 
@@ -171,14 +171,14 @@ FROM JHAMES.WIP_STATION";
                 q = q.Where(w => w.WipID == wipID);
 
 
-            if (ruleStationID != 0)
+            if (stationID != 0)
-                q = q.Where(w => w.RuleStationID == ruleStationID);
+                q = q.Where(w => w.StationID == stationID);
 
-            var g = q.GroupBy(x => new { x.RuleStationID, x.RuleStatus }).Select(x => new
+            var g = q.GroupBy(x => new { x.StationID, x.RuleStatus }).Select(x => new
             {
-                RuleStationID = x.Key.RuleStationID,
+                StationID = x.Key.StationID,
                 RuleStatus = x.Key.RuleStatus,
-                FirstCnt = q.Where(j => j.RuleStationID == x.Key.RuleStationID && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
+                FirstCnt = q.Where(j => j.StationID == x.Key.StationID && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
             //var result = await q.ToListAsync();
@@ -193,10 +193,10 @@ FROM JHAMES.WIP_STATION";
         /// 基本查詢
         /// </summary>
         /// <param name="wipID">工單ID</param>
-        /// <param name="ruleStationID">流程ID</param>
+        /// <param name="stationID">流程ID</param>
         /// <returns></returns>
         [HttpGet("Query")]
-        public async Task<ActionResult<WipStation>> GetWipStation(int wipID , int ruleStationID)
+        public async Task<ActionResult<WipStation>> GetWipStation(int wipID , int stationID)
         {
             IQueryable<WipStation> q = _context.WipStations;
 
@@ -205,8 +205,8 @@ FROM JHAMES.WIP_STATION";
                 q = q.Where(w => w.WipID == wipID);
 
             
-            if (ruleStationID != 0)
+            if (stationID != 0)
-                q = q.Where(w => w.RuleStationID == ruleStationID);
+                q = q.Where(w => w.StationID == stationID);
 
             var result = await q.ToListAsync();
 
@@ -264,6 +264,11 @@ FROM JHAMES.WIP_STATION";
             return result;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         // DELETE: api/WipStation/5
         [HttpDelete("{id}")]
         public async Task<ActionResult<WipStation>> DeleteWipStation(int id)