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

Added Siemens reading functions

Browse Source 
& minor fix
This commit is contained in:
Lucio Maranta
2018-05-10 17:06:17 +02:00
parent 810622fe4e
commit bded8e936e
4 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/WebApi/ToolTableController.cs
+8 -29
View File
@@ -3,6 +3,7 @@ using Step.NC;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
using System.Linq;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
@@ -32,12 +33,15 @@ namespace Step.Controllers.WebApi
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
Stopwatch sw = new Stopwatch();
sw.Start();
CmsError libraryError = ncHandler.GetToolTableData(out List<SiemensToolModel> tools);
if (libraryError.IsError())
if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
return BadRequest(libraryError.message);
Console.WriteLine(sw.ElapsedMilliseconds);
return Ok(tools);
}
}
@@ -51,7 +55,7 @@ namespace Step.Controllers.WebApi
using (NcHandler ncHandler = new NcHandler())
{
// Convert from DTOModel to library model
SiemensToolModel siemensModel = ConvertFromDTOtoSiemensModel(tool);
SiemensToolModel siemensModel = (SiemensToolModel)tool; ;
ncHandler.Connect();
CmsError libraryError = ncHandler.AddTool(ref siemensModel);
@@ -72,7 +76,7 @@ namespace Step.Controllers.WebApi
using (NcHandler ncHandler = new NcHandler())
{
// Convert from DTOModel to library model
SiemensToolModel siemensModel = ConvertFromDTOtoSiemensModel(tool);
SiemensToolModel siemensModel = (SiemensToolModel)tool;
siemensModel.Id = id;
ncHandler.Connect();
@@ -86,31 +90,6 @@ namespace Step.Controllers.WebApi
}
}
private SiemensToolModel ConvertFromDTOtoSiemensModel(DTOSiemensToolModel dtoModel)
{
return new SiemensToolModel()
{
MagazinePositionType = dtoModel.MagazinePositionType,
ToolType = dtoModel.ToolType,
FamilyName = dtoModel.FamilyName,
IsActive = dtoModel.IsActive,
IsInhibited = dtoModel.IsInhibited,
IsInUse = dtoModel.IsInUse,
IsMeasured = dtoModel.IsMeasured,
InChangeTool = dtoModel.InChangeTool,
InFixedPlace = dtoModel.InFixedPlace,
PreAlarm = dtoModel.PreAlarm,
Cooling1 = dtoModel.Cooling1,
Cooling2 = dtoModel.Cooling2,
LeftSize = dtoModel.LeftSize,
RightSize = dtoModel.RightSize,
Rotation = dtoModel.Rotation
};
}
[Route("tool/{id:int}"), HttpDelete]
public IHttpActionResult DeleteTool(int id)
{
@@ -378,7 +357,7 @@ namespace Step.Controllers.WebApi
{
ncHandler.Connect();
// Call delete library function
CmsError libraryError = ncHandler.GetMagazinePositionsAndTools(magazineId, out List<MagazinePositionsModel> magazinePos);
CmsError libraryError = ncHandler.GetMagazinePositionsAndTools(magazineId, out List<MagazineAndToolModel> magazinePos);
if (libraryError.IsError())
if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
return BadRequest(libraryError.message);