提交代码
This commit is contained in:
hehaibing-1996
@ -23,7 +23,6 @@ namespace WCS.BLL.HardWare
|
||||
ShelfCode = shelfInfo.ShelfCode;
|
||||
RowCounts = shelfInfo.Rowcounts;
|
||||
ColumnCounts = shelfInfo.Columncounts;
|
||||
//CurrentMode = shelfInfo.CurrentMode;
|
||||
SetCurrentMode(Mode.待机模式);
|
||||
ClientIp = shelfInfo.ClientIp;
|
||||
LightId = shelfInfo.LightId;
|
||||
@ -326,6 +325,7 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
try
|
||||
{
|
||||
Logs.Write("GoInOutstoreByWebSocket", LogsType.Outstore);
|
||||
//找到对应的模组
|
||||
var module = Modules.Where(t => t.ModuleId == moduleId).First();
|
||||
if (module == null)
|
||||
@ -341,16 +341,12 @@ namespace WCS.BLL.HardWare
|
||||
module.Reset(TcpCleint);
|
||||
|
||||
//判断此货架是否还有出库模式的模块
|
||||
var isExistOuting = Modules.Where(t => t.CurrentMode == Mode.出库模式).Any();
|
||||
if (isExistOuting)
|
||||
#region 判断是否退出入库 是否亮下一次灯逻辑
|
||||
var isExsistOut = CurrentOutStoreMatSNs.Any();
|
||||
//本次亮灯的物料已全部取出
|
||||
if (!isExsistOut)
|
||||
{
|
||||
//还有继续出的就不管
|
||||
}
|
||||
//这里的处理逻辑应与出库出了最后一盘料相同
|
||||
else
|
||||
{
|
||||
#region 继续出库进程
|
||||
Logs.Write($"GoInOutstoreByModule货架【{ShelfCode}】，丢失删除的料刚好为货架需要出库的最后一盘料", LogsType.Outstore);
|
||||
Logs.Write($"货架【{ShelfCode}】，本次亮灯的物料已全部取出", LogsType.Outstore);
|
||||
CurrentOutOrder = null;
|
||||
|
||||
//退出出库模式
|
||||
@ -373,9 +369,10 @@ namespace WCS.BLL.HardWare
|
||||
.Any();
|
||||
if (!isLastShelf)
|
||||
{
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，最后一个出库货架，触发精准发料机制！查询是否还存在待出库物料", LogsType.Outstore);
|
||||
Logs.Write($"发料单{OrderNumber}，最后一个出库货架，触发精准发料机制！查询是否还存在待出库物料", LogsType.Outstore);
|
||||
var outOrder = DbHelp.db.Queryable<OutOrder>()
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName)
|
||||
.First();
|
||||
if (outOrder != null)
|
||||
{
|
||||
@ -391,7 +388,7 @@ namespace WCS.BLL.HardWare
|
||||
LocalStatic.CurrentOutStoreColor = LocalStatic.CurrentOutStoreColor == (byte)0x02 ? (byte)0x04 : (byte)0x02;
|
||||
|
||||
//存在待出库 然后之前又没亮灯的情况 => 继续分批次亮灯
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，还有物料未出！", LogsType.Outstore);
|
||||
Logs.Write($"发料单{OrderNumber}，还有物料未出！", LogsType.Outstore);
|
||||
var outOrderDetailCount = outOrderMatDetails.GroupBy(t => t.MatCode)
|
||||
.Select(o => new { count = o.Count(), bb = o })
|
||||
.Where(o => o.count >= 2)
|
||||
@ -403,13 +400,13 @@ namespace WCS.BLL.HardWare
|
||||
var matCode = outOrderDetailCount.First().bb.Key;
|
||||
outOrderMatDetails = outOrderMatDetails.Where(t => t.MatCode == matCode)
|
||||
.ToList();
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，本次亮灯物料{matCode}！", LogsType.Outstore);
|
||||
Logs.Write($"发料单{OrderNumber}，本次亮灯物料{matCode}！", LogsType.Outstore);
|
||||
}
|
||||
//相同物料不存在盘数超过n的情况，剩余物料全部亮灯
|
||||
else
|
||||
{
|
||||
//剩余物料全出
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，剩余所有物料灯全亮（发送命令）！", LogsType.Outstore);
|
||||
Logs.Write($"发料单{OrderNumber}，剩余所有物料灯全亮（发送命令）！", LogsType.Outstore);
|
||||
}
|
||||
|
||||
var shelfIds = outOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
|
||||
@ -430,7 +427,6 @@ namespace WCS.BLL.HardWare
|
||||
shelfs.ForEach(shelf =>
|
||||
{
|
||||
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
|
||||
|
||||
.Distinct()
|
||||
.ToList();
|
||||
shelf.GoInOutstore(matDetails, outOrder, OutOperateUser);
|
||||
@ -439,17 +435,45 @@ namespace WCS.BLL.HardWare
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，当前物料已发完！", LogsType.Outstore);
|
||||
#region 当前单据物料已发完
|
||||
Logs.Write($"发料单{OrderNumber}，当前物料已发完！", LogsType.Outstore);
|
||||
//清空发料单缓存
|
||||
var outingShelfs = ShelfManager.Shelves.Where(t => t.OrderNumber == OrderNumber).ToList();
|
||||
outingShelfs.ForEach(t =>
|
||||
{
|
||||
t.OrderNumber = string.Empty;
|
||||
});
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
//判断是否是当前订单最后一个出库货架
|
||||
var isOuting = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber)
|
||||
.Any();
|
||||
//WebSocket通知前台以更新左侧出库单列表的状态
|
||||
if (!isOuting)
|
||||
{
|
||||
#region WebSocket
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = WebSocketIpAddress,
|
||||
WarningType = WarningTypeEnum.通知刷新出库单列表,
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，OutOrder为null，肯定是有问题", LogsType.Outstore);
|
||||
Logs.Write($"发料单{OrderNumber}，OutOrder为null，肯定是有问题", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"GoInOutstoreByModule发料单{OrderNumber}，非最后一个出库货架！", LogsType.Outstore);
|
||||
Logs.Write($"发料单{OrderNumber}，非最后一个出库货架！", LogsType.Outstore);
|
||||
var otherShelfs = ShelfManager.Shelves
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.Where(t => t.CurrentMode == Mode.出库模式)
|
||||
@ -462,7 +486,7 @@ namespace WCS.BLL.HardWare
|
||||
if (shelf is SmartShelf)
|
||||
{
|
||||
var smartShelf = (SmartShelf)shelf;
|
||||
Logs.Write($"GoInOutstoreByModule货架【{smartShelf.ShelfCode}】待取物料{string.Join(",", smartShelf.CurrentOutStoreMatSNs)}", LogsType.Outstore);
|
||||
Logs.Write($"货架【{smartShelf.ShelfCode}】待取物料{string.Join(",", smartShelf.CurrentOutStoreMatSNs)}", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
catch
|
||||
@ -471,17 +495,50 @@ namespace WCS.BLL.HardWare
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
#region 当前单据物料已发完
|
||||
Logs.Write($"发料单{OrderNumber}，当前物料已发完！", LogsType.Outstore);
|
||||
//清空发料单缓存
|
||||
var outingShelfs = ShelfManager.Shelves.Where(t => t.OrderNumber == OrderNumber).ToList();
|
||||
outingShelfs.ForEach(t =>
|
||||
{
|
||||
t.OrderNumber = string.Empty;
|
||||
});
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
//判断是否是当前订单最后一个出库货架
|
||||
var isOuting = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber)
|
||||
.Any();
|
||||
//WebSocket通知前台以更新左侧出库单列表的状态
|
||||
if (!isOuting)
|
||||
{
|
||||
#region WebSocket
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = WebSocketIpAddress,
|
||||
WarningType = WarningTypeEnum.通知刷新出库单列表,
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
{
|
||||
//继续亮灯
|
||||
Logs.Write($"GoInOutstoreByModule货架【{ShelfCode}】，模组【{module.ModuleCode}】，存在需要继续出的物料，继续亮灯。", LogsType.Outstore);
|
||||
module.GoInOutStoreMode(TcpCleint, module.CurrentOutSns);
|
||||
Thread.Sleep(20);
|
||||
WarningLight.GreenLight(TcpCleint);
|
||||
Logs.Write("GoInOutstoreByWebSocket", LogsType.Outstore);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
@ -528,6 +585,7 @@ namespace WCS.BLL.HardWare
|
||||
.Select(mat => mat.MatSN)
|
||||
.ToList();
|
||||
t.GoInOutStoreMode(TcpCleint, outMatSns);
|
||||
Thread.Sleep(20);//出库每块板子之间增加15ms的间隔
|
||||
});
|
||||
//所有板子亮灯后 亮警示灯
|
||||
WarningLight.GreenLight(TcpCleint);
|
||||
@ -637,25 +695,25 @@ namespace WCS.BLL.HardWare
|
||||
SetCurrentMode(Mode.待机模式);
|
||||
Logs.Write($"货架【{ShelfCode}】，结束退出出库", LogsType.Outstore);
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
//判断是否是当前订单最后一个出库货架
|
||||
var isOuting = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber)
|
||||
.Any();
|
||||
//WebSocket通知前台以更新左侧出库单列表的状态
|
||||
if (!isOuting)
|
||||
{
|
||||
#region WebSocket
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = WebSocketIpAddress,
|
||||
WarningType = WarningTypeEnum.通知刷新出库单列表,
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
// //判断是否是当前订单最后一个出库货架
|
||||
// var isOuting = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber)
|
||||
// .Any();
|
||||
// //WebSocket通知前台以更新左侧出库单列表的状态
|
||||
// if (!isOuting)
|
||||
// {
|
||||
// #region WebSocket
|
||||
// var messageMode = new WebSocketMessageModel()
|
||||
// {
|
||||
// IsWarning = false,
|
||||
// ClientIp = WebSocketIpAddress,
|
||||
// WarningType = WarningTypeEnum.通知刷新出库单列表,
|
||||
// };
|
||||
// WarningManager.SendWarning(messageMode);
|
||||
// #endregion
|
||||
// }
|
||||
//});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -773,17 +831,7 @@ namespace WCS.BLL.HardWare
|
||||
//报警灯闪一下
|
||||
WarningLight.SuccessLightGreenEnd(TcpCleint);
|
||||
|
||||
//通知前台刷新
|
||||
Task.Run(() =>
|
||||
{
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = WebSocketIpAddress,
|
||||
WarningType = WarningTypeEnum.通知刷新盘点
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
});
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -1133,48 +1181,6 @@ namespace WCS.BLL.HardWare
|
||||
ExceptionMessages.Add($"{storeInfo.StoreCode}物料{storeInfo.CurrentMatSn}丢失,库存数据已删除，请重新扫码后入库");
|
||||
#endregion
|
||||
|
||||
//#region 【后台】丢失的数据处理
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
// try
|
||||
// {
|
||||
// DbHelp.db.BeginTran();
|
||||
// //库位表字段清空
|
||||
// storeInfo.CurrentMatSn = string.Empty;
|
||||
// DbHelp.db.Updateable(storeInfo).ExecuteCommand();
|
||||
|
||||
// //库存表记录删除、插入出入记录
|
||||
// var inventoryDetail = DbHelp.db.Queryable<InventoryDetail>().Where(t => t.StoreId == storeInfo.Id).First();
|
||||
// if (inventoryDetail != null)
|
||||
// {
|
||||
// var inOutRecord = new MatInventoryDetailService()
|
||||
// {
|
||||
// StoreCode = storeInfo.StoreCode,
|
||||
// StoreId = storeInfo.Id,
|
||||
// StoreInfo = storeInfo,
|
||||
|
||||
// MatSN = inventoryDetail.MatSN,
|
||||
// MatCode = inventoryDetail.MatCode,
|
||||
// MatName = inventoryDetail.MatName,
|
||||
// MatBatch = inventoryDetail.MatBatch,
|
||||
// MatQty = inventoryDetail.MatQty,
|
||||
// MatSpec = inventoryDetail.MatSpec,
|
||||
// MatCustomer = inventoryDetail.MatCustomer,
|
||||
// MatSupplier = inventoryDetail.MatSupplier,
|
||||
|
||||
// Direction = DirectionEnum.丢失,
|
||||
// };
|
||||
// DbHelp.db.Insertable(inOutRecord).ExecuteCommand();
|
||||
// DbHelp.db.Deleteable(inventoryDetail).ExecuteCommand();
|
||||
// }
|
||||
// DbHelp.db.CommitTran();
|
||||
// }
|
||||
// catch (Exception e)
|
||||
// {
|
||||
// DbHelp.db.RollbackTran();
|
||||
// }
|
||||
//});
|
||||
//#endregion
|
||||
#region 不处理、WebSocket通知前台
|
||||
var exceptionMessage = storeInfo.StoreCode + $"进入入库自检发现物料{storeInfo.CurrentMatSn}丢失，请确认是否删除？";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
@ -1728,11 +1734,11 @@ namespace WCS.BLL.HardWare
|
||||
return;
|
||||
}
|
||||
|
||||
#region 校验项通过 处理出库逻辑
|
||||
//当前库位的SN
|
||||
var matSN = storeInfo.CurrentMatSn;
|
||||
try
|
||||
{
|
||||
#region 校验项通过 处理出库逻辑
|
||||
DbHelp.db.BeginTran();
|
||||
//库存明细表 删除
|
||||
;
|
||||
@ -1759,6 +1765,7 @@ namespace WCS.BLL.HardWare
|
||||
MatSupplier = inventoryDetail.MatSupplier,
|
||||
OrderNumber = orderMatDetails.OrderNumber,
|
||||
|
||||
OperateUser = OutOperateUser,
|
||||
Direction = orderMatDetails.IsMXPD == false ? DirectionEnum.出库 : DirectionEnum.盘点下架,
|
||||
};
|
||||
//库位表 修改
|
||||
@ -1793,7 +1800,7 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
//确认本次出库
|
||||
module.ComfirmOutstore(TcpCleint, data[TcpCleint.PreFixLength + 3]);
|
||||
//更新时间 避免被自动退出
|
||||
//更新时间 避免超时被自动退出
|
||||
Task.Run(() =>
|
||||
{
|
||||
var shelves = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber).ToList();
|
||||
@ -1803,14 +1810,13 @@ namespace WCS.BLL.HardWare
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
//当前柜子是否还存在未出库的
|
||||
Logs.Write($"货架【{ShelfCode}】，用户取出物料{matSN}", LogsType.Outstore);
|
||||
CurrentOutStoreMatSNs.RemoveAll(t => t == matSN);//删除本次已出的物料SN
|
||||
Logs.Write($"货架【{ShelfCode}】，当前货架剩余物料{string.Join(",", CurrentOutStoreMatSNs)}", LogsType.Outstore);
|
||||
#endregion
|
||||
|
||||
var isExsistOut = CurrentOutStoreMatSNs.Any();
|
||||
|
||||
#region 刷新出库明细逻辑
|
||||
var tempOrder = CurrentOutOrder;
|
||||
var isMXPD = orderMatDetails.IsMXPD == true;
|
||||
//通知前台刷新
|
||||
@ -1818,7 +1824,6 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
//更新订单状态
|
||||
UpdateOutOrderStatus(tempOrder);
|
||||
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
@ -1827,7 +1832,10 @@ namespace WCS.BLL.HardWare
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
});
|
||||
#endregion
|
||||
|
||||
#region 判断是否退出入库 是否亮下一次灯逻辑
|
||||
var isExsistOut = CurrentOutStoreMatSNs.Any();
|
||||
//本次亮灯的物料已全部取出
|
||||
if (!isExsistOut)
|
||||
{
|
||||
@ -1857,6 +1865,7 @@ namespace WCS.BLL.HardWare
|
||||
Logs.Write($"发料单{OrderNumber}，最后一个出库货架，触发精准发料机制！查询是否还存在待出库物料", LogsType.Outstore);
|
||||
var outOrder = DbHelp.db.Queryable<OutOrder>()
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName)
|
||||
.First();
|
||||
if (outOrder != null)
|
||||
{
|
||||
@ -1911,7 +1920,6 @@ namespace WCS.BLL.HardWare
|
||||
shelfs.ForEach(shelf =>
|
||||
{
|
||||
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
|
||||
|
||||
.Distinct()
|
||||
.ToList();
|
||||
shelf.GoInOutstore(matDetails, outOrder, OutOperateUser);
|
||||
@ -1921,6 +1929,32 @@ namespace WCS.BLL.HardWare
|
||||
else
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，当前物料已发完！", LogsType.Outstore);
|
||||
//清空发料单缓存
|
||||
var outingShelfs = ShelfManager.Shelves.Where(t => t.OrderNumber == OrderNumber).ToList();
|
||||
outingShelfs.ForEach(t =>
|
||||
{
|
||||
t.OrderNumber = string.Empty;
|
||||
});
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
//判断是否是当前订单最后一个出库货架
|
||||
var isOuting = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber)
|
||||
.Any();
|
||||
//WebSocket通知前台以更新左侧出库单列表的状态
|
||||
if (!isOuting)
|
||||
{
|
||||
#region WebSocket
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = WebSocketIpAddress,
|
||||
WarningType = WarningTypeEnum.通知刷新出库单列表,
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -1952,9 +1986,38 @@ namespace WCS.BLL.HardWare
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
{
|
||||
//清空发料单缓存
|
||||
var outingShelfs = ShelfManager.Shelves.Where(t => t.OrderNumber == OrderNumber).ToList();
|
||||
outingShelfs.ForEach(t =>
|
||||
{
|
||||
t.OrderNumber = string.Empty;
|
||||
});
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
//判断是否是当前订单最后一个出库货架
|
||||
var isOuting = ShelfManager.Shelves.Where(t => t.CurrentMode == Mode.出库模式 && t.OrderNumber == OrderNumber)
|
||||
.Any();
|
||||
//WebSocket通知前台以更新左侧出库单列表的状态
|
||||
if (!isOuting)
|
||||
{
|
||||
#region WebSocket
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = WebSocketIpAddress,
|
||||
WarningType = WarningTypeEnum.通知刷新出库单列表,
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
#endregion
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -1963,7 +2026,6 @@ namespace WCS.BLL.HardWare
|
||||
//报警灯报警
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
public void UpdateOutOrderStatus(OutOrder order)
|
||||
@ -2047,7 +2109,7 @@ namespace WCS.BLL.HardWare
|
||||
.First();
|
||||
if (storeInfo == null)
|
||||
{
|
||||
//TO DO 库位未找到
|
||||
Logs.Write($"[OutstoreExceptionReturnProcess]boardId{boardId};lightNumber{lightNumber}库位未找到！", LogsType.Outstore);
|
||||
return;
|
||||
}
|
||||
//已放物料丢失了 物料多放了 储位恢复正常
|
||||
@ -2077,6 +2139,7 @@ namespace WCS.BLL.HardWare
|
||||
//自动消除本地缓存的报警
|
||||
warnings.ForEach(warning =>
|
||||
{
|
||||
Logs.Write($"ClearWarning,{warning.Guid}", LogsType.Outstore);
|
||||
WarningManager.ClearWarning(warning, SolveTypeEnum.忽略);
|
||||
});
|
||||
ProcessingExceptions.RemoveAll(t => t.BoardId == boardId);
|
||||
@ -2090,8 +2153,6 @@ namespace WCS.BLL.HardWare
|
||||
WarningType = WarningTypeEnum.出库中未扫描上架,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
//ModuleId = module.ModuleId,
|
||||
//ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
@ -2305,7 +2366,6 @@ namespace WCS.BLL.HardWare
|
||||
var storeInfo = storeInfos.Where(t => t.LightNumber == index + 1).First();
|
||||
if (storeInfo != null)
|
||||
{
|
||||
|
||||
#region 不处理、WebSocket通知前台
|
||||
var exceptionMessage = storeInfo.StoreCode + $"自检发现物料{storeInfo.CurrentMatSn}丢失，请确认是否删除？";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
@ -2323,58 +2383,10 @@ namespace WCS.BLL.HardWare
|
||||
WarningManager.SendWarning(warningModel);
|
||||
#endregion
|
||||
|
||||
//#region 【后台】丢失的数据处理
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
// try
|
||||
// {
|
||||
// DbHelp.db.BeginTran();
|
||||
// //库位表字段清空
|
||||
// storeInfo.CurrentMatSN = string.Empty;
|
||||
// DbHelp.db.Updateable(storeInfo).ExecuteCommand();
|
||||
// //库存表记录删除、插入出入记录
|
||||
// var inventoryDetail = DbHelp.db.Queryable<InventoryDetail>().Where(t => t.StoreCode == storeInfo.StoreCode).First();
|
||||
// if (inventoryDetail != null)
|
||||
// {
|
||||
// var inOutRecord = new InOutRecord()
|
||||
// {
|
||||
// StoreCode = storeInfo.StoreCode,
|
||||
// StoreId = storeInfo.Id,
|
||||
// StoreInfo = storeInfo,
|
||||
|
||||
// R = storeInfo.R,
|
||||
// C = storeInfo.C,
|
||||
// Wei = storeInfo.Wei,
|
||||
// WarehouseCode = inventoryDetail.WarehouseCode,
|
||||
|
||||
// MatSN = inventoryDetail.MatSN,
|
||||
// MatCode = inventoryDetail.MatCode,
|
||||
// MatName = inventoryDetail.MatName,
|
||||
// MatBatch = inventoryDetail.MatBatch,
|
||||
// MatQty = inventoryDetail.MatQty,
|
||||
// MatSpec = inventoryDetail.MatSpec,
|
||||
|
||||
// OrderNumber = inventoryDetail.OrderNumber,
|
||||
// OrderProdNumber = inventoryDetail.OrderProdNumber,
|
||||
// OrderMaterialCode = inventoryDetail.OrderMaterialCode,
|
||||
// OrderMaterialName = inventoryDetail.OrderMaterialName,
|
||||
// OrderMaterialSpec = inventoryDetail.OrderMaterialSpec,
|
||||
|
||||
// GroupName = LocalFile.Config.GroupName,
|
||||
|
||||
// Direction = DirectionEnum.丢失,
|
||||
// };
|
||||
// DbHelp.db.Insertable(inOutRecord).ExecuteCommand();
|
||||
// DbHelp.db.Deleteable(inventoryDetail).ExecuteCommand();
|
||||
// }
|
||||
// DbHelp.db.CommitTran();
|
||||
// }
|
||||
// catch (Exception e)
|
||||
// {
|
||||
// DbHelp.db.RollbackTran();
|
||||
// }
|
||||
//});
|
||||
//#endregion
|
||||
IsWarning = true;
|
||||
Logs.Write($"货架自检【{ShelfCode},库位{storeInfo.StoreCode}发现物料丢失，开始发送红灯】", LogsType.Instore);
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
Logs.Write($"货架自检【{ShelfCode},库位{storeInfo.StoreCode}发现物料丢失，发送红灯完成】", LogsType.Instore);
|
||||
}
|
||||
//库位未配置、返回数据异常
|
||||
else
|
||||
@ -2403,11 +2415,11 @@ namespace WCS.BLL.HardWare
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
#endregion
|
||||
//#region 【记录缓存异常信息】
|
||||
//var shelfStatus = LocalStatic.ShelfStatuses.Where(t => t.ShelfCode == storeInfo.ShelfCode).First();
|
||||
//LocalStatic.CheckErr.Add($"库位{storeInfo.StoreCode}:存在物料未扫描上架，请取出后重新扫描上架！");
|
||||
//#endregion
|
||||
//WaringLightAlwaysRed(shelfStatus.ClientIp, shelfStatus.LightId);
|
||||
|
||||
IsWarning = true;
|
||||
Logs.Write($"货架自检【{ShelfCode},库位{storeInfo.StoreCode}存在物料未扫描上架，开始发送红灯】", LogsType.Instore);
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
Logs.Write($"货架自检【{ShelfCode},库位{storeInfo.StoreCode}存在物料未扫描上架，发送红灯完成】", LogsType.Instore);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user