diff --git a/BPASmartClient.Academy/50L/AddData.cs b/BPASmartClient.Academy/50L/AddData.cs index cd9ce984..dde82426 100644 --- a/BPASmartClient.Academy/50L/AddData.cs +++ b/BPASmartClient.Academy/50L/AddData.cs @@ -48,7 +48,13 @@ namespace BPASmartClient.Academy._50L Data.TryAdd(fbd, 0); } }); - AlarmHelper.GetInstance.AddNotify = (s) => { MessageNotify.GetInstance.ShowAlarmLog(s.Info); }; + AlarmHelper.GetInstance.AddNotify = (s) => + { + App.Current.Dispatcher.Invoke(() => + { + MessageNotify.GetInstance.ShowAlarmLog(s.Info); + }); + }; AlarmHelper.GetInstance.Register("50L反应釜"); AlarmHelper.GetInstance.Start(); } diff --git a/BPASmartClient.Academy/50L/PlcControl.cs b/BPASmartClient.Academy/50L/PlcControl.cs index f4467e1b..36f3fca6 100644 --- a/BPASmartClient.Academy/50L/PlcControl.cs +++ b/BPASmartClient.Academy/50L/PlcControl.cs @@ -144,7 +144,7 @@ namespace BPASmartClient.Academy._50L AlarmHelper.GetInstance.Get("50L反应釜").AbnormalNegativePressureFan = s.Content[2]; AlarmHelper.GetInstance.Get("50L反应釜").BrinePumpError = s.Content[3]; AlarmHelper.GetInstance.Get("50L反应釜").CompressorError = s.Content[4]; - AlarmHelper.GetInstance.Get("50L反应釜").ReactorPressureLimit = s.Content[4]; + AlarmHelper.GetInstance.Get("50L反应釜").ReactorPressureLimit = s.Content[5]; }); Thread.Sleep(100);