diff --git a/SlnMesnac/Controllers/IngCheckController.cs b/SlnMesnac/Controllers/IngCheckController.cs index a39b662..d350189 100644 --- a/SlnMesnac/Controllers/IngCheckController.cs +++ b/SlnMesnac/Controllers/IngCheckController.cs @@ -74,7 +74,9 @@ public class IngCheckController } else { - result.SetSuccess(JsonSerializer.Serialize(info)); + string matStr = JsonSerializer.Serialize(info); + result.SetSuccess(matStr); + _logger.LogInformation($"获取物料信息成功:{matStr},时间:{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); } } while (false); } diff --git a/SlnMesnac/appsettings.Development.json b/SlnMesnac/appsettings.Development.json index 0c208ae..839e60d 100644 --- a/SlnMesnac/appsettings.Development.json +++ b/SlnMesnac/appsettings.Development.json @@ -2,7 +2,47 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } + }, + "AllowedHosts": "*", + "AppConfig": { + "logPath": "E:/桌面/杜肯密炼MES项目/程序设计/Durk.SlnMesnac/SlnMesnac/bin/Debug/net6.0", + "mcsOpenAddr": "D100", + "cwssOpenAddr": "DB122", + "SqlConfig": [ + { + "configId": "mcs", + "dbType": 1, //MySql-0;SqlServer-1;Sqlite-2;Oracle-3 + "connStr": "server=58.63.214.27,23313;uid=dkmes;pwd=Duken123;database=mesnac_MCS_ShareDB" + }, + { + "configId": "wms", + "dbType": 1, + "connStr": "server=58.63.214.27,23314;uid=dk_mes;pwd=dk_mes;database=gzdk_interaction_mes" + }, + { + "configId": "mes", + "dbType": 3, + "connStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma" + } + ], + "PlcConfig": [ + { + "configId": 1, + "plcType": "MelsecBinaryPlc", + "plcIp": "127.0.0.1", //192.168.1.71 + "plcPort": 6000, + "plcKey": "mcs" + }, + { + "configId": 2, + "plcType": "MelsecBinaryPlc", + "plcIp": "127.0.0.1", + "plcPort": 6000, + "plcKey": "cwss" + } + ] } } diff --git a/SlnMesnac/appsettings.json b/SlnMesnac/appsettings.json index 9dce048..a3992a8 100644 --- a/SlnMesnac/appsettings.json +++ b/SlnMesnac/appsettings.json @@ -8,42 +8,29 @@ }, "AllowedHosts": "*", "AppConfig": { - //"logPath": "/Users/wenxiansheng/Desktop/日常代码/杜肯新材料程序设计/Durk.SlnMesnac/SlnMesnac/bin/Debug/net6.0", "logPath": "E:/桌面/杜肯密炼MES项目/程序设计/Durk.SlnMesnac/SlnMesnac/bin/Debug/net6.0", - "mcsOpenAddr": "D100", + "mcsOpenAddr": "D75367", "cwssOpenAddr": "DB122", "SqlConfig": [ { "configId": "mcs", - "dbType": 1, //MySql-0;SqlServer-1;Sqlite-2;Oracle-3 - "connStr": "server=58.63.214.27,23313;uid=dkmes;pwd=Duken123;database=mesnac_MCS_ShareDB" + "dbType": 1, + "connStr": "server=10.168.205.73,1433;uid=dkmes;pwd=Duken123;database=mesnac_MCS_ShareDB" }, { "configId": "wms", "dbType": 1, - "connStr": "server=58.63.214.27,23314;uid=dk_mes;pwd=dk_mes;database=gzdk_interaction_mes" - }, - { - "configId": "mes", - "dbType": 3, - "connStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma" + "connStr": "server=10.168.205.31,1433;uid=dk_mes;pwd=dk_mes;database=gzdk_interaction_mes" } ], "PlcConfig": [ { "configId": 1, "plcType": "MelsecBinaryPlc", - "plcIp": "127.0.0.1", //192.168.1.71 + "plcIp": "192.168.1.71", "plcPort": 6000, "plcKey": "mcs" - }, - { - "configId": 2, - "plcType": "MelsecBinaryPlc", - "plcIp": "127.0.0.1", - "plcPort": 6000, - "plcKey": "cwss" } ] } -} +} \ No newline at end of file