diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml
index 654ead9b..246abc3c 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml
@@ -20,18 +20,24 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="WipInfo.ProductTypeID" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.WipNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="WipInfo.ProductTypeID" asp-items="@ViewBag.ProductTypesList"></select>
+                        <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入工單號碼" />
+                        <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
                     </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="WipInfo.UnitNO" class="layui-form-label"></label>
+                    <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="WipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitList" class=""></select>
+                        <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入料號" />
+                        <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                    </div>
+                    <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.PlanQTY" class="layui-input" placeholder="請輸入計劃數量" />
+                        <span asp-validation-for="WipInfo.PlanQTY" class="text-danger"></span>
                     </div>
                 </div>
             </div>
@@ -42,73 +48,57 @@
                     <div class="layui-input-inline">
                         <select asp-for="WipInfo.WipType" asp-items="@ViewBag.GetWipTypeList" class=""></select>
                     </div>
-                    <label asp-for="WipInfo.LineID" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.ProductTypeID" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class=""></select>
+                        <select asp-for="WipInfo.ProductTypeID" asp-items="@ViewBag.ProductTypesList"></select>
                     </div>
                     <label asp-for="WipInfo.Werks" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select asp-for="WipInfo.Werks" asp-items="@ViewBag.FactoryInfoList" style="color: #dc3545 !important;"></select>
                     </div>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <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" placeholder="請輸入工單號碼" />
-                        <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
-                    </div>
-                    <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="WipInfo.PlanQTY" class="layui-input" placeholder="請輸入計劃數量" />
-                        <span asp-validation-for="WipInfo.PlanQTY" class="text-danger"></span>
-                    </div>
-                    <label asp-for="WipAtt.Side" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.WerksNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="WipAtt.Side" asp-items="@ViewBag.MFGTypeList" class=""></select>
+                        <input asp-for="WipInfo.WerksNO" class="layui-input" placeholder="請輸入委外廠編號" />
+                        <span asp-validation-for="WipInfo.WerksNO" class="text-danger"></span>
                     </div>
+
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.CustomerType" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入料號" />
-                        <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                        <select asp-for="WipInfo.CustomerType" asp-items="@ViewBag.GetCustomerTypeList" class=""></select>
                     </div>
-                    <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.FlowRuleID" class="layui-input" placeholder="請輸入流程ID" />
-                        <span asp-validation-for="WipInfo.FlowRuleID" class="text-danger"></span>
+                        <input asp-for="WipInfo.CustomerNO" class="layui-input" placeholder="請輸入客戶名稱" />
+                        <span asp-validation-for="WipInfo.CustomerNO" class="text-danger"></span>
                     </div>
-                    <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.CustomerItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.BoxCNT" class="layui-input" placeholder="請輸入包裝單箱數量" />
-                        <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
+                        <input asp-for="WipInfo.CustomerItemNO" class="layui-input" placeholder="請輸入客戶料號" />
                     </div>
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="WipInfo.CustomerNO" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.UnitNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.CustomerNO" class="layui-input" placeholder="請輸入客戶名稱" />
-                        <span asp-validation-for="WipInfo.CustomerNO" class="text-danger"></span>
+                        <select asp-for="WipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitList" class=""></select>
                     </div>
-                    <label asp-for="WipInfo.WerksNO" class="layui-form-label"></label>
+                    <label asp-for="WipInfo.LineID" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.WerksNO" class="layui-input" placeholder="請輸入委外廠編號" />
-                        <span asp-validation-for="WipInfo.WerksNO" class="text-danger"></span>
+                        <select asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class=""></select>
                     </div>
                     <label asp-for="WipInfo.RelatedWONO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <input asp-for="WipInfo.RelatedWONO" class="layui-input" placeholder="請輸入關聯工單/客戶工單" />
                         <span asp-validation-for="WipInfo.RelatedWONO" class="text-danger"></span>
                     </div>
+
                 </div>
             </div>
 
@@ -135,25 +125,31 @@
             <div class="layui-tab layui-tab-brief">
                 <ul class="layui-tab-title">
                     <li class="layui-this">工單屬性</li>
-                    <li>單板-工程資訊</li>
-                    <li>系統組裝-工程資訊</li>
+                    <li>生產流程</li>
+                    <li>序號編碼</li>
+                    <li>Keypart組合</li>
+                    <li>板卡-工程資訊</li>
+                    <li>系統-工程資訊</li>
+                    <li>標籤選項</li>
                 </ul>
                 <div class="layui-tab-content">
                     @* 基本資料sheet *@
                     <div class="layui-tab-item layui-show">
-
-
                         <div class="layui-form-item">
                             <div class="layui-inline">
+                                <label asp-for="WipAtt.ModelNO" class="layui-form-label"></label>
+                                <div class="layui-input-inline">
+                                    <input asp-for="WipAtt.ModelNO" class="layui-input" placeholder="請輸入機種" />
+                                </div>
                                 <label asp-for="WipAtt.WipProcess" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
                                     <select asp-for="WipAtt.WipProcess" asp-items="@ViewBag.ProcessTypeList" class=""></select>
                                 </div>
-
                                 <label asp-for="WipAtt.Side" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
                                     <select asp-for="WipAtt.Side" asp-items="@ViewBag.MFGTypeList" class=""></select>
                                 </div>
+
                             </div>
                         </div>
 
