1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制

2.前端websocket取消心跳机制(原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连),自己实现心跳和重连
3.前端关闭后任占用后台线程问题修复
This commit is contained in:
hehaibing-1996
2024-05-25 17:25:27 +08:00
parent 472862a978
commit 00621bcd55
82 changed files with 3404 additions and 240 deletions

View File

@ -139,7 +139,6 @@ namespace WCS.BLL.Manager
public static void SolveLoss(WebSocketMessageModel warning)
{
#region
try
{
//获取库位
@ -164,6 +163,12 @@ namespace WCS.BLL.Manager
StoreId = storeInfo.Id,
StoreInfo = storeInfo,
R = storeInfo.R,
C = storeInfo.C,
Wei = storeInfo.Wei,
BigShelfCode = storeInfo.BigShelfCode,
GroupName = storeInfo.GroupName,
MatSN = inventoryDetail.MatSN,
MatCode = inventoryDetail.MatCode,
MatName = inventoryDetail.MatName,
@ -174,9 +179,29 @@ namespace WCS.BLL.Manager
MatSupplier = inventoryDetail.MatSupplier,
Direction = DirectionEnum.,
OperateUser = warning.SolvedUser,
};
DbHelp.db.Insertable(inOutRecord).ExecuteCommand();
DbHelp.db.Deleteable(inventoryDetail).ExecuteCommand();
#region
if (warning.WarningType == WarningTypeEnum.)
{
//清掉需要出库的缓存
var shelf = ShelfManager.Shelves
.Where(t => t.ShelfId == warning.ShelfId)
.FirstOrDefault();
if (shelf != null)
{
var smartShelf = shelf as SmartShelf;
if (smartShelf != null)
{
smartShelf.CurrentOutStoreMatSNs.RemoveAll(t => t == inventoryDetail.MatSN);
//TODO 如何保证丢失的继续进行
}
}
}
#endregion
}
DbHelp.db.CommitTran();
}