diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 87eca8b2..057cbe0a 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1429,7 +1429,7 @@ namespace AMESCoreStudio.Web.Controllers
                             Title = item.Title,
                             CreateUserID = UserID,
                             UpdateUserID = UserID
-                    };
+                        };
                         await _pcsApi.PostWipKp(JsonConvert.SerializeObject(wipKp));
                     }
 
@@ -1446,7 +1446,7 @@ namespace AMESCoreStudio.Web.Controllers
                             PartNo = item.StationType,
                             CreateUserID = UserID,
                             UpdateUserID = UserID
-                    };
+                        };
                         await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(wipOutfit));
                     }
 
@@ -1464,7 +1464,7 @@ namespace AMESCoreStudio.Web.Controllers
                             SOPType = item.SopType,
                             CreateUserID = UserID,
                             UpdateUserID = UserID
-                    };
+                        };
                         await _pcsApi.PostWipSop(JsonConvert.SerializeObject(wipSop));
                     }
                 }
@@ -3482,7 +3482,12 @@ namespace AMESCoreStudio.Web.Controllers
                     int i = 0;
                     foreach (var KeyPartItem in model.Inputs)
                     {
-
+                        if (i + KpItemQty > model.WipKps.Count())
+                        {
+                            Msg = "已刷超過組件數量";
+                            Success = false;
+                            return Json(new Result() { success = Success, msg = Msg, data = Data });
+                        }
                         keyParts.Add(new BarCodeCheckDto.inputItem
                         {
                             inputType = KeyPartItem.Contains("$") ? "NG" : model.WipKps[i + KpItemQty].KpNo,
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index c1c56275..3e61c246 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -233,47 +233,47 @@
                     @* 序號編碼sheet *@
                     <div class="layui-tab-item">
                         <label class="layui-form-label">生產序號</label>
-                            <table id="MydataTable" class="layui-table">
-                                <thead>
-                                    <tr>
-                                        <th>
-                                            起始生產序號
-                                        </th>
+                        <table id="MydataTable" class="layui-table">
+                            <thead>
+                                <tr>
+                                    <th>
+                                        起始生產序號
+                                    </th>
 
-                                        <th>
-                                            結束生產序號
-                                        </th>
+                                    <th>
+                                        結束生產序號
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach (var index in Model.wipBarcodes)
+                                {
+                                    <tr>
+                                        <td>
+                                            @index.StartNO
+                                        </td>
+                                        <td>
+                                            @index.EndNO
+                                        </td>
                                     </tr>
-                                </thead>
-                                <tbody>
-                                    @foreach (var index in Model.wipBarcodes)
-                                    {
-                                        <tr>
-                                            <td>
-                                                @index.StartNO
-                                            </td>
-                                            <td>
-                                                @index.EndNO
-                                            </td>
-                                        </tr>
-                                    }
-                                </tbody>
-                            </table>
+                                }
+                            </tbody>
+                        </table>
                         @*<div class="layui-form-item">
-                            <div class="layui-inline">
-                                <label class="layui-form-label">生產序號</label>
-                                <div class="layui-input-inline">
-                                    <input asp-for="wipBarcode.StartNO" class="layui-input" />
-                                </div>
-                                <div class="layui-form-mid">-</div>
-                                <div class="layui-input-inline">
-                                    <input asp-for="wipBarcode.EndNO" class="layui-input" />
-                                </div>
-                                <div class="layui-input-inline">
-                                    <input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" />
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">生產序號</label>
+                                    <div class="layui-input-inline">
+                                        <input asp-for="wipBarcode.StartNO" class="layui-input" />
+                                    </div>
+                                    <div class="layui-form-mid">-</div>
+                                    <div class="layui-input-inline">
+                                        <input asp-for="wipBarcode.EndNO" class="layui-input" />
+                                    </div>
+                                    <div class="layui-input-inline">
+                                        <input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" />
+                                    </div>
                                 </div>
-                            </div>
-                        </div>*@
+                            </div>*@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
@@ -1374,7 +1374,8 @@
             });
             SelectKPNo += '</select>';
             var contactdiv = '<tr>' +
-                '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' +
+                '<td><input type="hidden" value="" name="WipKps[' + No + '].WipKpID" />' +
+                '<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' +
                 '<td>'+SelectKPNo+'</td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' +
@@ -1400,7 +1401,8 @@
             });
             Select += '</select>';
             var contactdiv = '<tr>' +
-                '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' +
+                '<td><input type="hidden" value="" name="WipOutfits[' + No + '].WipOutfitID" />' +
+                '<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].PartNo" /></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>' +
@@ -1428,7 +1430,8 @@
             });
             SelectSOPType += '</select>';
             var contactdiv = '<tr>' +
-                '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPName" /></td>' +
+                '<td><input type="hidden" value="" name="WipSops[' + No + '].WipSOPID" />' +
+                '<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPName" /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPPath" /></td>' +
                 '<td>' + SelectSOPType + '</td>' +
                 '<td>' + Select + '</td>' +
@@ -1442,9 +1445,15 @@
          // Table 刪除
         function Remove(button) {
             //Determine the reference of the Row using the Button.
-            var row = $(button).closest("TR");
-            var table = $(button).closest("TABLE")[0]; //$("#KPTable")[0];
-            table.deleteRow(row[0].rowIndex);
+            hg.confirm("確認要刪除此筆資料嗎？", function () {
+                var row = $(button).closest("TR");
+                var id = $(button).closest("TR").find('input[type=hidden]').val();
+                var table = $(button).closest("TABLE")[0]; //$("#KPTable")[0];
+                $(button).closest("TR").find('input[type=hidden]').val(id + "_");
+                alert($(button).closest("TR").find('input[type=hidden]').val());
+                row.hide();
+            });
+            //table.deleteRow(row[0].rowIndex);
         };
 
         //生產單位選單
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
index 55f3658f..edf86d85 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
@@ -217,7 +217,7 @@
                                                             <input type="text" asp-for="@index.KpName" name="WipKps[@j].KpName" style="width:100px" readonly="readonly" />
                                                         </td>
                                                         <td>
-                                                            <select asp-for="@index.KpNo" name="WipKps[@j].KpNo" asp-items="@ViewBag.ItemsList" class=""></select>
+                                                            <select disabled asp-for="@index.KpNo" name="WipKps[@j].KpNo" asp-items="@ViewBag.ItemsList" class=""></select>
                                                         </td>
                                                         <td>
                                                             <input type="text" asp-for="@index.KpSeq" name="WipKps[@j].KpSeq" style="width:30px" readonly="readonly" />