From 40f029bc7dfdbf99e84ca4edaf485fca5976ee74 Mon Sep 17 00:00:00 2001 From: Marvin Date: Fri, 6 Jan 2023 10:55:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/QRS/QRS013.cshtml | 3 +-- AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs | 2 +- AMESCoreStudio.WebApi/Models/ESUNContext.cs | 2 ++ AMESCoreStudio.WebApi/appsettings.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AMESCoreStudio.Web/Views/QRS/QRS013.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS013.cshtml index 40e69606..a9cb0a65 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS013.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS013.cshtml @@ -164,8 +164,7 @@ field: 'kP_MAC', title: '組件MAC' } - ] - ]; + ]]; //基本数据表格 var table = hg.table.datatable('test', '工單KeyParts資料', '/QRS/QRS013A', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index 1253ca19..d25e1376 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -355,7 +355,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES for (int j = 0; j < table.Rows.Count; j++) { string barcode_no = table.Rows[j]["BarcodeNo"].ToString(); - //barcode_no = "92000044790655"; + 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 diff --git a/AMESCoreStudio.WebApi/Models/ESUNContext.cs b/AMESCoreStudio.WebApi/Models/ESUNContext.cs index 127ae654..d2f86e6f 100644 --- a/AMESCoreStudio.WebApi/Models/ESUNContext.cs +++ b/AMESCoreStudio.WebApi/Models/ESUNContext.cs @@ -20,7 +20,9 @@ namespace AMESCoreStudio.WebApi { IConfiguration _config; _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build(); + optionsBuilder.UseSqlServer(_config.GetConnectionString("ESUNContext")); + base.OnConfiguring(optionsBuilder); } } diff --git a/AMESCoreStudio.WebApi/appsettings.json b/AMESCoreStudio.WebApi/appsettings.json index ca210a21..2512ee5b 100644 --- a/AMESCoreStudio.WebApi/appsettings.json +++ b/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=localhost;Initial Catalog=SFIS_ESUN;User Id=sa;Password=20000123;", + "ESUNContext": "Data Source=.;Initial Catalog=SFIS_ESUN;User Id=sa;Password=20000123;", "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;"