diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index ff62e0a9..05cffe7b 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -2230,7 +2230,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> FQC012DAsync(string inhouseNo, int seq)
         {
-            var result = await _fqcApi.DeleteFqcInhouseDetail(inhouseNo);
+            var result = await _fqcApi.DeleteFqcInhouseDetail(inhouseNo, seq);
 
             var resultMaster = await _fqcApi.DeleteFqcInhouseMaster(inhouseNo, seq);
 
diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 577f39ff..94fbed14 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -8153,10 +8153,14 @@ namespace AMESCoreStudio.Web.Controllers
                             {
                                 if (SopVer.Msg == "N")
                                 {
-                                    var GetSopVer = await _pcsApi.GetDocEsopViewByNo(item.SOPName);
-                                    if (GetSopVer.Count != 0)
+                                    ViewBag.SOPVer = _configuration["SOPVer"];
+                                    if (ViewBag.SOPVer == null)
                                     {
-                                        item.SOPVer = GetSopVer.FirstOrDefault().document_version;
+                                        var GetSopVer = await _pcsApi.GetDocEsopViewByNo(item.SOPName);
+                                        if (GetSopVer.Count != 0)
+                                        {
+                                            item.SOPVer = GetSopVer.FirstOrDefault().document_version;
+                                        }
                                     }
                                 }
                             }
diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index 9ffa6aa5..26464800 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -773,7 +773,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
             if (!string.IsNullOrWhiteSpace(factoryNo))
-                LineItems = LineItems.Where(w => w.Text == factoryNo).ToList();
+                LineItems = LineItems.Where(w => w.Text.ToUpper().Trim().Contains(factoryNo.Trim().ToUpper())).ToList();
 
             ViewBag.LineList = LineItems;
         }
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
index e656acdc..0635fe5c 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
@@ -607,8 +607,8 @@ namespace AMESCoreStudio.Web
         /// 刪除FQC 表身
         /// </summary>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpDelete("api/FqcInhouseDetail/{id}")]
-        ITask<ResultModel<string>> DeleteFqcInhouseDetail(string id);
+        [WebApiClient.Attributes.HttpDelete("api/FqcInhouseDetail/{no}/{seq}")]
+        ITask<ResultModel<string>> DeleteFqcInhouseDetail(string no, int seq);
 
         #endregion
     }
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
index ef396398..b98c0c34 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
@@ -494,9 +494,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.SmdSolderMask" />
+                                    <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.SmdSolderMask" />
                                 </div>
                             </div>
                         </div>
@@ -512,7 +521,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>
@@ -533,7 +545,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">
@@ -546,7 +561,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>
@@ -562,7 +580,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 disabled asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
@@ -722,7 +743,7 @@
                             </div>
                         </div>
 
-                         <div class="layui-form-item">
+                        <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
                                 <div class="layui-input-inline" style="width:80px;">
@@ -866,7 +887,10 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">FINE_PACKAGE</label>
                                 <div class="layui-input-inline">
-                                    <input type="checkbox" title="是否為精裝" @if (Model.wipSystem != null) { @(Model.wipSystem.FinePackage == "Y" ? "checked" : "") } />
+                                    <input type="checkbox" title="是否為精裝" @if (Model.wipSystem != null)
+                                    {
+                                        @(Model.wipSystem.FinePackage == "Y" ? "checked" : "")
+                                    } />
 
                                 </div>
                             </div>
@@ -966,6 +990,7 @@
                                     @*<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>*@
                                     <th lay-data="{field:'sign'}">SOP類型</th>
                                     <th lay-data="{field:'sign'}">生產單位</th>
+                                    <th lay-data="{field:'sign'}">SOP版本</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -973,18 +998,20 @@
                                 {
                                     <tr>
                                         <td>
-
                                             @index.SOPName
                                         </td>
                                         @*<td>
-                                                @index.SOPPath
-                                            </td>*@
+                                    @index.SOPPath
+                                    </td>*@
                                         <td>
                                             @index.SOPTypeName
                                         </td>
                                         <td>
                                             @index.UnitNoName
                                         </td>
+                                        <td>
+                                            @index.SOPVer
+                                        </td>
                                     </tr>
                                     l++;
                                 }
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index de4a1fa2..c735d5ba 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -1021,6 +1021,9 @@
                                     <th>
                                         生產單位
                                     </th>
