diff --git a/AMESCoreStudio.Web/Views/JIG/JIG004C.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG004C.cshtml
index ebc1aeaa..377c2b9b 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG004C.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG004C.cshtml
@@ -69,7 +69,7 @@
                 <select asp-for="VendorID" asp-items="@ViewBag.VendorList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
-                <span asp-validation-for="CommodityID" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="VendorID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="ModelNo" class="control-label col-sm-3"></label>
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 6fd0c628..19c564a5 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -250,14 +250,14 @@
                                     <tbody>
                                         @foreach (var index in Model.wipBarcodes)
                                         {
-                                        <tr>
-                                            <td>
-                                                @index.StartNO
-                                            </td>
-                                            <td>
-                                                @index.EndNO
-                                            </td>
-                                        </tr>
+                                            <tr>
+                                                <td>
+                                                    @index.StartNO
+                                                </td>
+                                                <td>
+                                                    @index.EndNO
+                                                </td>
+                                            </tr>
                                         }
                                     </tbody>
                                 </table>
@@ -273,7 +273,7 @@
                                 <div class="layui-input-inline" style="width:130px">
                                     <input asp-for="wipBarcodeOther.EndNO" class="layui-input" readonly="readonly" />
                                 </div>
-                                <div class="layui-input-inline" style="width:130px;display:none">
+                                <div class="layui-input-inline" style="width:130px;" id="divDeleteBarcodeOther">
                                     <input id="DeleteBarcodeOther" class="layui-btn layui-btn-primary layui-border-red layui-btn-sm" type="button" value="刪除出貨序號" />
                                 </div>
 
@@ -309,14 +309,14 @@
                                     <tbody>
                                         @foreach (var index in Model.wipMACs)
                                         {
-                                        <tr>
-                                            <td>
-                                                @index.Title@index.StartNO
-                                            </td>
-                                            <td>
-                                                @index.Title@index.EndNO
-                                            </td>
-                                        </tr>
+                                            <tr>
+                                                <td>
+                                                    @index.Title@index.StartNO
+                                                </td>
+                                                <td>
+                                                    @index.Title@index.EndNO
+                                                </td>
+                                            </tr>
                                         }
                                     </tbody>
                                 </table>
@@ -381,30 +381,30 @@
                             <tbody>
                                 @foreach (var index in Model.WipKps)
                                 {
-                                <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>
-                                        <select asp-for="@index.KpNo" name="WipKps[@k].KpNo" asp-items="@ViewBag.ItemsList" class=""></select>
-                                    </td>
-                                    <td>
-                                        <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.KpSeq" name="WipKps[@k].KpSeq" />
-                                    </td>
-                                    <td>
-                                        <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.Title" name="WipKps[@k].Title" />
-                                    </td>
-                                    <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>
-                                </tr>
+                                    <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>
+                                            <select asp-for="@index.KpNo" name="WipKps[@k].KpNo" asp-items="@ViewBag.ItemsList" class=""></select>
+                                        </td>
+                                        <td>
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.KpSeq" name="WipKps[@k].KpSeq" />
+                                        </td>
+                                        <td>
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.Title" name="WipKps[@k].Title" />
+                                        </td>
+                                        <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>
+                                    </tr>
                                     k++;
                                 }
                             </tbody>
@@ -455,11 +455,11 @@
                                     <input asp-for="itemNoCT1" type="hidden" value="@Model.itemNoCT1" />
                                     @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
                                     {
-                                    <span style="color:red">有維護標準工時</span>
+                                        <span style="color:red">有維護標準工時</span>
                                     }
                                     else
                                     {
-                                    <span style="color:red">**無維護標準工時**</span>
+                                        <span style="color:red">**無維護標準工時**</span>
                                     }
                                 </div>
                             </div>
@@ -502,9 +502,18 @@
                                 <label class="layui-form-label">DIP</label>
                                 <div class="layui-input-block">
                                     <cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "")     } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "")     } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "")     } type="checkbox" title="點防焊膠" name="wipBoard.DipSolderMask" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "")
+                                    } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.DipTape == "Y" ? "checked" : "")
+                                    } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "")
+                                    } type="checkbox" title="點防焊膠" name="wipBoard.DipSolderMask" />
                                 </div>
                             </div>
                         </div>
@@ -520,7 +529,10 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">燒錄</label>
                                 <div class="layui-input-inline">
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "")     } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.Burn == "Y" ? "checked" : "")
+                                    } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
                                 </div>
 
                                 <label class="layui-form-label">燒機位置</label>
@@ -541,7 +553,10 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">零件烘烤</label>
                                 <div class="layui-input-inline">
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "")     } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "")
+                                    } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
                                 </div>
                                 <label class="layui-form-label">零件烘烤溫度</label>
                                 <div class="layui-input-inline" style="width:100px">
