diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index 87a69228..cfee432e 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -473,7 +473,7 @@ namespace AMESCoreStudio.Web.Controllers
                         {
                             stationList = stationList + rule_sation[j].StationID + ",";
 
-                            wipDataList = wipDataList + "<td width='150' style='text-align:left'>" + rule_sation[j].Station.StationName + "</td>";
+                            wipDataList = wipDataList + "<td width='150' style='text-align:left'>" + rule_sation[j].Station.StationName + "</td><td></td>";
 
                             var wip_station = await _pcsApi.GetWipStation4QRS009Group(wip_id, rule_sation[j].StationID);
 
@@ -512,7 +512,7 @@ namespace AMESCoreStudio.Web.Controllers
                             }
 
                             //stationQty = stationQty + "<td width='150' style='text-align:left'><a href=\"javascript:hg.open('過站PASS條碼資料','/QRS/QRS009P/" + wip_id + "_" + rule_sation[j].RuleStationID + "','','',true);\">" + okQty + "</a>/<a href=\"javascript:hg.open('過站FAIL條碼資料','/QRS/QRS009F','','',true);\">" + ngQty + "</a></td>";
-                            stationQty = stationQty + "<td width='150' style='text-align:left'><a href=\"javascript:hg.open('過站PASS條碼資料','/QRS/QRS009P/" + wip_id + "_" + rule_sation[j].StationID + "',800,600);\">" + okQty + "</a>/<a href=\"javascript:hg.open('過站FAIL條碼資料','/QRS/QRS009F/" + wip_id + "_" + rule_sation[j].StationID + "',800,600);\">" + ngQty + "</a></td>";
+                            stationQty = stationQty + "<td width='150' style='text-align:left'><a href=\"javascript:hg.open('過站PASS條碼資料','/QRS/QRS009P/" + wip_id + "_" + rule_sation[j].StationID + "',800,600);\">" + okQty + "</a>/<a href=\"javascript:hg.open('過站FAIL條碼資料','/QRS/QRS009F/" + wip_id + "_" + rule_sation[j].StationID + "',800,600);\">" + ngQty + "</a></td><td></td>";
 
                             double rate = ((okQty * 1.0) / (okQty + ngQty)) * 100;
 
@@ -521,7 +521,7 @@ namespace AMESCoreStudio.Web.Controllers
                                 rate = 100;
                             }
 
-                            if (j == rule_sation.Count - 2)
+                            if (j == rule_sation.Count - 1)
                             {
                                 if (rate <= 90)
                                 {
@@ -638,7 +638,7 @@ namespace AMESCoreStudio.Web.Controllers
                         {
                             wip_qty = 0;
                         }
-                        stationWip = stationWip + "<td width='150' style='text-align:left'><a href=\"javascript:hg.open('在製條碼資料','/QRS/QRS009W/" + wip_id + "_" + station_list[j] + "',800,600);\">" + wip_qty + "</a></td>";
+                        stationWip = stationWip + "<td width='150' style='text-align:left'><a href=\"javascript:hg.open('在製條碼資料','/QRS/QRS009W/" + wip_id + "_" + station_list[j] + "',800,600);\">" + wip_qty + "</a></td><td></td>";
                     }
 
                     stationWip = stationWip + "</tr></table><br/>";
@@ -648,7 +648,6 @@ namespace AMESCoreStudio.Web.Controllers
                     wipDataList = wipDataList + stationQty;
                     wipDataList = wipDataList + stationRate;
                     wipDataList = wipDataList + stationWip;
-
                 }
             }
             else
diff --git a/AMESCoreStudio.Web/Views/QRS/QRS011A.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS011A.cshtml
index 42ec4686..d7ffe500 100644
--- a/AMESCoreStudio.Web/Views/QRS/QRS011A.cshtml
+++ b/AMESCoreStudio.Web/Views/QRS/QRS011A.cshtml
@@ -12,6 +12,59 @@
         </div>
     </div>
     <div class="layui-card-body">
-        @Html.Raw(ViewData["WipDataList"])
+        <button type="button" onclick="tableToExcel('wiplist','生產進度')" class="layui-btn layui-btn-normal layui-btn-sm"><i class="fa fa-file-excel-o"></i>導出Excel</button>
+        <br />
+        <table id="wiplist">
+            <tr>
+                <td>@Html.Raw(ViewData["WipDataList"])</td>
+            </tr>
+        </table>
     </div>
 </div>
+
+
+<script type="text/javascript">
+
+    function formatJSONDate(jsonDate) {
+        if (jsonDate == null) {
+            return "";
+        }
+        else {
+            var date = eval(jsonDate.replace(/\/Date\((\d+)\)\//gi, "new Date($1)"));
+            var myDate = new Date(date);
+            var yy = myDate.getFullYear();
+            var mm = (myDate.getMonth() + 1 < 10 ? '0' : '') + (myDate.getMonth() + 1);
+            var dd = (myDate.getDate() < 10 ? '0' : '') + myDate.getDate();
+            var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
+            var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
+            var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
+            //mm + "/" + dd + " " +
+            //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
+            var output = yy + mm + dd + h + m + s;
+            // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
+            return output;
+        }
+    }
+
+    function base64(content)
+    {
+       return window.btoa(unescape(encodeURIComponent(content)));
+    }
+
+    function tableToExcel(tableID, fileName) {
+        var table = document.getElementById(tableID);
+        var excelContent = table.innerHTML;
+        var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>";
+        excelFile += "<head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head>";
+        excelFile += "<body><table>";
+        excelFile += excelContent;
+        excelFile += "</table></body>";
+        excelFile += "</html>";
+        var link = "data:application/vnd.ms-excel;base64," + base64(excelFile);
+        var a = document.createElement("a");
+        a.download = fileName + formatJSONDate(Date.now().toString()) + ".xls";
+        a.href = link;
+        a.click();
+    }
+
+</script>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
index f08a4ca6..394cb32b 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
@@ -384,8 +384,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     {
                         for (int i = 0; i < oldBarcodeItem.Count; i++)
                         {
-                            _context.BarcodeItems.Remove(oldBarcodeItem[i]);
-                            await _context.SaveChangesAsync();
+                            try
+                            {
+                                _context.BarcodeItems.Remove(oldBarcodeItem[i]);
+                                await _context.SaveChangesAsync();
+                            }
+                            catch { }
                         }
                     }