From 1aab89865d46870aad34931fe804b478bf34cce8 Mon Sep 17 00:00:00 2001 From: 17351662861 Date: Mon, 20 Jan 2025 11:38:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BD=AC=E7=A7=BB=E5=88=B0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Admin.WebApi/appsettings.Development.json | 4 ++-- DOAN.Service/PBL/MESInteractionServcie.cs | 2 +- DOAN.ServiceCore/DoanBackgroundService.cs | 2 +- Infrastructure/PLC/PLCTool.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 1ae1546..f32e150 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -10,8 +10,8 @@ "dbConfigs": [ { - "Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=pbl_huaxiang;Port=3306", - //"Conn": "Data Source=10.72.80.161;User ID=root;Password=doantech123;Initial Catalog=pbl_huaxiang_v2;Port=3306", + + "Conn": "Data Source=10.72.80.161;User ID=root;Password=doantech123;Initial Catalog=pbl_huaxiang_v2;Port=3306", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true diff --git a/DOAN.Service/PBL/MESInteractionServcie.cs b/DOAN.Service/PBL/MESInteractionServcie.cs index 36771de..bc5d9dd 100644 --- a/DOAN.Service/PBL/MESInteractionServcie.cs +++ b/DOAN.Service/PBL/MESInteractionServcie.cs @@ -107,7 +107,7 @@ namespace DOAN.Service.PBL // 发送socket 通知 string message=$"MES产品编号{light.AssemblyPartNumber}或者版本{light.Version},在PBL中找不到。请维护PBL料架信息"; - notificationHubContext.Clients.All.SendAsync("PBL_bom_except", light); + notificationHubContext.Clients.All.SendAsync("PBL_bom_except", message); return false; } diff --git a/DOAN.ServiceCore/DoanBackgroundService.cs b/DOAN.ServiceCore/DoanBackgroundService.cs index b0ff5f1..a7dd166 100644 --- a/DOAN.ServiceCore/DoanBackgroundService.cs +++ b/DOAN.ServiceCore/DoanBackgroundService.cs @@ -108,7 +108,7 @@ namespace DOAN.ServiceCore int col = i.BitNum - 1; // Console.WriteLine($"row={row},col={col},PLCValueByteArray[row]={getPLCValueByteArray.Length}"); - // packNum= packNum+( GetInvertedBit(getPLCValueByteArray[row], col) ? 1 : 0); + packNum= packNum+( GetInvertedBit(getPLCValueByteArray[row], col) ? 1 : 0); //Console.WriteLine($"row:{row}-col:{col} packNum:{packNum} "); } // 记录日志 diff --git a/Infrastructure/PLC/PLCTool.cs b/Infrastructure/PLC/PLCTool.cs index 6420e78..865fb70 100644 --- a/Infrastructure/PLC/PLCTool.cs +++ b/Infrastructure/PLC/PLCTool.cs @@ -21,7 +21,7 @@ namespace DOAN.Infrastructure.PLC public PLCTool() { - this.siemensTcpNet = new SiemensS7Net(SiemensPLCS.S200Smart, "192.168.2.1") + this.siemensTcpNet = new SiemensS7Net(SiemensPLCS.S200Smart, "10.72.82.242") { ConnectTimeOut = 5000 };