1.修改webapi增加引用Microsoft.Data.SqlClient

2.修改工单KeyParts查询2，增加MAC昶亨数据库读取try...catch

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -1500,10 +1500,18 @@ namespace AMESCoreStudio.Web.Controllers
                                 default:
                                     string kp_name = jp[i].Name.Replace("kP_", "");
                                     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>";

AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj

@@ -32,6 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.20" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.8">
       <PrivateAssets>all</PrivateAssets>

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -470,6 +470,8 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
                                                     dtBarcode.AcceptChanges();
 
+                                                    try
+                                                    {
                                                         if (kp_no == "MB")
                                                         {
                                                             ESUNContext _esun_context = new ESUNContext();
@@ -483,6 +485,8 @@ 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,                        
                                case substring(f.avalue_kp_typeid, 1, 3) when 'MAC' then isnull(z.item_prefix,'')+b.SUB_ITEM_SN else b.SUB_ITEM_SN end as part_barcode,
                                f.avalue_kp_typeid as class,c.material_id,d.r_stn as routeid,'' as workerid,rtrim(g.sn_date) + ' ' + rtrim(g.sn_time) as create_date
@@ -517,7 +521,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++)
                                                                                 {
-                                                                                dtBarcode.Columns.Add("KP_MB" + k.ToString() + "_MAC" + (m + 1).ToString());
+                                                                                    dtBarcode.Columns.Add("KP_MB" + (k + 1).ToString() + "_MAC" + (m + 1).ToString());
                                                                                 }
                                                                                 dtBarcode.AcceptChanges();
                                                                                 createMacCol = false;
@@ -527,7 +531,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.ToString() + "_MAC" + (m + 1).ToString()] = mac;
+                                                                                dtBarcode.Rows[k]["KP_MB" + (k + 1).ToString() + "_MAC" + (m + 1).ToString()] = mac;
                                                                                 dtBarcode.AcceptChanges();
                                                                             }
                                                                         }
@@ -537,6 +541,8 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
                                                         }
                                                     }
+                                                    catch { }
+                                                }
                                                 dtBarcode.AcceptChanges();
                                             }
                                         }

AMESCoreStudio.WebApi/appsettings.json

@@ -8,7 +8,7 @@
   },
   "ConnectionStrings": {
     "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHAMES;Password=AMES666;",
-    "ESUNContext": "Data Source=.;Initial Catalog=SFIS_ESUN;User Id=sa;Password=20000123;",
+    "ESUNContext": "Data Source=.;Initial Catalog=SFIS_ESUN;User Id=sa;Password=20000123;Encrypt=True;TrustServerCertificate=True;",
     "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=JHSYS;Password=ASYS666;"
     //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
     //"AMESContextO": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"