1.WebSocket登录注册

2.数据重发机制
This commit is contained in:
hehaibing-1996
2024-05-17 15:12:07 +08:00
parent c8ce453f74
commit 649e22b4ce
17 changed files with 200 additions and 163 deletions

View File

@ -104,6 +104,9 @@ namespace WCS.BLL.HardWare
public List<int> ModuleIds { get; set; }
public string ClientIp { get; set; }
//websocket通知的前端的IP地址
public string WebSocketIpAddress { get; set; } = "127.0.0.2";
#region
public void GoInInstore(string? IPAddress)
{
@ -186,7 +189,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
@ -267,13 +270,13 @@ namespace WCS.BLL.HardWare
var warningModel = new WebSocketMessageModel()
{
IsWarning = true,
WarningType = WarningTypeEnum.,
WarningType = WarningTypeEnum.退,
StoreId = 0,
StoreCode = "",
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
}
@ -354,7 +357,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
}
@ -411,7 +414,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
}
@ -503,7 +506,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
}
@ -536,7 +539,7 @@ namespace WCS.BLL.HardWare
var messageMode = new WebSocketMessageModel()
{
IsWarning = false,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
WarningType = WarningTypeEnum.
};
WarningManager.SendWarning(messageMode);
@ -590,7 +593,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
}
@ -797,7 +800,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
#endregion
@ -831,7 +834,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
#endregion
@ -916,7 +919,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架!",
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
@ -1051,7 +1054,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
SolvedGuids = warnings.Select(t => t.Guid).ToList(),
};
WarningManager.SendWarning(warningModel);
@ -1079,7 +1082,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
@ -1096,7 +1099,6 @@ namespace WCS.BLL.HardWare
{
Logs.Write("协议处理5.4");
var exceptionMessage = storeInfo.StoreCode + "物料被取出!";
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
var warningModel = new WebSocketMessageModel()
{
WarningType = WarningTypeEnum.,
@ -1107,7 +1109,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
@ -1213,7 +1215,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
#endregion
@ -1247,7 +1249,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);
#endregion
@ -1402,7 +1404,7 @@ namespace WCS.BLL.HardWare
var messageMode = new WebSocketMessageModel()
{
IsWarning = false,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
WarningType = WarningTypeEnum.
};
WarningManager.SendWarning(messageMode);
@ -1625,7 +1627,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1",
ClientIp = WebSocketIpAddress,
SolvedGuids = warnings.Select(t => t.Guid).ToList(),
};
WarningManager.SendWarning(warningModel);
@ -1640,7 +1642,6 @@ namespace WCS.BLL.HardWare
case 0x01:
{
var exceptionMessage = storeInfo.StoreCode + "出库过程中存在物料上架!";
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
var warningModel = new WebSocketMessageModel()
{
WarningType = WarningTypeEnum.,
@ -1651,7 +1652,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress,
};
WarningManager.SendWarning(warningModel);
@ -1666,7 +1667,6 @@ namespace WCS.BLL.HardWare
case 0x02:
{
var exceptionMessage = storeInfo.StoreCode + "物料被取出!";
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
var warningModel = new WebSocketMessageModel()
{
WarningType = WarningTypeEnum.,
@ -1677,7 +1677,7 @@ namespace WCS.BLL.HardWare
ShelfCode = ShelfCode,
ShelfId = ShelfId,
WarningMessage = exceptionMessage,
ClientIp = "127.0.0.1"
ClientIp = WebSocketIpAddress
};
WarningManager.SendWarning(warningModel);