diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 23957efb..39e6731f 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1444,7 +1444,27 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <param name="newID"></param>
+        /// <param name="oldID"></param>
+        /// <returns></returns>
+        [ResponseCache(Duration = 0)]
+        [HttpPost]
+        public async Task<IActionResult> GetRuleStationByFlow(int flow)
+        {
+            var result = await _pcsApi.GetRuleStationByFlow(flow);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = 0 });
+            }
 
+            return Json(new Table() { count = 0, data = null });
+        }
+        
 
         /// <summary>
         /// 回傳工單號碼相關資料
@@ -1511,8 +1531,28 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         [HttpPost]
-        public async Task<IActionResult> PCS001NAsync(WipDataViewModel model, IFormFile formFile)
+        public async Task<IActionResult> PCS001NAsync(WipDataViewModel model, string action, IFormFile formFile)
         {
+            await WipDataSelectAll(model.wipAtt.WipNO, model.wipAtt.ItemNO, model.wipInfo.UnitNO);
+            // 料號刷新
+            if (action == "ItemNo")
+            {
+                var result_materialKP = await _pcsApi.GetMaterialKpByItemNo(model.wipAtt.ItemNO);
+
+                foreach (var item in result_materialKP)
+                {
+                    model.WipKps.Add(new WipKpDto
+                    {
+                        KpName = item.KpName,
+                        KpNo = item.KpNo,
+                        KpSeq = item.KpSeq,
+                        Length = item.Length,
+                        Title = item.Title
+                    });
+                }
+                return View(model);
+            }
+
             await WipDataSelectAll(model.wipAtt.WipNO, model.wipAtt.ItemNO, model.wipInfo.UnitNO);
             return View(model);
         }
@@ -2612,6 +2652,55 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
+        #region PCS002 工單設定
+        public async Task<IActionResult> PCS002(string id)
+        {
+            if (id != null)
+            {
+                await GetFactoryUnit(id);
+                ViewBag.UnitNo = id;
+            }
+            else
+            {
+                await GetFactoryUnit();
+            }
+
+            //await GetFactoryUnit();
+            return View();
+        }
+
+        /// <summary>
+        /// PCS005 Query
+        /// </summary>
+        /// <param name="unitno">生產單位</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="itemNo">料號</param>
+        /// <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() { count = 0, data = null });
+        }
+        #endregion
+
         #region PCS004 工單條碼區間設定
         [ResponseCache(Duration = 0)]
         [HttpGet]
diff --git a/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs b/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
index f6d3262c..c6562c90 100644
--- a/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
+++ b/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
@@ -51,7 +51,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
 
         public IEnumerable<MaterialSopDto> materialSops { get; set; }
 
-        public IEnumerable<WipKpDto> WipKps { get; set; }
+        public List<WipKpDto> WipKps { get; set; }
 
         public IEnumerable<WipOutfitDto> WipOutfits { get; set; }
 
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml
index f1330c23..450b1926 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml
@@ -30,17 +30,21 @@
                 <div class="layui-inline">
                     <label asp-for="wipInfo.WipNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.WipNO" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="wipInfo.WipNO" class="layui-bg-red"></span>
+                        <input asp-for="wipInfo.WipNO" style="width: 150px; display: initial" class="layui-input" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" name="action" value="Copy" lay-submit lay-filter="querysubmit" title="刷新">
+                            <i class="layui-icon layui-icon-sm">&#xe669;</i>
+                        </button>
                     </div>
                     <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.WipSEQ" asp-items="@ViewBag.WipSEQTypeList" class=""></select>
                     </div>
-                    <label asp-for="wipAtt.ItemNO" class="layui-form-label"></label>
+                    <label asp-for="wipAtt.ItemNO"  class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipAtt.ItemNO" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="wipAtt.ItemNO" class="layui-bg-red"></span>
+                        <input asp-for="wipAtt.ItemNO" style="width: 150px; display:initial" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" autocomplete="off" />
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" name="action" value="ItemNo" lay-submit lay-filter="querysubmit" title="刷新">
+                            <i class="layui-icon layui-icon-sm">&#xe669;</i>
+                        </button>
                     </div>
                     <label asp-for="wipInfo.PlanQTY" class="layui-form-label"></label>
                     <div class="layui-input-inline">
@@ -326,9 +330,6 @@
                                     <th>
                                         長度
                                     </th>
-                                    <th>
-                                        生產單位代號
-                                    </th>
                                     <th>
 
                                     </th>
