添加报警窗口
出库流程调试、优化
This commit is contained in:
@ -1,13 +1,16 @@
|
||||
using HandyControl.Controls;
|
||||
using Newtonsoft.Json;
|
||||
using Ping9719.WpfEx;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using TouchSocket.Core;
|
||||
using TouchSocket.Http.WebSockets;
|
||||
using TouchSocket.Sockets;
|
||||
using WCS.Model.WebSocketModel;
|
||||
|
||||
namespace 货架标准上位机
|
||||
{
|
||||
@ -61,7 +64,52 @@ namespace 货架标准上位机
|
||||
//返回的报警信息 出入库盘点等日志信息
|
||||
else
|
||||
{
|
||||
TextBoxLog.AddLog(e.DataFrame.ToText(), "InstoreLog", DateTime.Now);
|
||||
try
|
||||
{
|
||||
var message = e.DataFrame.ToText();
|
||||
var warning = JsonConvert.DeserializeObject<WebSocketMessageModel>(message);
|
||||
if (warning != null)
|
||||
{
|
||||
//通知类的
|
||||
if (warning.IsWarning == false)
|
||||
{
|
||||
switch (warning.WarningType)
|
||||
{
|
||||
case WarningTypeEnum.通知刷新出库:
|
||||
OutVentoryView.viewModel.RefreshDataGridItemSource();
|
||||
client.Send(e.DataFrame.ToText());
|
||||
break;
|
||||
case WarningTypeEnum.恢复正常:
|
||||
var SolvedGuids = warning.SolvedGuids;
|
||||
SolvedGuids.ForEach(guid =>
|
||||
{
|
||||
WarningManager.RemoveWarning(guid);
|
||||
});
|
||||
TextBoxLog.AddLog(warning.WarningMessage, "InstoreLog", DateTime.Now);
|
||||
client.Send(e.DataFrame.ToText());
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
WarningManager.AddWarning(warning);
|
||||
TextBoxLog.AddLog(warning.WarningMessage, "InstoreLog", DateTime.Now);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
client.Send(e.DataFrame.ToText());
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
return;
|
||||
|
||||
|
Reference in New Issue
Block a user