@@ -554,7 +569,10 @@
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.PartsBakeOvertime == "Y" ? "checked" : "")     } type="checkbox" title="零件烘烤超過48hrs" name="wipBoard.PartsBakeOvertime" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.PartsBakeOvertime == "Y" ? "checked" : "")
+                                    } type="checkbox" title="零件烘烤超過48hrs" name="wipBoard.PartsBakeOvertime" />
                                 </div>
                             </div>
                         </div>
@@ -570,7 +588,10 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">PCB烘烤</label>
                                 <div class="layui-input-inline">
-                                    <input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPcbBake == "Y" ? "checked" : "")     } type="checkbox" title="PCB是否需要烘烤" name="wipBoard.ISPcbBake" />
+                                    <input @if (Model.wipBoard != null)
+                                    {
+                                        @(Model.wipBoard.ISPcbBake == "Y" ? "checked" : "")
+                                    } type="checkbox" title="PCB是否需要烘烤" name="wipBoard.ISPcbBake" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
@@ -700,11 +721,11 @@
                                     <input asp-for="itemNoCT1" type="hidden" value="@Model.itemNoCT1" />
                                     @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
                                     {
-                                    <span style="color:red">有維護標準工時</span>
+                                        <span style="color:red">有維護標準工時</span>
                                     }
                                     else
                                     {
-                                    <span style="color:red">**無維護標準工時**</span>
+                                        <span style="color:red">**無維護標準工時**</span>
                                     }
                                 </div>
                             </div>
@@ -876,7 +897,10 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">FINE_PACKAGE</label>
                                 <div class="layui-input-inline">
-                                    <input @if (Model.wipSystem != null) { @(Model.wipSystem.FinePackage == "Y" ? "checked" : "")     } type="checkbox" title="是否為精裝" name="wipSystem.FinePackage" />
+                                    <input @if (Model.wipSystem != null)
+                                    {
+                                        @(Model.wipSystem.FinePackage == "Y" ? "checked" : "")
+                                    } type="checkbox" title="是否為精裝" name="wipSystem.FinePackage" />
                                 </div>
                             </div>
                         </div>
@@ -950,23 +974,23 @@
                             <tbody>
                                 @foreach (var index in Model.WipOutfits)
                                 {
-                                <tr>
+                                    <tr>
 
-                                    <td>
-                                        <input name="WipOutfits[@l].WipOutfitID" type="hidden" value="@index.WipOutfitID" />
-                                        <select asp-for="@index.PartNo" name="WipOutfits[@l].PartNo" asp-items="@ViewBag.OutfitCommodityInfo" class=""></select>
-                                    </td>
-                                    <td>
-                                        <select asp-for="@index.UnitNo" name="WipOutfits[@l].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
-                                    </td>
-
-                                    <td>
-                                        <select asp-for="@index.StationID" name="WipOutfits[@l].StationID" asp-items="@ViewBag.RuleStationByWipNoUnitNoList" class=""></select>
-                                    </td>
-                                    <td>
-                                        <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
-                                    </td>
-                                </tr>
+                                        <td>
+                                            <input name="WipOutfits[@l].WipOutfitID" type="hidden" value="@index.WipOutfitID" />
+                                            <select asp-for="@index.PartNo" name="WipOutfits[@l].PartNo" asp-items="@ViewBag.OutfitCommodityInfo" class=""></select>
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.UnitNo" name="WipOutfits[@l].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
+                                        </td>
+
+                                        <td>
+                                            <select asp-for="@index.StationID" name="WipOutfits[@l].StationID" asp-items="@ViewBag.RuleStationByWipNoUnitNoList" class=""></select>
+                                        </td>
+                                        <td>
+                                            <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
+                                        </td>
+                                    </tr>
                                     l++;
                                 }
                             </tbody>
@@ -987,8 +1011,8 @@
                                         SOP文件敘述
                                     </th>
                                     @*<th>
-                                        檔案路徑
-                                        </th>*@
+                                    檔案路徑
+                                    </th>*@
                                     <th>
                                         SOP類型
                                     </th>
@@ -1003,24 +1027,24 @@
                             <tbody>
                                 @foreach (var index in Model.WipSops)
                                 {
-                                <tr>
-                                    <td>
-                                        <input name="WipSops[@i].WipSOPID" type="hidden" value="@index.WipSOPID" />
-                                        <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPName" name="WipSops[@i].SOPName" />
-                                    </td>
-                                    @*<td>
-                                        <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPPath" name="WipSops[@i].SOPPath" />
-                                        </td>*@
-                                    <td>
-                                        <select asp-for="@index.SOPType" name="WipSops[@i].SOPType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select>
-                                    </td>
-                                    <td>
-                                        <select asp-for="@index.UnitNo" name="WipSops[@i].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>
-                                </tr>
+                                    <tr>
+                                        <td>
+                                            <input name="WipSops[@i].WipSOPID" type="hidden" value="@index.WipSOPID" />
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPName" name="WipSops[@i].SOPName" />
+                                        </td>
+                                        @*<td>
+                                    <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPPath" name="WipSops[@i].SOPPath" />
+                                    </td>*@
+                                        <td>
+                                            <select asp-for="@index.SOPType" name="WipSops[@i].SOPType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select>
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.UnitNo" name="WipSops[@i].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>
+                                    </tr>
                                     i++;
                                 }
                             </tbody>
