Fix available shank query

This commit is contained in:
Lucio Maranta
2018-08-24 11:14:19 +02:00
parent 0715c55d28
commit f156daa931
2 changed files with 21 additions and 3 deletions
@@ -240,12 +240,21 @@ namespace Step.Database.Controllers
public List<DTONcShankModel> GetAvailableShanks()
{
List<DTONcShankModel> dtoShanks = GetShanks()
.Where(x => x.MagazineId == null && x.ChildsTools.Count > 0)
.Where(x => x.MagazineId == null)
.ToList();
return dtoShanks;
}
public List<DTONcShankModel> GetAvailableShanksWithoutChilds()
{
List<DTONcShankModel> dtoShanks = GetShanks()
.Where(x => x.MagazineId == null && x.ChildsTools.Count > 0)
.ToList();
return dtoShanks;
}
public List<DTONcToolModel> GetAvailableTools()
{
List<DTONcToolModel> dtoTools = GetTools()
@@ -473,7 +473,16 @@ namespace Step.Controllers.WebApi
{
using (NcToolManagerController toolsManager = new NcToolManagerController())
{
List<DTONcShankModel> shanks = toolsManager.GetAvailableShanks();
List<DTONcShankModel> shanks = new List<DTONcShankModel>();
if (ToolManagerConfig.MultidimensionalShankOpt)
{
shanks = toolsManager.GetAvailableShanks();
}
else
{
shanks = toolsManager.GetAvailableShanksWithoutChilds();
}
return Ok(shanks);
}