diff --git a/SlnMesnac.Business/ProdMgmtBusiness.cs b/SlnMesnac.Business/ProdMgmtBusiness.cs index 195e8fa..ebca746 100644 --- a/SlnMesnac.Business/ProdMgmtBusiness.cs +++ b/SlnMesnac.Business/ProdMgmtBusiness.cs @@ -529,7 +529,8 @@ namespace SlnMesnac.Business WmsRawPreferredOut? PreferredOut = sqlSugarClient.AsTenant().GetConnection("mes").Queryable().OrderBy(x=>x.RawPreferredOutId).First(); if (PreferredOut == null) { - MsgHandlerEvent?.Invoke("当前投料手动模式,无出库队列,请在投料管理添加出库队列,或修改为自动投料模式", 2, 4); + RefreshMessage("当前投料手动模式,无出库队列,请在投料管理添加出库队列,或修改为自动投料模式"); + // MsgHandlerEvent?.Invoke("当前投料手动模式,无出库队列,请在投料管理添加出库队列,或修改为自动投料模式", 2, 4); return false; } else diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs index 7b10f7d..3f08e82 100644 --- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs +++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs @@ -873,6 +873,17 @@ namespace SlnMesnac.WPF.Page { try { + bool unPackStatus5 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("拆包机请求移走空托盘")); + //先判断请求移走空托盘信号 + if (unPackStatus5) + { + Application.Current.Dispatcher.Invoke(() => + { + Msg.MsgShow("拆包机请求移走空托盘信号为true,请等待空托盘移动完成", 0, 5); + }); + return; + } + App.Current.Dispatcher.BeginInvoke((Action)(() => { StopButton.IsEnabled = false; @@ -915,8 +926,6 @@ namespace SlnMesnac.WPF.Page Msg.MsgShow($"一键停止:{ex.Message}", 2, 5); StopButton.IsEnabled = true; }); - - } } } @@ -1094,6 +1103,17 @@ namespace SlnMesnac.WPF.Page { try { + bool unPackStatus5 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("拆包机请求移走空托盘")); + //先判断请求移走空托盘信号 + if (unPackStatus5) + { + Application.Current.Dispatcher.Invoke(() => + { + Msg.MsgShow("拆包机请求移走空托盘信号为true,请等待空托盘移动完成", 0, 5); + }); + return; + } + //if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("拆包机MES允许远程")) == false) //{ // MessageBox.Show("拆包机MES允许远程,未切换远程");