@@ -1092,23 +1116,23 @@
                                 <tbody>
                                     @foreach (var index in Model.wipInfoBlobs)
                                     {
-                                    <tr>
-                                        <td>
-                                            <span id="FileName">@index.ImageName</span>
-                                        </td>
-                                        <td>
-                                            <span id="Filepath">@index.Filepath</span>
-                                        </td>
-                                        <td>
-                                            <span id="Remark">@index.Remark</span>
+                                        <tr>
+                                            <td>
+                                                <span id="FileName">@index.ImageName</span>
+                                            </td>
+                                            <td>
+                                                <span id="Filepath">@index.Filepath</span>
+                                            </td>
+                                            <td>
+                                                <span id="Remark">@index.Remark</span>
 
-                                        </td>
-                                        <td>
-                                            <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
-                                            <a class="layui-btn layui-btn-normal layui-btn-xs" onclick="filedownload(this)">下載</a>
-                                            <a class="layui-btn layui-btn-normal layui-btn-xs layui-btn-danger" onclick="deleteFile(this)">刪除</a>
-                                        </td>
-                                    </tr>
+                                            </td>
+                                            <td>
+                                                <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
+                                                <a class="layui-btn layui-btn-normal layui-btn-xs" onclick="filedownload(this)">下載</a>
+                                                <a class="layui-btn layui-btn-normal layui-btn-xs layui-btn-danger" onclick="deleteFile(this)">刪除</a>
+                                            </td>
+                                        </tr>
                                     }
                                 </tbody>
                             </table>
@@ -1177,11 +1201,13 @@
             }
 
             // DIV 出貨序號
-            //if ($('#wipBarcodeOther_StartNO').val() != "" && $('#wipBarcodeOther_EndNO').val() != "") {
-            //    $("#barcodeOtherDiv").hide();
-            //}
-
+            if ($('#wipBarcodeOther_StartNO').val() != "" && $('#wipBarcodeOther_EndNO').val() != "") {
+                $("#divDeleteBarcodeOther").show();
+            }
+            else
+                $("#divDeleteBarcodeOther").hide();
 
+         
             // DIV keyPartsExcel
         @if (Model.wipInfo.WipNO.StartsWith("981"))
         {
@@ -1258,6 +1284,7 @@
                                 else {
                                     $("#wipBarcodeOther_StartNO").val(result.data.startNO);
                                     $("#wipBarcodeOther_EndNO").val(result.data.endNO);
+                                    $("#divDeleteBarcodeOther").show();
                                 }
                             },
                             error: function (jqXHR, textStatus, errorThrown) {
@@ -1282,6 +1309,7 @@
                             else {
                                 $("#wipBarcodeOther_StartNO").val(result.data.startNO);
                                 $("#wipBarcodeOther_EndNO").val(result.data.endNO);
+                                $("#divDeleteBarcodeOther").show();
                             }
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
@@ -1312,6 +1340,7 @@
                             else {
                                 $("#wipBarcodeOther_StartNO").val('');
                                 $("#wipBarcodeOther_EndNO").val('');
+                                $("#divDeleteBarcodeOther").hide();
                             }
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
@@ -1346,7 +1375,7 @@
                         else {
                             var contactdiv = '<tr>' +
                                 `<td>${data.mix}</td>
-                                                                                                            <td>${data.max}</td></tr>`;
+                                                                                                                            <td>${data.max}</td></tr>`;
                             $('#MACTable').append(contactdiv);
                         }
                     },
@@ -1919,7 +1948,6 @@
                                 '</tr>';
                             $('#KPTable').append(contactdiv);
                             No += 1;
-
                         });
                         $('#WipKpCount').val(No);
                         layui.form.render("select");//重新渲染 固定写法
@@ -1943,6 +1971,7 @@
             $.ajax({
                 url: "@Url.Action("FQC007GetPLMECN", "FQC")",
                 type: "Post",
+                async: true,
                 data: { "ItemNo": '@Model.wipAtt.ItemNO' },
                 success: function (result) {
                     if (result.success) {
@@ -1958,7 +1987,8 @@
                             })
                         }
                         else {
-                            parent.hg.msg(result.msg);
+                            hg.msghide("不需要更新！");
+                            //parent.hg.msg(result.msg);
                         }
                     }
                 },