1.出库界面展示当前正在进行出库的单据
2.后台退出了入库模式 通知前台扫码枪退出入库 3.对接盟讯公司登录Mes接口 4.接口记录增加本地日志排查问题
This commit is contained in:
@ -13,6 +13,7 @@ using TouchSocket.Core;
|
||||
using TouchSocket.Http.WebSockets;
|
||||
using TouchSocket.Sockets;
|
||||
using WCS.Model.WebSocketModel;
|
||||
using 货架标准上位机.Views.Controls;
|
||||
|
||||
namespace 货架标准上位机
|
||||
{
|
||||
@ -41,8 +42,8 @@ namespace 货架标准上位机
|
||||
//自定义实现心跳和重连
|
||||
Task.Run(async () =>
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
await Task.Delay(4000);
|
||||
try
|
||||
{
|
||||
@ -53,7 +54,7 @@ namespace 货架标准上位机
|
||||
WebSocket.client.TryConnect();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
}
|
||||
@ -121,6 +122,18 @@ namespace 货架标准上位机
|
||||
TextBoxLog.AddLog(warning.WarningMessage, "InstoreLog", DateTime.Now);
|
||||
client.Send(e.DataFrame.ToText());
|
||||
break;
|
||||
case WarningTypeEnum.通知前台结束入库:
|
||||
var scanner = ScannerManager.Scanners.Where(t => t.IsInstoreMode && t.ShelfCode == warning.ShelfCode && t.IsInstoreModeTime < warning.CreateTime)
|
||||
.FirstOrDefault();
|
||||
if (scanner != null)
|
||||
{
|
||||
scanner.IsInstoreMode = false;
|
||||
scanner.ShelfCode = string.Empty;
|
||||
scanner.ModulesStr = string.Empty;
|
||||
|
||||
scanner.ScannerDisplayControl.RefreshValues(string.Empty, string.Empty);
|
||||
}
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
return;
|
||||
|
Reference in New Issue
Block a user