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

Fix osai file writing

Browse Source 
Testing transaction
This commit is contained in:
Lucio Maranta
2018-07-17 14:36:53 +02:00
parent 5e81d377fd
commit a2f7a97485
6 changed files with 219 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/WebApi/NcToolManagerController.cs
+23 -9
View File
@@ -128,7 +128,7 @@ namespace Step.Controllers.WebApi
// If option is active find & delete tool shank
DbNcShankModel shank = toolsManager.FindShank(tool.ShankId.Value);
ncHandler.DeleteNcShank(shank);
ncHandler.DeleteNcShank(shank.ShankId);
}
ncHandler.DeleteNcTool(tool);
@@ -206,7 +206,7 @@ namespace Step.Controllers.WebApi
{
ncHandler.Connect();
ncHandler.DeleteNcShank(shank);
ncHandler.DeleteNcShank(shank.ShankId);
return Ok();
}
@@ -471,14 +471,14 @@ namespace Step.Controllers.WebApi
}
}
[Route("start_edit"), HttpPut]
public IHttpActionResult StartEdit()
[Route("start_edit_data"), HttpPut]
public IHttpActionResult StartEditData()
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError cmsError = ncHandler.StartEdit();
CmsError cmsError = ncHandler.StartEditData();
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
@@ -487,19 +487,33 @@ namespace Step.Controllers.WebApi
}
}
[Route("stop_edit"), HttpPut]
[Route("start_edit_tooling/{magazineId:int}"), HttpPut]
public IHttpActionResult StartEditTooling(int magazineId)
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError cmsError = ncHandler.StartEditTooling(magazineId);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
return Ok();
}
}
[Route("stop_edit_data"), HttpPut]
public IHttpActionResult StopEdit()
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError cmsError = ncHandler.StopEdit();
CmsError cmsError = ncHandler.StopEditTooling();
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
return Ok();
}
}