1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制
2.前端websocket取消心跳机制(原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连),自己实现心跳和重连 3.前端关闭后任占用后台线程问题修复
This commit is contained in:
@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user