1.修改工单KeyPart查询2，修正MAC读取C_SFIS_KEYPARTS

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -805,6 +805,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                     {
                                                         if (kp_no.StartsWith("MB") && !kp_no.StartsWith("MB_MAC"))
                                                         {
+                                                            /*
                                                             WriteTraceLog("query mac by mb trace 001");
 
                                                             ESUNContext _esun_context = new ESUNContext();
@@ -822,6 +823,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                             }
 
                                                             WriteTraceLog("query mac by mb trace 004");
+                                                            */
 
                                                             bool createMacCol = true;
 
@@ -844,12 +846,17 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
        AND a.工單序號 = '{0}'
        AND c.material_id LIKE 'MAC%'", part_no);
                                                             */
+
+                                                            /*
                                                             string mac_sql = string.Format(@"SELECT B.[ProductSN], B.[PartBarcode], B.[MFID], B.[MOID], B.[PartTypeID], B.[MaterialID], B.[IsActive]
 FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (SELECT A.[PartBarcode]  FROM [SFIS].[dbo].[ZPDKeyPart] A WHERE A.[IsActive] = 1 AND A.[PartTypeID] = 'MAC'  AND A.[PartBarcode] = '{0}')", part_no);
 
                                                             WriteTraceLog("query mac by mb sql:" + mac_sql);
+                                                            */
 
-                                                            using (var esun_cmd = esun_conn.CreateCommand())
+                                                            string mac_sql = string.Format("select partbarcode from jhames.c_sfis_keyparts where productsn = '{0}' and parttypeid='MAC'", part_no);
+
+                                                            using (var esun_cmd = conn.CreateCommand())
                                                             {
                                                                 esun_cmd.CommandText = mac_sql;
                                                                 esun_cmd.CommandTimeout = 0;
@@ -900,7 +907,8 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
                                                                             string mac = "";
                                                                             for (int m = 0; m < esun_table.Rows.Count; m++)
                                                                             {
-                                                                                mac = esun_table.Rows[m]["part_barcode"].ToString().Trim();
+                                                                                //mac = esun_table.Rows[m]["part_barcode"].ToString().Trim();
+                                                                                mac = esun_table.Rows[m]["PARTBARCODE"].ToString().Trim();
                                                                                 if (dtItem.Rows.Count == 1)
                                                                                 {
                                                                                     dtBarcode.Rows[i]["KP_" + kp_no + "#MAC" + (m + 1).ToString()] = mac;