diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs index c7ad89ed..a032b3ba 100644 --- a/Step.Database/Controllers/NcToolManagerController.cs +++ b/Step.Database/Controllers/NcToolManagerController.cs @@ -240,12 +240,21 @@ namespace Step.Database.Controllers public List GetAvailableShanks() { List dtoShanks = GetShanks() - .Where(x => x.MagazineId == null && x.ChildsTools.Count > 0) + .Where(x => x.MagazineId == null) .ToList(); return dtoShanks; } - + + public List GetAvailableShanksWithoutChilds() + { + List dtoShanks = GetShanks() + .Where(x => x.MagazineId == null && x.ChildsTools.Count > 0) + .ToList(); + + return dtoShanks; + } + public List GetAvailableTools() { List dtoTools = GetTools() diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs index 9cb9be8f..fa693c05 100644 --- a/Step/Controllers/WebApi/NcToolManagerController.cs +++ b/Step/Controllers/WebApi/NcToolManagerController.cs @@ -473,7 +473,16 @@ namespace Step.Controllers.WebApi { using (NcToolManagerController toolsManager = new NcToolManagerController()) { - List shanks = toolsManager.GetAvailableShanks(); + List shanks = new List(); + if (ToolManagerConfig.MultidimensionalShankOpt) + { + shanks = toolsManager.GetAvailableShanks(); + } + else + { + shanks = toolsManager.GetAvailableShanksWithoutChilds(); + } + return Ok(shanks); }