diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs
index b2ff62c5..5f7d9ce0 100644
--- a/AMESCoreStudio.Web/Controllers/BASController.cs
+++ b/AMESCoreStudio.Web/Controllers/BASController.cs
@@ -121,7 +121,7 @@ namespace AMESCoreStudio.Web.Controllers
             var result = await _basApi.GetFlowRules();
 
             var FlowRuleItems = new List<SelectListItem>();
-            FlowRuleItems.Add(new SelectListItem("N/A", "0"));
+            FlowRuleItems.Add(new SelectListItem("全部", "0"));
             for (int i = 0; i < result.Count; i++)
             {
                 FlowRuleItems.Add(new SelectListItem(result[i].UnitNo + result[i].FlowRuleName, result[i].FlowRuleID.ToString()));
@@ -165,6 +165,22 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.NextStationList = NextStationItems;
         }
 
+        [HttpPost]
+        public async Task<JsonResult> GetFlowRuleJson(string unit_no)
+        {
+            var result = await _basApi.GetFlowRulesByUnit(unit_no);
+
+            var item = new List<SelectListItem>();
+            item.Add(new SelectListItem("全部", "0"));
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].FlowRuleName, result[i].FlowRuleID.ToString()));
+            }
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
+        }
+
         #endregion
 
         #region BAS001工廠资料维护相关
@@ -1017,6 +1033,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> BAS010()
         {
+            await GetFactoryUnitList();
             await GetFlowRuleList();
 
             return View();
@@ -1136,13 +1153,15 @@ namespace AMESCoreStudio.Web.Controllers
 
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetRuleStationsByFlowAsync(int id)
+        public async Task<IActionResult> GetRuleStationsByFlowAsync(int flowId, int page = 1, int limit = 10)
         {
-            var result = await _basApi.GetRuleStationsByFlow(id);
+            var result_total = await _basApi.GetRuleStationsByFlow(flowId, 0, limit);
+
+            var result = await _basApi.GetRuleStationsByFlow(flowId, page, limit);
 
             if (result.Count > 0)
             {
-                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+                return Json(new Table() { code = 0, msg = "", data = result, count = result_total.Count });
             }
 
             return Json(new Table() { count = 0, data = null });
diff --git a/AMESCoreStudio.Web/HttpApis/IBAS.cs b/AMESCoreStudio.Web/HttpApis/IBAS.cs
index d2d2cccd..a1e51758 100644
--- a/AMESCoreStudio.Web/HttpApis/IBAS.cs
+++ b/AMESCoreStudio.Web/HttpApis/IBAS.cs
@@ -395,7 +395,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/RuleStations/Flow/{id}")]
-        ITask<List<RuleStation>> GetRuleStationsByFlow(int id);
+        ITask<List<RuleStation>> GetRuleStationsByFlow(int id, int page = 1, int limit = 10);
 
         #endregion
 
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml
index f3ad9df9..e91cd074 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml
@@ -33,6 +33,12 @@
             </div>
             <div class="layui-form-item layui-layout-left">
                 <div class="layui-inline">
+                    <label class="layui-form-label">請選擇製程</label>
+                    <div class="layui-input-inline">
+                        <select id="unit" lay-filter="unit" lay-verify="required" lay-submit asp-items="@ViewBag.FactoryUnit">
+                        </select>
+                    </div>
+                    <input id="unitNo" type="hidden" name="unitNo" value="0" />
                     <label class="layui-form-label">請選擇流程</label>
                     <div class="layui-input-inline">
                         <select id="flow" lay-filter="flow" lay-verify="required" lay-submit asp-items="@ViewBag.FlowRuleList">
@@ -54,10 +60,48 @@
 </div>
 
 @section Scripts{
-    <script type="text/javascript"> 
+    <script type="text/javascript">
+
+        function getFlowRuleList(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetFlowRuleJson", "BAS")",
+                    dataType: 'json',
+                    data: { "unit_no": $("#unitNo").val()},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#flow").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#flow").append($("<option>").text(item.text).val(item.value))
+                        });
+
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
         layui.use(['form', 'layer'], function () {
             form = layui.form;
 
+            form.on('select(unit)', function (data) {
+                $("#unitNo").val(data.value);
+
+                getFlowRuleList(data.value);
+
+                var qs = $('button[lay-filter="querysubmit"]');
+                qs.click();
+
+                hg.msghide("刷新数据！");
+                table && table.reload();
+            });
+
             form.on('select(flow)', function (data) {
                 $("#flowId").val(data.value);
 
@@ -155,10 +199,9 @@
             layuiicon: '&#xe640;',
             class: 'layui-btn-danger',
             handler: function (obj, row) {
-                if (obj.checkstatus && obj.checkstatus.data.length > 0)
-                {
+                if (obj.checkstatus && obj.checkstatus.data.length > 0) {
                     console.log(obj.checkstatus.data.map(function (x) { return x.ruleStationID }).join(','))
-                    
+
                     hg.confirm("批量删除所有选中的数据，确定要删除吗？", function () {
                         $.ajax({
                             url: '/BAS/BAS010DAll',
@@ -196,7 +239,6 @@
         }
         ];
 
-
         //基本数据表格
         var table = hg.table.datatable('test', '流程站別管理', '/BAS/GetRuleStationsByFlow/' + flowId.value, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
 
diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs
index 51a80587..88566041 100644
--- a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs
@@ -59,10 +59,12 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         /// 根據流程ID獲取該流程站別資料
         /// </summary>
         /// <param name="id"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
         /// <returns></returns>
         // GET: api/RuleStations/Flow/5
         [HttpGet("Flow/{id}")]
-        public async Task<ActionResult<IEnumerable<RuleStation>>> GetRuleStationByFlow(int id)
+        public async Task<ActionResult<IEnumerable<RuleStation>>> GetRuleStationByFlow(int id, int page = 1, int limit = 10)
         {
             IQueryable<RuleStation> q = _context.RuleStations;
 
@@ -70,8 +72,14 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             {
                 q = q.Where(p => p.FlowRuleID.Equals(id));
             }
-            q.OrderBy(p => p.Sequence);
-
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit);
+            }
+            else
+            {
+                q = q.OrderBy(p => p.Sequence);
+            }
 
             try
             {