+                                    <th>
+                                        SOP版本
+                                    </th>
                                     <th>
 
                                     </th>
@@ -1043,6 +1046,9 @@
                                         <td>
                                             <select asp-for="@index.UnitNo" name="WipSops[@i].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
                                         </td>
+                                        <td>
+                                            <input onfocus="this.blur()" class="layui-input" asp-for="@index.SOPVer" name="WipSops[@i].SOPVer" />
+                                        </td>
                                         <td>
                                             <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
                                         </td>
@@ -1748,6 +1754,7 @@
                 /*                '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPPath" /></td>' +*/
                 '<td>' + SelectSOPType + '</td>' +
                 '<td>' + Select + '</td>' +
+                '<td> <input onfocus="this.blur()" class="layui-input" name="WipSops[' + No + '].SOPVer" /></td>' +
                 '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
                 '</tr>';
             $('#SopTable').append(contactdiv);
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
index c7dbf3cb..29feeda1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
@@ -1004,6 +1004,9 @@
                                     <th>
                                         生產單位
                                     </th>
+                                    <th>
+                                        SOP版本
+                                    </th>
                                     <th>
 
                                     </th>
@@ -1026,6 +1029,9 @@
                                         <td>
                                             <select asp-for="@index.UnitNo" name="WipSops[@i].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
                                         </td>
+                                        <td>
+                                            <input onfocus="this.blur()" class="layui-input" asp-for="@index.SOPVer" name="WipSops[@i].SOPVer" />
+                                        </td>
                                         <td>
                                             <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
                                         </td>
@@ -1639,6 +1645,7 @@
                 /*   '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPPath" /></td>' +*/
                 '<td>' + SelectSOPType + '</td>' +
                 '<td>' + Select + '</td>' +
+                '<td> <input onfocus="this.blur()" class="layui-input" name="WipSops[' + No + '].SOPVer" /></td>' +
                 '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
                 '</tr>';
             $('#SopTable').append(contactdiv);
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
index bfb7f2c3..dbf7e42d 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
@@ -267,18 +267,23 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
-        // DELETE: api/FqcInhouseDetail/5
-        [HttpDelete("{id}")]
-        public async Task<ActionResult<FqcInhouseDetail>> DeleteFqcInhouseDetail(string id)
+        /// <summary>
+        /// 刪除入庫單
+        /// </summary>
+        /// <param name="no">入庫單號</param>
+        /// <param name="seq">順序</param>
+        /// <returns></returns>
+        [HttpDelete("{no}/{seq}")]
+        public async Task<ActionResult<FqcInhouseDetail>> DeleteFqcInhouseDetail(string no, int seq)
         {
             ResultModel<FqcInhouseDetail> result = new ResultModel<FqcInhouseDetail>();
 
-            var fqcInhouseDetail = await _context.FqcInhouseDetails.Where(p => p.InhouseNo == id).FirstOrDefaultAsync();
+            var fqcInhouseDetail = await _context.FqcInhouseDetails.Where(p => p.InhouseNo == no && p.SeqID == seq).FirstOrDefaultAsync();
             if (fqcInhouseDetail == null)
-               {
-                  
-                    return fqcInhouseDetail;
-               }
+            {
+
+                return fqcInhouseDetail;
+            }
 
             _context.FqcInhouseDetails.Remove(fqcInhouseDetail);
             await _context.SaveChangesAsync();
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs
index 494ad07c..1ec33548 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs
@@ -78,6 +78,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         SOPPath = q1.SOPPath,
                         SOPType = q1.SOPType,
                         UnitNo = q1.UnitNo,
+                        SOPVer = q1.SOPVer,
                         UnitNoName = q2.UnitName,
                         UpdateTime = q1.UpdateDate
                     };