diff --git a/ZR.Model/MES/andon/AndonAlarmRecord.cs b/ZR.Model/MES/andon/AndonAlarmRecord.cs index 6d05dd1a..e0e1ce0f 100644 --- a/ZR.Model/MES/andon/AndonAlarmRecord.cs +++ b/ZR.Model/MES/andon/AndonAlarmRecord.cs @@ -43,49 +43,49 @@ namespace ZR.Model.MES.andon /// 接收方 /// [SugarColumn(ColumnName = "receiver1")] - public string Receiver1 { get; set; } + public string? Receiver1 { get; set; } /// /// 接收方名称 /// [SugarColumn(ColumnName = "receiver1_name")] - public string Receiver1Name { get; set; } + public string? Receiver1Name { get; set; } /// /// 接收方 /// [SugarColumn(ColumnName = "receiver2")] - public string Receiver2 { get; set; } + public string? Receiver2 { get; set; } /// /// 接收方名称 /// [SugarColumn(ColumnName = "receiver2_name")] - public string Receiver2Name { get; set; } + public string? Receiver2Name { get; set; } /// /// 接收方 /// [SugarColumn(ColumnName = "receiver3")] - public string Receiver3 { get; set; } + public string? Receiver3 { get; set; } /// /// 接收方名称 /// [SugarColumn(ColumnName = "receiver3_name")] - public string Receiver3Name { get; set; } + public string? Receiver3Name { get; set; } /// /// 接收方 /// [SugarColumn(ColumnName = "receiver4")] - public string Receiver4 { get; set; } + public string? Receiver4 { get; set; } /// /// 接收方名称 /// [SugarColumn(ColumnName = "receiver4_name")] - public string Receiver4Name { get; set; } + public string? Receiver4Name { get; set; } /// /// 序号 diff --git a/ZR.Service/Utils/MyMatchPush/Watchup.cs b/ZR.Service/Utils/MyMatchPush/Watchup.cs index 7d04fcd3..2be7c141 100644 --- a/ZR.Service/Utils/MyMatchPush/Watchup.cs +++ b/ZR.Service/Utils/MyMatchPush/Watchup.cs @@ -13,6 +13,7 @@ namespace DOAN.ServiceCore.MyMatchPush private static int PackageSort = 1; public static bool StartPush(string message, SocketGatewayServer _socketGateway) { + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); //发送报警信息 //包头 diff --git a/ZR.Service/ZR.Service.csproj b/ZR.Service/ZR.Service.csproj index 00737af8..04f88932 100644 --- a/ZR.Service/ZR.Service.csproj +++ b/ZR.Service/ZR.Service.csproj @@ -14,6 +14,7 @@ +