From 0eb7d9d1d8fb0f771b00642aa80a8371bde323cd Mon Sep 17 00:00:00 2001 From: Marvin Date: Sat, 15 Jul 2023 16:36:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95KeyPart?= =?UTF-8?q?=E6=9F=A5=E8=AF=A22=EF=BC=8C=E4=BF=AE=E6=AD=A3MAC=E8=AF=BB?= =?UTF-8?q?=E5=8F=96C=5FSFIS=5FKEYPARTS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AMES/WipInfosController.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index d5ff879f..e77793e7 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/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;