Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix siemens library

Browse Source 
Change load/unload in magazine API
This commit is contained in:
Lucio Maranta
2018-05-30 15:09:24 +02:00
parent e3476cd122
commit b3b2632e8e
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/WebApi/ToolTableController.cs
+6 -6
View File
@@ -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);