@@ -339,7 +340,6 @@
                                 {
                                     <tr>
                                         <td>
-                                            <input name="WipKps[@k].WipKpID" type="hidden" value="@index.WipKpID" />
                                             <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.KpName" name="WipKps[@k].KpName" />
                                         </td>
                                         <td>
@@ -354,9 +354,6 @@
                                         <td>
                                             <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.Length" name="WipKps[@k].Length" />
                                         </td>
-                                        <td>
-                                            <select asp-for="@index.UnitNo" name="WipKps[@k].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
-                                        </td>
                                         <td>
                                             <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
                                         </td>
@@ -365,9 +362,6 @@
                                 }
                             </tbody>
                         </table>
-                        <div style="text-align: right">
-                            <input type="submit" value="生管確認" name="action" class="layui-btn" />
-                        </div>
                     </div>
 
                     @* 生產流程sheet *@
@@ -601,11 +595,12 @@
                 if (itemNo != '') {
                     getFlowRuleList(data.value);
                 }
-              
+
             });
 
             form.on('select(flow)', function (data) {
                 $("#flowId").val(data.value);
+                RuleStation(data.value);
             });
 
             form.on('select(lind)', function (data) {
@@ -619,7 +614,7 @@
                 {
                     url: "@Url.Action("GetMaterialFlowRuleJson", "PCS")",
                     dataType: 'json',
-                    data: { "itemno": $("#wipAtt_ItemNO").val(), "unit_no": $("#unitNos").val()},
+                    data: { "itemno": $("#wipAtt_ItemNO").val(), "unit_no": $("#unitNo").val()},
                     type: 'post',
                     success: function (result)
                     {
@@ -673,7 +668,7 @@
                 {
                     url: "@Url.Action("getMaterialFlowRuleRemark", "PCS")",
                     dataType: 'json',
-                    data: { "itemno": $("#wipAtt_ItemNO").val(), "unit_no": $("#unitNo").val(), "flowID": NewID },
+                      data: { "itemno": $("#wipAtt_ItemNO").val(), "unit_no": $("#unitNo").val(), "flowID": NewID },
                     type: 'post',
                     success: function (result)
                     {
@@ -689,9 +684,6 @@
                 NewID = 0;
             }
 
-            var OldID = $("#flowId").val();
-
-            $("#rulestionOld").empty();
             var tableCols_rule = [[
                 {
                     field: 'unitNoName',
@@ -723,7 +715,7 @@
                     sort: true
                 },]
             ];
-            var tableruleStation = hg.table.datatable('ruleStation', '', '/PCS/GetRuleStationByWipNo?wipNo=' + $("#wipInfo_WipNO").val() + '&newID='+NewID+'&oldID='+OldID , {}, tableCols_rule, '', false, 'full-100');
+            var tableruleStation = hg.table.datatable('ruleStation', '', '/PCS/GetRuleStationByFlow/' + NewID , {}, tableCols_rule, '', false, 'full-100');
             tableruleStation;
         }
 
@@ -731,12 +723,6 @@
         $('#KPTableAdd').click();
         $('#KPTableAdd').on('click', function () {
             let No = parseInt($('#WipKpCount').val());
-            var FactoryUnit = getFactoryUnitByWipNoList();
-            var Select = "<select name=WipKps[" + No + "].UnitNo>";
-            $.each(FactoryUnit, function (index, item) {
-                Select += '<option value=' + item.value + '>' + item.text + '</option>';
-            });
-            Select += '</select>';
             var Items = getItemsList();
             var SelectKPNo = "<select name=WipKps[" + No + "].KpNo>";
             $.each(Items, function (index, item) {
@@ -750,7 +736,6 @@
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" value=' + (No+1)+' /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Length" /></td>' +
-                '<td>' + Select + '</td>' +
                 '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
                 '</tr>';
 
@@ -773,29 +758,6 @@
             //table.deleteRow(row[0].rowIndex);
         };
 
-        //生產單位By工單號碼選單
-        function getFactoryUnitByWipNoList()
-        {
-            var a;
-            $.ajax(
-                {
-                    url: "@Url.Action("GetFactoryUnitByWipNoJson", "PCS")",
-                    dataType: 'json',
-                    data: { "wipNo": $("#wipInfo_WipNO").val()},
-                    async:false,
-                    type: 'post',
-                    success: function (result)
-                    {
-                        a = result.data;
-                    },
-                    error: function (result)
-                    {
-                        alert(result);
-                    }
-                });
-            return a;
-        };
-
         //KP Items 選單
         function getItemsList()
         {
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml
new file mode 100644
index 00000000..53196f65
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml
@@ -0,0 +1,210 @@
+@{
+    ViewData["Title"] = "工單資料修改";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+@using Microsoft.AspNetCore.Mvc.Localization
+@inject IHtmlLocalizer<AMESCoreStudio.Web.SharedResource> sharedLocalizer
+<style>
+    /*    .layui-table-col-special .layui-table-cell {
+        height:auto;
+        overflow:visible;
+        text-overflow:inherit;
+        white-space: normal;
+    }*/
+</style>
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form">
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">工單:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">料號:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="itemNo" name="itemNo" autocomplete="off" class="layui-input" placeholder="請輸入料號">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">生產單位:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <select id="unit" lay-filter="unit" name="unit" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                                </select>
+                                <input id="unitNo" type="hidden" name="unitNo" value="@ViewBag.UnitNo" />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table class="layui-hide" id="query" lay-filter="query"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.use('table', function () {
+            form = layui.form;
+
+            form.on('select(unit)', function (data) {
+                $("#unitNo").val(data.value);
+                //roleName = data.elem[data.elem.selectedIndex].text;
+                var qs = $('button[lay-filter="querysubmit"]');
+                qs.click();
+
+            });
+
+            var table = layui.table;
+
+        });
+
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            table && table.reload(data);
+
+        });
+        var tableCols = [[
+            {
+                field: 'wipNo',
+                width: 100,
+                title: '工單號碼',
+                sort: true
+            },
+            {
+                field: 'itemNo',
+                title: '料號',
+                width: 150,
+                sort: true
+            },
+            {
+                field: 'description',
+                title: '品名',
+                width: 100,
+            },
+            {
+                field: 'planQTY',
+                title: '數量'
+            },
+            {
+                field: 'lineDesc',
+                title: '線別',
+                sort: true
+            },
+            {
+                field: 'unitName',
+                title: '生產單位',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'factoryNameCh',
+                title: '委外廠名稱',
+                sort: true
+            },
+            {
+                field: 'wipScheduleDate',
+                title: '預計開工日',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.wipScheduleDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'workDate',
+                title: '開工日',
+                sort: true
+            },
+            {
+                field: 'wipDueDate',
+                title: '預計完成日',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.wipDueDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'a',
+                title: '檢驗完成日'
+            },
+            {
+                field: 'right',
+                width: 140,
+                title: '操作',
+                fixed: 'right',
+                templet: function (d) {
+                    return '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>\
+                            <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                }
+            }
+        ]
+        ];
+
+        //通过行tool编辑，lay-event="edit"
+        function edit(obj) {
+            if (obj.data.wipID) {
+                hg.open('修改工單資料', '/PCS/PCS003/' + obj.data.wipID, '', '', true);
+            }
+        }
+
+        function del(obj) {
+            hg.confirm("确定要删除工單號碼【" + obj.data.wipNO + "】嗎？", function () {
+                $.ajax({
+                    url: '/PCS/PCS005D',
+                    data: { id: obj.data.wipNO },
+                    type: 'POST',
+                    success: function (data) {
+                        if (data.success) {
+                            hg.msghide("删除成功！");
+                            var qs = $('button[lay-filter="querysubmit"]');
+                            qs.click();
+                        }
+                        else {
+                            hg.msg(data.msg);
+                        }
+                    },
+                    error: function () {
+                        hg.msg("网络请求失败！");
+                    }
+                });
+            });
+        }
+
+        //基本数据表格
+        var table = hg.table.datatable('query', '工單資料修改', '/PCS/PCS005Query/' + unitNo.value, {}, tableCols, {}, true, 'full-100', ['filter', 'print', 'exports']);
+
+        $(document).off('mousedown', '.layui-table-grid-down').
+            on('mousedown', '.layui-table-grid-down', function (event) {
+                table._tableTrCurrr = $(this).closest('td');
+            });
+        $(document).off('click', '.layui-table-tips-main [lay-event]').
+            on('click', '.layui-table-tips-main [lay-event]', function (event) {
+                var elem = $(this);
+                var tableTrCurrr = table._tableTrCurrr;
+                if (!tableTrCurrr) {
+                    return;
+                }
+                var layerIndex = elem.closest('.layui-table-tips').attr('times');
+                layer.close(layerIndex);
+                table._tableTrCurrr.find('[lay-event="' + elem.attr('lay-event') + '"]').children("i").first().click();
+            });
+    </script>
+}
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 2443aaaf..5a80dae1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -1421,8 +1421,6 @@
 
             var OldID = $("#flowId").val();
 
-
-
             $("#rulestionOld").empty();
             var tableCols_rule = [[
                 {