1.修改維修過站邏輯,獲取下一站的邏輯,增加flowRuleID

AMESCoreStudio.Web/Controllers/REPController.cs

@@ -665,7 +665,13 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 //判断全部维修完成过站
                 int repairStationID = -1;
-                var rules = await _basApi.GetRules(model.ngInfo.Barcode.StationID,model.ngInfo.Barcode.RuleStatus, repairStationID);
+
+                //獲取流程ID
+                int wip_id = model.ngInfo.Barcode.WipID;
+                var wip_info = await _pcsApi.GetWipInfo(wip_id);
+                int flow_rule_id = wip_info[0].FlowRuleID;
+
+                var rules = await _basApi.GetRules2(flow_rule_id, model.ngInfo.Barcode.StationID, model.ngInfo.Barcode.RuleStatus, repairStationID);
                 if (rules.Count > 0)
                 {
                     for (int i = 0; i < rules.Count; i++)

AMESCoreStudio.Web/HttpApis/IBAS.cs

@@ -473,6 +473,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/Rules/GetRules")]
         ITask<List<Rules>> GetRules(int id, string ruleStatus, int nextStationID);
 
+        /// <summary>
+        /// 根據ID獲取指定流程站別資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/Rules/GetRules2")]
+        ITask<List<Rules>> GetRules2(int flowRuleID, int id, string ruleStatus, int nextStationID);
+
         /// <summary>
         /// 獲取流程站別資料
         /// </summary>

AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs

@@ -156,6 +156,40 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             return rules;
         }
 
+        /// <summary>
+        /// 根據流程站別ID+状态+下一站查詢指定單一資料
+        /// </summary>
+        /// <param name="flowRuleID"></param>
+        /// <param name="id"></param>
+        /// <param name="ruleStatus"></param>
+        /// <param name="nextStationId"></param>
+        /// <returns></returns>
+        // GET: api/Rules/5
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<Rules>>> GetRules2(int flowRuleID,int id, string ruleStatus, int nextStationId)
+        {
+            IQueryable<Rules> q = _context.Ruleses;
+
+            if (nextStationId == -1)
+            {
+                q = q.Where(p => p.StationID.Equals(id) && p.RuleStatus.Equals(ruleStatus) && p.FlowRuleID.Equals(flowRuleID));
+            }
+            else
+            {
+                q = q.Where(p => p.StationID.Equals(id) && p.RuleStatus.Equals(ruleStatus) && p.FlowRuleID.Equals(flowRuleID) && p.NextStationID.Equals(nextStationId));
+            }
+
+            var rules = await q.ToListAsync();
+
+            if (rules == null)
+            {
+                return NotFound();
+            }
+
+            return rules;
+        }
+
         /// <summary>
         /// 根據流程站別ID+状态+下一站查詢指定單一資料
         /// </summary>