diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 973414d0..c05b5198 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs b/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs index 452713fc..fc3e8a69 100644 --- a/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs @@ -15,7 +15,7 @@ namespace Step.Model.DTOModels.ToolModels { return new DTOMagazineActionModel() { - action = magazineStatus.action, + action = magazineStatus.Action, OriginMagazine = magazineStatus.OriginMagazine, OriginPosition = magazineStatus.OriginPosition, DestinationMagazine = magazineStatus.DestinationMagazine, diff --git a/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs b/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs index 3641479a..9e7d3e26 100644 --- a/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs @@ -4,9 +4,6 @@ namespace Step.Model.DTOModels.ToolModels { public class DTOUpdateMagazineModel { - [Required] - public int PositionId { get; set; } - [Required] public int ToolId { get; set; } } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 8705f8fe..f233d3e9 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -848,7 +848,7 @@ namespace Step.NC return numericalControl.TOOLS_WUnloadToolInMagazine(magazineId, positionId); } - public CmsError LoadTooolFromShank(int shankId, int positionId, int toolId) + public CmsError LoadTooolIntoShank(int shankId, int positionId, int toolId) { return numericalControl.TOOLS_WLoadToolIntoShank(shankId, positionId, toolId); } diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs index 730dc799..cfd92495 100644 --- a/Step/Controllers/WebApi/ToolTableController.cs +++ b/Step/Controllers/WebApi/ToolTableController.cs @@ -365,8 +365,8 @@ namespace Step.Controllers.WebApi } } - [Route("magazine/{magazineId:int}/load"), HttpPut] - public IHttpActionResult LoadToolInToMagazine(int magazineId, [FromBody][Required] DTOUpdateMagazineModel newMag) + [Route("magazine/{magazineId:int}/load/position/{positionId:int}"), HttpPut] + public IHttpActionResult LoadToolInToMagazine(int magazineId, int positionId, [FromBody][Required] DTOUpdateMagazineModel toolId) { if (!ModelState.IsValid) return BadRequest(ModelState); @@ -375,17 +375,17 @@ namespace Step.Controllers.WebApi { ncHandler.Connect(); - NewToolInMagazineModel libraryMag = new NewToolInMagazineModel { PositionId = newMag.PositionId, ToolId = newMag.ToolId }; + NewToolInMagazineModel libraryMag = new NewToolInMagazineModel { PositionId = positionId, ToolId = toolId.ToolId }; // Call delete library function CmsError libraryError = ncHandler.LoadToolInMagazine(magazineId, libraryMag); if (libraryError.IsError()) return BadRequest(libraryError.localizationKey); - return Ok(newMag); + return Ok(toolId); } } - [Route("magazine/{magazineId:int}/unload/{positionId:int}"), HttpPut] + [Route("magazine/{magazineId:int}/unload/position/{positionId:int}"), HttpPut] public IHttpActionResult UnloadToolFromMagazine(int magazineId, int positionId) { if (!ModelState.IsValid) @@ -414,7 +414,7 @@ namespace Step.Controllers.WebApi { ncHandler.Connect(); - CmsError libraryError = ncHandler.LoadTooolFromShank(shankId, positionId, toolId); + CmsError libraryError = ncHandler.LoadTooolIntoShank(shankId, positionId, toolId); if (libraryError.IsError()) return BadRequest(libraryError.localizationKey);