diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index 38c1dc46..9ffa6aa5 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -12,6 +12,7 @@ using AMESCoreStudio.Web.ViewModels.QRS;
 using System.Linq;
 using AMESCoreStudio.WebApi.DTO.AMES;
 using AMESCoreStudio.WebApi.Models.BAS;
+using System;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -1489,151 +1490,159 @@ namespace AMESCoreStudio.Web.Controllers
         {
             ViewData["Title"] = "查詢條件 - 工單號碼 : " + wipNO;
 
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS017(wipNO);
-
             string kpDataList = "<font size='3'>";
-            if (result.DataTotal > 0)
+
+            try
             {
-                kpDataList = kpDataList + "<table id = 'kplist' border = '1' width='100%' cellspacing='2px' cellpadding='10px'>";
+                IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS017(wipNO);
 
-                bool titleFlag = true;
-                foreach (var item in result.Data)
+                if (result.DataTotal > 0)
                 {
-                    JObject jo = JObject.Parse(item.ToString());
-                    JProperty[] jp = jo.Properties().ToArray();
-                    if (titleFlag)
+                    kpDataList = kpDataList + "<table id = 'kplist' border = '1' width='100%' cellspacing='2px' cellpadding='10px'>";
+
+                    bool titleFlag = true;
+                    foreach (var item in result.Data)
                     {
-                        //jo.Properties().ToArray()[0].Name
-                        kpDataList = kpDataList + "<tr bgcolor='#66CCFF' height='30'>";
-                        for (int i = 0; i < jp.Length; i++)
+                        JObject jo = JObject.Parse(item.ToString());
+                        JProperty[] jp = jo.Properties().ToArray();
+                        if (titleFlag)
                         {
-                            switch (i)
+                            //jo.Properties().ToArray()[0].Name
+                            kpDataList = kpDataList + "<tr bgcolor='#66CCFF' height='30'>";
+                            for (int i = 0; i < jp.Length; i++)
                             {
-                                case 0:
-                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
-                                    break;
-                                case 1:
-                                    kpDataList = kpDataList + "<td style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
-                                    break;
-                                case 2:
-                                    kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
-                                    break;
-                                case 3:
-                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
-                                    break;
-                                case 4:
-                                    kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
-                                    break;
-                                default:
-                                    string kp_name = jp[i].Name.Replace("kP_", "");
-                                    int kp_idx = kp_name.IndexOf("#");
-                                    if (kp_idx > 0)
-                                    {
-                                        if (kp_name.StartsWith("MB") && kp_name.IndexOf("MAC") > 0)
+                                switch (i)
+                                {
+                                    case 0:
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        break;
+                                    case 1:
+                                        kpDataList = kpDataList + "<td style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        break;
+                                    case 2:
+                                        kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        break;
+                                    case 3:
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        break;
+                                    case 4:
+                                        kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        break;
+                                    default:
+                                        string kp_name = jp[i].Name.Replace("kP_", "");
+                                        int kp_idx = kp_name.IndexOf("#");
+                                        if (kp_idx > 0)
                                         {
-                                            string kp_no = kp_name.Replace("#", "_");
-                                            var kp_item = await _kcsApi.GetItems(kp_no);
-                                            if (kp_item.Count > 0)
+                                            if (kp_name.StartsWith("MB") && kp_name.IndexOf("MAC") > 0)
                                             {
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                                string kp_no = kp_name.Replace("#", "_");
+                                                var kp_item = await _kcsApi.GetItems(kp_no);
+                                                if (kp_item.Count > 0)
+                                                {
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                                }
+                                                else
+                                                {
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_no + "</td>";
+                                                }
                                             }
                                             else
                                             {
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_no + "</td>";
+                                                string kp_no = kp_name.Substring(0, kp_idx);
+                                                var kp_item = await _kcsApi.GetItems(kp_no);
+                                                if (kp_item.Count > 0)
+                                                {
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                                }
+                                                else
+                                                {
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_no + "</td>";
+                                                }
                                             }
                                         }
                                         else
                                         {
-                                            string kp_no = kp_name.Substring(0, kp_idx);
-                                            var kp_item = await _kcsApi.GetItems(kp_no);
+                                            var kp_item = await _kcsApi.GetItems(kp_name);
                                             if (kp_item.Count > 0)
                                             {
                                                 kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
                                             }
                                             else
                                             {
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_no + "</td>";
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
                                             }
+
                                         }
-                                    }
-                                    else
-                                    {
-                                        var kp_item = await _kcsApi.GetItems(kp_name);
-                                        if (kp_item.Count > 0)
+                                        /*
+                                        if (kp_name.IndexOf("_") > 0)
                                         {
-                                            kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                            if (kp_name.StartsWith("MB") && kp_name.IndexOf("MAC") > 0)
+                                            {
+
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
+                                            }
+                                            else
+                                            {
+                                                int idx = kp_name.IndexOf("_");
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name.Substring(0, idx) + "</td>";
+                                            }
                                         }
                                         else
                                         {
                                             kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
                                         }
-                                        
-                                    }
-                                    /*
-                                    if (kp_name.IndexOf("_") > 0)
-                                    {
-                                        if (kp_name.StartsWith("MB") && kp_name.IndexOf("MAC") > 0)
-                                        {
+                                        */
 
-                                            kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
-                                        }
-                                        else
-                                        {
-                                            int idx = kp_name.IndexOf("_");
-                                            kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name.Substring(0, idx) + "</td>";
-                                        }
-                                    }
-                                    else
-                                    {
-                                        kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
-                                    }
-                                    */
+                                        break;
+                                }
 
+                                //kpDataList = kpDataList + "<td>" + jp[i].Name + "</td>";
+                            }
+                            kpDataList = kpDataList + "</tr>";
+                            titleFlag = false;
+                        }
+                        kpDataList = kpDataList + "<tr height='30'>";
+                        for (int i = 0; i < jp.Length; i++)
+                        {
+                            switch (i)
+                            {
+                                case 0:
+                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    break;
+                                case 1:
+                                    kpDataList = kpDataList + "<td style = 'text-align:left'>&nbsp;'" + jp[i].Value + "</td>";
+                                    break;
+                                case 2:
+                                    kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    break;
+                                case 3:
+                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    break;
+                                case 4:
+                                    kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    break;
+                                default:
+                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
                                     break;
                             }
 
-                            //kpDataList = kpDataList + "<td>" + jp[i].Name + "</td>";
+
                         }
                         kpDataList = kpDataList + "</tr>";
-                        titleFlag = false;
-                    }
-                    kpDataList = kpDataList + "<tr height='30'>";
-                    for (int i = 0; i < jp.Length; i++)
-                    {
-                        switch (i)
-                        {
-                            case 0:
-                                kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
-                                break;
-                            case 1:
-                                kpDataList = kpDataList + "<td style = 'text-align:left'>&nbsp;'" + jp[i].Value + "</td>";
-                                break;
-                            case 2:
-                                kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
-                                break;
-                            case 3:
-                                kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
-                                break;
-                            case 4:
-                                kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
-                                break;
-                            default:
-                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
-                                break;
-                        }
-
 
+                        //string barcode_no = jo["barcodeno"].ToString();
+                        //kpDataList = kpDataList + "<tr><td>"+barcode_no+"</td><tr>";
                     }
-                    kpDataList = kpDataList + "</tr>";
-
-                    //string barcode_no = jo["barcodeno"].ToString();
-                    //kpDataList = kpDataList + "<tr><td>"+barcode_no+"</td><tr>";
+                    kpDataList = kpDataList + "</table>";
+                }
+                else
+                {
+                    kpDataList = kpDataList + "查無資料";
                 }
-                kpDataList = kpDataList + "</table>";
             }
-            else
+            catch (Exception e1)
             {
-                kpDataList = kpDataList + "查无资料";
+                kpDataList = kpDataList + "查詢過程超時:" + e1.Message;
             }
             kpDataList = kpDataList + "</font>";
             ViewData["KpDataList"] = kpDataList;