@@ -164,12 +160,10 @@
                                     <input asp-for="WipAtt.Boards" class="layui-input" placeholder="請輸入聯板數" />
                                     <span asp-validation-for="WipAtt.Boards" class="text-danger offset-sm-3 my-sm-1"></span>
                                 </div>
-
-
-                                <label asp-for="WipAtt.Boards" class="layui-form-label"></label>
+                                <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.Boards" class="layui-input" placeholder="請輸入出貨序號" />
-                                    <span asp-validation-for="WipAtt.Boards" class="text-danger"></span>
+                                    <input asp-for="WipInfo.BoxCNT" class="layui-input" placeholder="請輸入包裝單箱數量" />
+                                    <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
@@ -180,68 +174,72 @@
                                 <div class="layui-input-inline">
                                     <input asp-for="WipAtt.ECN" class="layui-input" placeholder="請輸入ECN版本" />
                                 </div>
-
-
-                                <label asp-for="WipInfo.CustomerType" class="layui-form-label"></label>
-                                <div class="layui-input-inline">
-                                    <select asp-for="WipInfo.CustomerType" asp-items="@ViewBag.GetCustomerTypeList" class=""></select>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="layui-form-item">
-                            <div class="layui-inline">
                                 <label asp-for="WipAtt.BIOSVer" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
                                     <input asp-for="WipAtt.BIOSVer" class="layui-input" placeholder="請輸入BIOS Ver" />
                                 </div>
-
-
-                                <label asp-for="WipInfo.CustomerItemNO" class="layui-form-label"></label>
+                                <label asp-for="WipAtt.CS" class="layui-form-label"></label>
+                                <div class="layui-input-inline">
+                                    <input asp-for="WipAtt.CS" class="layui-input" placeholder="請輸入CS" />
+                                </div>
+                                <label asp-for="WipAtt.EAN" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.CustomerItemNO" class="layui-input" placeholder="請輸入客戶料號" />
+                                    <input asp-for="WipAtt.EAN" class="layui-input" placeholder="請輸入EAN" />
                                 </div>
                             </div>
                         </div>
 
-
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.CS" class="layui-form-label"></label>
+                                <label asp-for="WipInfo.WipScheduleDate" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.CS" class="layui-input" placeholder="請輸入CS" />
+                                    <input asp-for="WipInfo.WipScheduleDate" class="layui-input" />
+                                    <span asp-validation-for="WipInfo.WipScheduleDate" class="text-danger"></span>
                                 </div>
-
-                                <label asp-for="WipAtt.ModelNO" class="layui-form-label"></label>
+                                <label asp-for="WipInfo.WipDueDate" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ModelNO" class="layui-input" placeholder="請輸入機種" />
+                                    <input asp-for="WipInfo.WipDueDate" class="layui-input" />
+                                    <span asp-validation-for="WipInfo.WipDueDate" class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
 
+                    </div>
 
+                    @* 生產流程sheet *@
+                    <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.EAN" class="layui-form-label"></label>
+                                <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.EAN" class="layui-input" placeholder="請輸入EAN" />
+                                    <input asp-for="WipInfo.FlowRuleID" class="layui-input" placeholder="請輸入流程ID" />
+                                    <span asp-validation-for="WipInfo.FlowRuleID" class="text-danger"></span>
                                 </div>
+                            </div>
+                        </div>
+                    </div>
 
-                                <label asp-for="WipInfo.WipScheduleDate" class="layui-form-label"></label>
+                    @* 序號編碼sheet *@
+                    <div class="layui-tab-item">
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">工單序號</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipScheduleDate" class="layui-input" />
-                                    <span asp-validation-for="WipInfo.WipScheduleDate" class="text-danger"></span>
+                                    <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入工單序號" />
                                 </div>
-
-                                <label asp-for="WipInfo.WipDueDate" class="layui-form-label"></label>
+                                <label class="layui-form-label">出貨序號</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipDueDate" class="layui-input" />
-                                    <span asp-validation-for="WipInfo.WipDueDate" class="text-danger"></span>
+                                    <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入出貨序號" />
                                 </div>
                             </div>
                         </div>
                     </div>
-                    @* 單板-工程資訊sheet *@
+
+                    @* Keypart組合sheet *@
+                    <div class="layui-tab-item">
+                    </div>
+
+                    @* 板卡-工程資訊sheet *@
                     <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <div class="layui-inline">
@@ -273,7 +271,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">PLM參考</label>
                             <div class="layui-input-block">
-                                <input asp-for="WipInfo.WipNO" class="layui-input"  />
+                                <input asp-for="WipInfo.WipNO" class="layui-input" />
                             </div>
                         </div>
 
@@ -380,7 +378,7 @@
                             </div>
                         </div>
 
-                        <div class="layui-form-item">
+                        @*<div class="layui-form-item">
                             <div class="layui-inline">
                                 <label asp-for="WipAtt.ItemNO" class="layui-form-label">OS</label>
                                 <div class="layui-input-inline">
@@ -408,7 +406,7 @@
                                     <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
                                 </div>
                             </div>
-                        </div>
+                        </div>*@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
@@ -437,7 +435,8 @@
                             </div>
                         </div>
                     </div>
-                    @* 單板-工程資訊sheet *@
+
+                    @* 系統-工程資訊sheet *@
                     <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <div class="layui-inline">
@@ -747,6 +746,10 @@
                             </div>
                         </div>
                     </div>
+
+                    @* 標籤選項sheet *@
+                    <div class="layui-tab-item">
+                    </div>
                 </div>
             </div>