复位无法清理状态!!!
This commit is contained in:
@ -994,7 +994,7 @@ namespace WCS.BLL.HardWare
|
|||||||
ExceptionMessages.Add($"模组{item.ModuleCode}未响应自检!");
|
ExceptionMessages.Add($"模组{item.ModuleCode}未响应自检!");
|
||||||
}
|
}
|
||||||
//通信校验
|
//通信校验
|
||||||
var messages = notReturnList.Select(t => $"模组{t.ModuleCode}未响应自检!").ToList();
|
var messages = notReturnList.Select(t => $"模组{t.ModuleCode}({t.CurrentMode})未响应自检!").ToList();
|
||||||
var exceptionMessage = string.Join("\r\n", messages);
|
var exceptionMessage = string.Join("\r\n", messages);
|
||||||
var warningModel = new WebSocketMessageModel()
|
var warningModel = new WebSocketMessageModel()
|
||||||
{
|
{
|
||||||
@ -2240,7 +2240,9 @@ namespace WCS.BLL.HardWare
|
|||||||
|
|
||||||
public void ResetReturnProcess(byte[] data, int boardId, int lightNumber)
|
public void ResetReturnProcess(byte[] data, int boardId, int lightNumber)
|
||||||
{
|
{
|
||||||
var module = this.Modules.Where(t => t.BoardId == boardId && t.CurrentMode == Mode.入库模式).FirstOrDefault();
|
var module = this.Modules
|
||||||
|
.Where(t => t.BoardId == boardId)
|
||||||
|
.FirstOrDefault();
|
||||||
if (module == null)
|
if (module == null)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -42,12 +42,13 @@ namespace WCS.BLL.Services.Service
|
|||||||
Message = "操作失败:没有需要控制的库位",
|
Message = "操作失败:没有需要控制的库位",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
//对应库位
|
//库位编码去重
|
||||||
var storeCodes = request.StoreList.Select(t => t.StoreCode)
|
var storeCodes = request.StoreList.Select(t => t.StoreCode)
|
||||||
.Distinct()
|
.Distinct()
|
||||||
.ToList();
|
.ToList();
|
||||||
var stores = DbHelp.db.Queryable<StoreInfo>().Where(t => storeCodes.Contains(t.StoreCode))
|
var stores = DbHelp.db.Queryable<StoreInfo>()
|
||||||
.ToList();
|
.Where(t => storeCodes.Contains(t.StoreCode))
|
||||||
|
.ToList();
|
||||||
if (stores == null || stores.Count == 0)
|
if (stores == null || stores.Count == 0)
|
||||||
{
|
{
|
||||||
return new ResponseCommon<object>
|
return new ResponseCommon<object>
|
||||||
@ -61,10 +62,11 @@ namespace WCS.BLL.Services.Service
|
|||||||
var shelfIds = stores.Select(t => t.ShelfId).Distinct().ToList();
|
var shelfIds = stores.Select(t => t.ShelfId).Distinct().ToList();
|
||||||
var shelfs = DbHelp.db.Queryable<ShelfInfo>().Where(t => shelfIds.Contains(t.Id))
|
var shelfs = DbHelp.db.Queryable<ShelfInfo>().Where(t => shelfIds.Contains(t.Id))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
//对应模组信息
|
//对应模组信息
|
||||||
var moduleIds = stores.Select(t => t.ModuleId).Distinct().ToList();
|
var moduleIds = stores.Select(t => t.ModuleId).Distinct().ToList();
|
||||||
var modules = DbHelp.db.Queryable<ModuleInfo>().Where(t => moduleIds.Contains(t.Id))
|
var modules = DbHelp.db.Queryable<ModuleInfo>().Where(t => moduleIds.Contains(t.Id))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
//加载请求参数中的库位灯 板子ID和货架ID
|
//加载请求参数中的库位灯 板子ID和货架ID
|
||||||
foreach (var store in request.StoreList)
|
foreach (var store in request.StoreList)
|
||||||
|
Reference in New Issue
Block a user