添加报警窗口
出库流程调试、优化
This commit is contained in:
hehaibing-1996
@ -6,12 +6,14 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using TouchSocket.Core;
|
||||
using TouchSocket.Sockets;
|
||||
using WCS.BLL.Config;
|
||||
using WCS.BLL.DbModels;
|
||||
using WCS.BLL.Manager;
|
||||
using WCS.DAL;
|
||||
using WCS.DAL.Db;
|
||||
using WCS.DAL.DbModels;
|
||||
using WCS.Model;
|
||||
using WCS.Model.WebSocketModel;
|
||||
using static System.Formats.Asn1.AsnWriter;
|
||||
|
||||
namespace WCS.BLL.HardWare
|
||||
@ -27,7 +29,7 @@ namespace WCS.BLL.HardWare
|
||||
ShelfCode = shelfInfo.ShelfCode;
|
||||
RowCounts = shelfInfo.Rowcounts;
|
||||
ColumnCounts = shelfInfo.Columncounts;
|
||||
CurentMode = shelfInfo.CurrentMode;
|
||||
CurrentMode = shelfInfo.CurrentMode;
|
||||
ClientIp = shelfInfo.ClientIp;
|
||||
LightId = shelfInfo.LightId;
|
||||
WarningLight = new WarningLight() { LightId = shelfInfo.LightId };
|
||||
@ -96,18 +98,39 @@ namespace WCS.BLL.HardWare
|
||||
//TcpCleint.Connect();
|
||||
}
|
||||
|
||||
|
||||
public int ShelfId { get; set; }
|
||||
public string ShelfCode { get; set; }
|
||||
public int RowCounts { get; set; }
|
||||
public int ColumnCounts { get; set; }
|
||||
public Mode CurentMode { get; set; }
|
||||
public Mode CurrentMode { get; set; }
|
||||
public string ModulesStr { get; set; }//当前货架所有模组的Str
|
||||
public string GroupName { get; set; }
|
||||
public List<SmartShelfModule> Modules { get; set; } = new List<SmartShelfModule>();
|
||||
public TCPClient TcpCleint { get { return TCPClientManager.GetTCPClientByIPHost(ClientIp); } }
|
||||
|
||||
public int LightId { get; set; }
|
||||
public bool IsWarning { get; set; } = false;
|
||||
public WarningLight WarningLight { get; set; }
|
||||
public void ClearWarning()
|
||||
{
|
||||
if (this.CurrentMode == Mode.入库模式)
|
||||
{
|
||||
WarningLight.BlueLight(TcpCleint);
|
||||
}
|
||||
else if (this.CurrentMode == Mode.出库模式)
|
||||
{
|
||||
WarningLight.GreenLight(TcpCleint);
|
||||
}
|
||||
else if (this.CurrentMode == Mode.盘点模式)
|
||||
{
|
||||
WarningLight.GreenLight(TcpCleint);
|
||||
}
|
||||
else
|
||||
{
|
||||
WarningLight.CloseLight(TcpCleint);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 自检异常、未响应对应模式的异常
|
||||
/// </summary>
|
||||
@ -136,19 +159,19 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
try
|
||||
{
|
||||
if (this.CurentMode == Mode.入库模式)
|
||||
if (this.CurrentMode == Mode.入库模式)
|
||||
{
|
||||
CurrentCom = IPAddress;
|
||||
return;
|
||||
}
|
||||
//判断当前模式是否为待机模式
|
||||
else if (this.CurentMode != Mode.待机模式)
|
||||
else if (this.CurrentMode != Mode.待机模式)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.CurentMode = Mode.入库模式;
|
||||
this.CurrentMode = Mode.入库模式;
|
||||
}
|
||||
//清空错误
|
||||
ExceptionMessages.Clear();
|
||||
@ -195,15 +218,20 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
if (notInstoreList.Count > 0)
|
||||
{
|
||||
|
||||
|
||||
foreach (var item in notInstoreList)
|
||||
{
|
||||
ExceptionMessages.Add($"模组{item.ModuleCode}未进入入库模式！");
|
||||
}
|
||||
//通信校验
|
||||
|
||||
IsWarning = true;
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
}
|
||||
|
||||
//警示灯亮起
|
||||
WarningLight.BlueLight(TcpCleint);
|
||||
//没有报警才亮蓝灯
|
||||
if(!IsWarning)
|
||||
WarningLight.BlueLight(TcpCleint);
|
||||
//绑定当前进入入库PDA/WCS前端的IP
|
||||
CurrentCom = IPAddress;
|
||||
//返回成功
|
||||
@ -219,13 +247,13 @@ namespace WCS.BLL.HardWare
|
||||
public void GoOutInstore()
|
||||
{
|
||||
//当前货架是否为入库模式
|
||||
if (CurentMode != Mode.入库模式)
|
||||
if (CurrentMode != Mode.入库模式)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.CurentMode = Mode.待机模式;
|
||||
this.CurrentMode = Mode.待机模式;
|
||||
}
|
||||
|
||||
//清空错误
|
||||
@ -262,7 +290,7 @@ namespace WCS.BLL.HardWare
|
||||
.ToList();
|
||||
if (list.Count > 0)
|
||||
{
|
||||
CurentMode = Mode.待机模式;
|
||||
CurrentMode = Mode.待机模式;
|
||||
foreach (var item in list)
|
||||
{
|
||||
ExceptionMessages.Add($"模组{item.ModuleCode}未成功退出入库模式！");
|
||||
@ -275,11 +303,11 @@ namespace WCS.BLL.HardWare
|
||||
public void GoInOutstore(List<OutOrderMatDetail> MatDetails, OutOrder outOrder)
|
||||
{
|
||||
//第一步：设置货架当前模式
|
||||
if (CurentMode != Mode.待机模式)
|
||||
if (CurrentMode != Mode.待机模式)
|
||||
{
|
||||
Modules.ForEach(t => { t.Reset(TcpCleint); });
|
||||
}
|
||||
CurentMode = Mode.出库模式;
|
||||
CurrentMode = Mode.出库模式;
|
||||
|
||||
//第二步：货架添加需要出的SN 出库的领料单号
|
||||
//移除货架所有现有待出库的MatSN
|
||||
@ -292,12 +320,13 @@ namespace WCS.BLL.HardWare
|
||||
////第三步：对应的模组进入出库模式
|
||||
var boardIds = MatDetails.Select(t => t.StoreInfo.BoardId)
|
||||
.Distinct()
|
||||
.OrderBy(t => t)
|
||||
.ToList();
|
||||
var outModules = Modules.Where(t => boardIds.Contains(t.BoardId)).ToList();
|
||||
outModules.ForEach(t =>
|
||||
{
|
||||
var outMatSns = MatDetails.Where(t => t.StoreInfo.ModuleId == t.Id)
|
||||
.Select(t => t.MatSN)
|
||||
var outMatSns = MatDetails.Where(mat => mat.StoreInfo.BoardId == t.BoardId)
|
||||
.Select(mat => mat.MatSN)
|
||||
.ToList();
|
||||
t.GoInOutStoreMode(TcpCleint, outMatSns);
|
||||
});
|
||||
@ -307,7 +336,7 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
public void GoInStocktaking()
|
||||
{
|
||||
this.CurentMode = Mode.盘点模式;
|
||||
this.CurrentMode = Mode.盘点模式;
|
||||
}
|
||||
|
||||
public void GoOutOutstore()
|
||||
@ -319,14 +348,14 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
module.GoOutOutStoreMode(TcpCleint);
|
||||
}
|
||||
CurrentOutOrder = null;
|
||||
CurrentOutStoreMatSNs.Clear();
|
||||
this.CurentMode = Mode.待机模式;
|
||||
WarningLight.CloseLight(TcpCleint);
|
||||
this.CurrentMode = Mode.待机模式;
|
||||
}
|
||||
|
||||
public void GoOutStocktaking()
|
||||
{
|
||||
this.CurentMode = Mode.待机模式;
|
||||
this.CurrentMode = Mode.待机模式;
|
||||
}
|
||||
|
||||
void IShelfBase.Reset()
|
||||
@ -390,7 +419,7 @@ namespace WCS.BLL.HardWare
|
||||
default:
|
||||
;
|
||||
break;
|
||||
|
||||
|
||||
}
|
||||
Logs.Write("协议处理5");
|
||||
}
|
||||
@ -407,7 +436,6 @@ namespace WCS.BLL.HardWare
|
||||
.FirstOrDefault();
|
||||
if (module == null)
|
||||
{
|
||||
//TO DO 报错
|
||||
return;
|
||||
}
|
||||
else
|
||||
@ -421,7 +449,6 @@ namespace WCS.BLL.HardWare
|
||||
var module = this.Modules.Where(t => t.BoardId == boardId).FirstOrDefault();
|
||||
if (module == null)
|
||||
{
|
||||
//TO DO 报错
|
||||
return;
|
||||
}
|
||||
else
|
||||
@ -467,47 +494,63 @@ namespace WCS.BLL.HardWare
|
||||
ExceptionMessages.Add($"{storeInfo.StoreCode}物料{storeInfo.CurrentMatSn}丢失,库存数据已删除，请重新扫码后入库");
|
||||
#endregion
|
||||
|
||||
#region 【后台】丢失的数据处理
|
||||
Task.Run(() =>
|
||||
//#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 InOutRecord()
|
||||
// {
|
||||
// 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()
|
||||
{
|
||||
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 InOutRecord()
|
||||
{
|
||||
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();
|
||||
}
|
||||
});
|
||||
WarningType = WarningTypeEnum.入库自检丢失,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
ModuleId = module.ModuleId,
|
||||
ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
#endregion
|
||||
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
@ -526,6 +569,24 @@ namespace WCS.BLL.HardWare
|
||||
#region 缓存记录异常信息
|
||||
ExceptionMessages.Add($"库位{storeInfo.StoreCode}:存在物料未扫描上架");
|
||||
#endregion
|
||||
|
||||
#region 不处理、WebSocket通知前台
|
||||
var exceptionMessage = $"进入入库自检发现库位{storeInfo.StoreCode}存在物料未扫描上架，请拿下后点击【确认】消除报警";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
WarningType = WarningTypeEnum.入库自检未扫描上架,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
ModuleId = module.ModuleId,
|
||||
ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
#endregion
|
||||
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
}
|
||||
else
|
||||
@ -596,7 +657,20 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
Logs.Write("协议处理5.5");
|
||||
var exceptionMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
WarningType = WarningTypeEnum.入库中未扫描上架,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
ModuleId = module.ModuleId,
|
||||
ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架！",
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
|
||||
Logs.Write("协议处理5.4");
|
||||
module.ComfirmErrInstore(TcpCleint);
|
||||
WarningLight.WaringLightAlwaysRed(TcpCleint);
|
||||
@ -608,8 +682,6 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
module.ComfirmErrInstore(TcpCleint);
|
||||
WarningLight.WaringLightBlueEnd(TcpCleint);
|
||||
//ComfirmErrInstoreByIp(shelfStatus.ClientIp, boardIds);
|
||||
//WaringLightBlueEnd(shelfStatus.ClientIp, shelfStatus.LightId);
|
||||
//TO DO Logs.Write($"[{guid}]该位置已放置物料！");
|
||||
return;
|
||||
}
|
||||
@ -703,11 +775,11 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
Logs.Write("协议处理5.1");
|
||||
lightNumber = (int)data[TcpCleint.PreFixLength + 4];
|
||||
var store = DbHelp.db.Queryable<StoreInfo>()
|
||||
var storeInfo = DbHelp.db.Queryable<StoreInfo>()
|
||||
.Where(t => t.BoardId == boardId && t.LightNumber == lightNumber)
|
||||
.First();
|
||||
Logs.Write("协议处理5.2");
|
||||
if (store == null)
|
||||
if (storeInfo == null)
|
||||
{
|
||||
//TO DO 库位未找到
|
||||
return;
|
||||
@ -718,9 +790,30 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
case 0x00:
|
||||
{
|
||||
Logs.Write("协议处理5.4");
|
||||
var exceptionMessage = store.StoreCode + "恢复正常！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var warnings = WarningManager.Warnings.Where(t => t.IsWarning = true)
|
||||
.Where(t => t.ShelfId == ShelfId && t.StoreId == storeInfo.Id)
|
||||
.ToList();
|
||||
|
||||
var exceptionMessage = storeInfo.StoreCode + "恢复正常！";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
WarningType = WarningTypeEnum.恢复正常,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1",
|
||||
SolvedGuids = warnings.Select(t => t.Guid).ToList(),
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
//自动消除本地缓存的报警
|
||||
warnings.ForEach(warning =>
|
||||
{
|
||||
WarningManager.ClearWarning(warning, SolveTypeEnum.忽略);
|
||||
});
|
||||
|
||||
ProcessingExceptions.RemoveAll(t => t.BoardId == boardId);
|
||||
Logs.Write("协议处理5.5");
|
||||
}
|
||||
@ -728,13 +821,27 @@ namespace WCS.BLL.HardWare
|
||||
case 0x01:
|
||||
{
|
||||
Logs.Write("协议处理5.4");
|
||||
var exceptionMessage = store.StoreCode + "入库过程中存在物料未扫描上架！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var exceptionMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架！";
|
||||
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
WarningType = WarningTypeEnum.入库中未扫描上架,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
//ModuleId = module.ModuleId,
|
||||
//ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
|
||||
ProcessingExceptions.Add(new ProcessingExceptionType()
|
||||
{
|
||||
BoardId = boardId,
|
||||
LightNumber = lightNumber,
|
||||
ExceptionMessage = store.StoreCode + "入库过程中存在物料未扫描上架！"
|
||||
ExceptionMessage = storeInfo.StoreCode + "入库过程中存在物料未扫描上架！"
|
||||
});
|
||||
Logs.Write("协议处理5.5");
|
||||
}
|
||||
@ -742,13 +849,27 @@ namespace WCS.BLL.HardWare
|
||||
case 0x02:
|
||||
{
|
||||
Logs.Write("协议处理5.4");
|
||||
var exceptionMessage = store.StoreCode + "物料被取出！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var exceptionMessage = storeInfo.StoreCode + "物料被取出！";
|
||||
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
WarningType = WarningTypeEnum.入库中异常取出,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
//ModuleId = module.ModuleId,
|
||||
//ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
|
||||
ProcessingExceptions.Add(new ProcessingExceptionType()
|
||||
{
|
||||
BoardId = boardId,
|
||||
LightNumber = lightNumber,
|
||||
ExceptionMessage = store.StoreCode + "入库过程中物料丢失！"
|
||||
ExceptionMessage = storeInfo.StoreCode + "入库过程中物料丢失！"
|
||||
});
|
||||
Logs.Write("协议处理5.5");
|
||||
}
|
||||
@ -906,7 +1027,7 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
public void OutstoreReturnProcess(byte[] data, int boardId, int lightNumber)
|
||||
{
|
||||
if (CurentMode != Mode.出库模式)
|
||||
if (CurrentMode != Mode.出库模式)
|
||||
{
|
||||
//TO DO 未在出库模式 要报错
|
||||
Logs.Write($"出库错误：{ShelfCode}该货架模式不是出库模式或盘点模式！");
|
||||
@ -1003,7 +1124,7 @@ namespace WCS.BLL.HardWare
|
||||
x.IsSended = true;
|
||||
});
|
||||
//TO DO 发料需求表增加数量
|
||||
|
||||
|
||||
//保存数据
|
||||
DbHelp.db.Deleteable(inventoryDetail).ExecuteCommand();
|
||||
DbHelp.db.Insertable(inOutRecord).ExecuteCommand();
|
||||
@ -1016,16 +1137,23 @@ namespace WCS.BLL.HardWare
|
||||
|
||||
//确认本次出库
|
||||
module.ComfirmOutstore(TcpCleint, data[TcpCleint.PreFixLength + 3]);
|
||||
|
||||
//通知前台刷新
|
||||
Task.Run(() =>
|
||||
{
|
||||
//给信号通知出库页面更新页面的状态
|
||||
var messageMode = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
ClientIp = "127.0.0.1",
|
||||
WarningType = WarningTypeEnum.通知刷新出库
|
||||
};
|
||||
WarningManager.SendWarning(messageMode);
|
||||
});
|
||||
|
||||
//当前柜子是否还存在未出库的
|
||||
CurrentOutStoreMatSNs.RemoveAll(t => t == matSN);//删除本次已出的物料SN
|
||||
|
||||
|
||||
var isExsistOut = CurrentOutStoreMatSNs.Any();
|
||||
|
||||
//本批次出库已完成
|
||||
if (!isExsistOut)
|
||||
{
|
||||
@ -1033,8 +1161,97 @@ namespace WCS.BLL.HardWare
|
||||
GoOutOutstore();
|
||||
WarningLight.CloseLight(TcpCleint);
|
||||
var currentPickBillNumber = CurrentOutOrder.OrderNumber;
|
||||
//OrderNumber = string.Empty;
|
||||
CurrentOutOrder = null;
|
||||
}
|
||||
|
||||
//看是否是分批次出库的情况 分批次亮灯
|
||||
if (LocalFile.Config.IsSameMatCodeOut)
|
||||
{
|
||||
#region 触发下一批次的精准发料
|
||||
//查一下是否是当前发料单最后一个货架（在出库模式 同一个发料单下）
|
||||
var isLastShelf = ShelfManager.Shelves
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.Where(t => t.CurrentMode == Mode.出库模式)
|
||||
.Any();
|
||||
if (!isLastShelf)
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，最后一个出库货架，触发精准发料机制！查询是否还存在待出库物料");
|
||||
var outOrder = DbHelp.db.Queryable<OutOrder>()
|
||||
.Where(t => t.OrderNumber == OrderNumber)
|
||||
.First();
|
||||
if (outOrder != null)
|
||||
{
|
||||
var outOrderMatDetails = DbHelp.db.Queryable<OutOrderMatDetail>()
|
||||
.Where(t => t.OrderId == outOrder.Id)
|
||||
.Where(t => t.IsSended == false)
|
||||
.Includes(t => t.StoreInfo)
|
||||
.ToList();
|
||||
|
||||
if (outOrderMatDetails != null && outOrderMatDetails.Count > 0)
|
||||
{
|
||||
//存在待出库 然后之前又没亮灯的情况 => 精准发料分批次亮灯
|
||||
Logs.Write($"发料单{OrderNumber}，还有物料未出！");
|
||||
var outOrderDetailCount = outOrderMatDetails.GroupBy(t => t.MatCode)
|
||||
.Select(o => new { count = o.Count(), bb = o })
|
||||
.Where(o => o.count >= 2)
|
||||
.OrderByDescending(o => o.count)
|
||||
.ToList();
|
||||
//相同物料存在盘数超过2的情况，亮下一个盘数多的物料
|
||||
if (outOrderDetailCount.Count > 0)
|
||||
{
|
||||
var matCode = outOrderDetailCount.First().bb.Key;
|
||||
outOrderMatDetails = outOrderMatDetails.Where(t => t.MatCode == matCode)
|
||||
.ToList();
|
||||
Logs.Write($"发料单{OrderNumber}，本次亮灯物料{matCode}！");
|
||||
}
|
||||
//相同物料不存在盘数超过n的情况，剩余物料全部亮灯
|
||||
else
|
||||
{
|
||||
//剩余物料全出
|
||||
Logs.Write($"发料单{OrderNumber}，剩余物料灯全亮！");
|
||||
}
|
||||
|
||||
var shelfIds = outOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
var shelfs = ShelfManager.Shelves.Where(t => shelfIds.Contains(t.ShelfId)).ToList(); ;
|
||||
|
||||
var otherModeShelfs = shelfs.Where(t => t.CurrentMode != HardWare.Mode.待机模式).ToList();
|
||||
if (otherModeShelfs != null && otherModeShelfs.Count > 0)
|
||||
{
|
||||
otherModeShelfs.ForEach(t =>
|
||||
{
|
||||
t.Reset();
|
||||
});
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
//对应的货架对应位置 进入出库模式 亮灯
|
||||
shelfs.ForEach(shelf =>
|
||||
{
|
||||
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
|
||||
|
||||
.Distinct()
|
||||
.ToList();
|
||||
shelf.GoInOutstore(matDetails, outOrder);
|
||||
shelf.OrderNumber = outOrder.OrderNumber;
|
||||
});
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，当前物料已发完！");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Logs.Write($"发料单{OrderNumber}，OutOrder为null，肯定是有问题");
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -1071,10 +1288,10 @@ namespace WCS.BLL.HardWare
|
||||
public void OutstoreExceptionReturnProcess(byte[] data, int boardId, int lightNumber)
|
||||
{
|
||||
lightNumber = (int)data[TcpCleint.PreFixLength + 4];
|
||||
var store = DbHelp.db.Queryable<StoreInfo>()
|
||||
var storeInfo = DbHelp.db.Queryable<StoreInfo>()
|
||||
.Where(t => t.BoardId == boardId && t.LightNumber == lightNumber)
|
||||
.First();
|
||||
if (store == null)
|
||||
if (storeInfo == null)
|
||||
{
|
||||
//TO DO 库位未找到
|
||||
return;
|
||||
@ -1084,32 +1301,82 @@ namespace WCS.BLL.HardWare
|
||||
{
|
||||
case 0x00:
|
||||
{
|
||||
var exceptionMessage = store.StoreCode + "恢复正常！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
//对应的异常
|
||||
var warnings = WarningManager.Warnings.Where(t => t.IsWarning = true)
|
||||
.Where(t => t.ShelfId == ShelfId && t.StoreId == storeInfo.Id)
|
||||
.ToList();
|
||||
|
||||
var exceptionMessage = storeInfo.StoreCode + "恢复正常！";
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
IsWarning = false,
|
||||
WarningType = WarningTypeEnum.恢复正常,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1",
|
||||
SolvedGuids = warnings.Select(t => t.Guid).ToList(),
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
//自动消除本地缓存的报警
|
||||
warnings.ForEach(warning =>
|
||||
{
|
||||
WarningManager.ClearWarning(warning, SolveTypeEnum.忽略);
|
||||
});
|
||||
ProcessingExceptions.RemoveAll(t => t.BoardId == boardId);
|
||||
}
|
||||
break;
|
||||
case 0x01:
|
||||
{
|
||||
var exceptionMessage = store.StoreCode + "出库过程中存在物料上架！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var exceptionMessage = storeInfo.StoreCode + "出库过程中存在物料上架！";
|
||||
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
WarningType = WarningTypeEnum.出库中未扫描上架,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
//ModuleId = module.ModuleId,
|
||||
//ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
|
||||
ProcessingExceptions.Add(new ProcessingExceptionType()
|
||||
{
|
||||
BoardId = boardId,
|
||||
LightNumber = lightNumber,
|
||||
ExceptionMessage = store.StoreCode + "出库过程中存在物料上架！"
|
||||
ExceptionMessage = storeInfo.StoreCode + "出库过程中存在物料上架！"
|
||||
});
|
||||
}
|
||||
break;
|
||||
case 0x02:
|
||||
{
|
||||
var exceptionMessage = store.StoreCode + "物料被取出！";
|
||||
WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var exceptionMessage = storeInfo.StoreCode + "物料被取出！";
|
||||
//WebSoceketManager.TrySendMessage("127.0.0.1", exceptionMessage);
|
||||
var warningModel = new WebSocketMessageModel()
|
||||
{
|
||||
WarningType = WarningTypeEnum.出库中丢失,
|
||||
StoreId = storeInfo.Id,
|
||||
StoreCode = storeInfo.StoreCode,
|
||||
//ModuleId = module.ModuleId,
|
||||
//ModuleCode = module.ModuleCode,
|
||||
ShelfCode = ShelfCode,
|
||||
ShelfId = ShelfId,
|
||||
WarningMessage = exceptionMessage,
|
||||
ClientIp = "127.0.0.1"
|
||||
};
|
||||
WarningManager.SendWarning(warningModel);
|
||||
|
||||
ProcessingExceptions.Add(new ProcessingExceptionType()
|
||||
{
|
||||
BoardId = boardId,
|
||||
LightNumber = lightNumber,
|
||||
ExceptionMessage = store.StoreCode + "出库过程中物料被异常取出！"
|
||||
ExceptionMessage = storeInfo.StoreCode + "出库过程中物料被异常取出！"
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user