diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 0ede69b8..7d04d84d 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 305b74e7..6d652812 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -652,6 +652,23 @@ namespace Step.NC return numericalControl.TOOLS_RToolTable(ref config); } + public CmsError GetShanksData(out List shanks) + { + shanks = new List(); + return numericalControl.TOOLS_RShanksData(ref shanks); + } + + public CmsError GetFamiliesData(out List families) + { + families = new List(); + return numericalControl.TOOLS_RFamilyData(ref families); + } + + public CmsError GetMagazinesPositionsData(out List magazinesPositions) + { + magazinesPositions = new List(); + return numericalControl.TOOLS_RMagazinePositions(ref magazinesPositions); + } #endregion Read Data #region Write data diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs index bf489c3e..2cc7efba 100644 --- a/Step/Controllers/WebApi/ToolTableController.cs +++ b/Step/Controllers/WebApi/ToolTableController.cs @@ -24,7 +24,7 @@ namespace Step.Controllers.WebApi } [Route("tools"), HttpGet] - public IHttpActionResult GetToolTableData() + public IHttpActionResult GetToolTable() { using (NcHandler ncHandler = new NcHandler()) { @@ -37,5 +37,50 @@ namespace Step.Controllers.WebApi return Ok(tools); } } + + [Route("shanks"), HttpGet] + public IHttpActionResult GetShanks() + { + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + CmsError libraryError = ncHandler.GetShanksData(out List shanks); + if (libraryError.IsError()) + if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED) + return BadRequest(libraryError.message); + + return Ok(shanks); + } + } + + [Route("families"), HttpGet] + public IHttpActionResult GetFamilies() + { + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + CmsError libraryError = ncHandler.GetFamiliesData(out List families); + if (libraryError.IsError()) + if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED) + return BadRequest(libraryError.message); + + return Ok(families); + } + } + + [Route("magazines_positions"), HttpGet] + public IHttpActionResult GetMagazinesPositions() + { + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + CmsError libraryError = ncHandler.GetMagazinesPositionsData(out List magazines); + if (libraryError.IsError()) + if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED) + return BadRequest(libraryError.message); + + return Ok(magazines); + } + } } } \ No newline at end of file