1.前后端增加复位功能
2.tcpclient心跳设置 3.优化后端启动速度 4.增加后端出库日志
This commit is contained in:
@ -1,6 +1,7 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SqlSugar;
|
||||
using WCS.BLL.DbModels;
|
||||
using WCS.BLL.HardWare;
|
||||
using WCS.BLL.Manager;
|
||||
using WCS.BLL.Services.IService;
|
||||
using WCS.BLL.Services.Service;
|
||||
@ -85,9 +86,71 @@ namespace WCS.WebApi.Controllers
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return null;
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 300,
|
||||
Message = "获取失败:" + ex.Message,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重置货架的状态 使其回到待机模式
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[Route("resetShelfStatus")]
|
||||
[HttpPost(Name = "resetShelfStatus")]
|
||||
public async Task<ResponseBase> resetShelfStatus(ResetShelfStatusRequest request)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (request.IsResetAll == false && (request.SelfIds == null || request.SelfIds.Count == 0))
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 201,
|
||||
Message = "复位失败:请选择需要复位的货架!",
|
||||
};
|
||||
}
|
||||
if (request.IsResetAll == true && (request.GroupNames == null || request.GroupNames.Count == 0))
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 201,
|
||||
Message = "复位失败:请选择需要复位的货架区域!",
|
||||
};
|
||||
}
|
||||
var shelfs = new List<IShelfBase>();
|
||||
if (request.IsResetAll == false)
|
||||
shelfs = ShelfManager.Shelves
|
||||
.Where(t => request.SelfIds.Contains(t.ShelfId))
|
||||
.Where(t => t.CurrentMode != Mode.待机模式)
|
||||
.ToList();
|
||||
else
|
||||
shelfs = ShelfManager.Shelves
|
||||
.Where(t => request.GroupNames.Contains(t.GroupName))
|
||||
.Where(t => t.CurrentMode != Mode.待机模式)
|
||||
.ToList();
|
||||
foreach (var shelf in shelfs)
|
||||
{
|
||||
shelf.Reset();
|
||||
}
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 200,
|
||||
Message = "success",
|
||||
};
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new ResponseBase()
|
||||
{
|
||||
Code = 300,
|
||||
Message = ex.Message,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -24,5 +24,7 @@ namespace WCS.WebApi.Controllers
|
||||
{
|
||||
return await _warningService.SolveWarning(request);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user