diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 18fc7fdc..37e99389 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -423,16 +423,28 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                 string kp_no = dtKp.Rows[i]["KP_NO"].ToString();
                                 if (kp_qty > 1)
                                 {
-                                    dtBarcode.Columns.Add("KP_" + kp_no);
+                                    try
+                                    {
+                                        dtBarcode.Columns.Add("KP_" + kp_no);
+                                    }
+                                    catch { }
 
                                     for (int j = 1; j < kp_qty; j++)
                                     {
-                                        dtBarcode.Columns.Add("KP_" + kp_no + "_" + j.ToString());
+                                        try
+                                        {
+                                            dtBarcode.Columns.Add("KP_" + kp_no + "_" + j.ToString());
+                                        }
+                                        catch { }
                                     }
                                 }
                                 else
                                 {
-                                    dtBarcode.Columns.Add("KP_" + kp_no);
+                                    try
+                                    {
+                                        dtBarcode.Columns.Add("KP_" + kp_no);
+                                    }
+                                    catch { }
                                 }
                             }
                             dtBarcode.AcceptChanges();
@@ -469,7 +481,11 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                     }
                                                     catch
                                                     {
-                                                        dtBarcode.Rows[i]["KP_" + kp_no] = part_no;
+                                                        try
+                                                        {
+                                                            dtBarcode.Rows[i]["KP_" + kp_no] = part_no;
+                                                        }
+                                                        catch { }
                                                     }
 
                                                     dtBarcode.AcceptChanges();
@@ -489,6 +505,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
                                                             bool createMacCol = true;
 
+                                                            
                                                             //part_no = "91000237320038";
 
                                                             string mac_sql = string.Format(@"select distinct a.工單編號 as mo_id,e.客戶工單編號 as customer_moid,a.工單序號 as product_sn,                        
@@ -525,7 +542,11 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                                             {
                                                                                 for (int m = 0; m < esun_table.Rows.Count; m++)
                                                                                 {
-                                                                                    dtBarcode.Columns.Add("KP_MB" + (k + 1).ToString() + "_MAC" + (m + 1).ToString());
+                                                                                    try
+                                                                                    {
+                                                                                        dtBarcode.Columns.Add("KP_MB" + (k + 1).ToString() + "_MAC" + (m + 1).ToString());
+                                                                                    }
+                                                                                    catch { }
                                                                                 }
                                                                                 dtBarcode.AcceptChanges();
                                                                                 createMacCol = false;
@@ -535,7 +556,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                                             for (int m = 0; m < esun_table.Rows.Count; m++)
                                                                             {
                                                                                 mac = esun_table.Rows[m]["part_barcode"].ToString().Trim();
-                                                                                dtBarcode.Rows[k]["KP_MB" + (k + 1).ToString() + "_MAC" + (m + 1).ToString()] = mac;
+                                                                                dtBarcode.Rows[i]["KP_MB" + (k + 1).ToString() + "_MAC" + (m + 1).ToString()] = mac;
                                                                                 dtBarcode.AcceptChanges();
                                                                             }
                                                                         }
@@ -545,7 +566,10 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
                                                         }
                                                     }
-                                                    catch { }
+                                                    catch(Exception e1) 
+                                                    {
+                                                        string err = e1.Message;
+                                                    }
                                                 }
                                                 dtBarcode.AcceptChanges();
                                             }