diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs index dd0f6bb0..94b49756 100644 --- a/Step.Database/Controllers/NcToolManagerController.cs +++ b/Step.Database/Controllers/NcToolManagerController.cs @@ -35,6 +35,16 @@ namespace Step.Database.Controllers return families; } + public NcToolModel FindTool(int toolId) + { + return dbCtx.Tools + .Include("Offset1") + .Include("Offset2") + .Include("Offset3") + .Where(x => x.ToolId == toolId) + .FirstOrDefault(); + } + public List GetTools() { List tools = dbCtx.Tools @@ -77,6 +87,18 @@ namespace Step.Database.Controllers return (NcToolModel)tool; } + public NcToolModel UpdateTool(NcToolModel tool, DTONcToolModel dtoTool) + { + tool.FamilyId = dtoTool.FamilyId; + tool.Type = dtoTool.Type; + tool.OffsetLenght = dtoTool.OffsetLenght; + tool.ResidualLife = dtoTool.ResidualLife; + tool.ResidualRevive = dtoTool.ResidualRevive; + + dbCtx.SaveChanges(); + + return (NcToolModel)tool; + } public NcFamilyModel AddFamily(DTONcFamilyModel family) { @@ -86,5 +108,14 @@ namespace Step.Database.Controllers return (NcFamilyModel)family; } + + public NcShankModel AddShank(DTONcShankModel shank) + { + dbCtx.Shanks.Add((NcShankModel)shank); + + dbCtx.SaveChanges(); + + return (NcShankModel)shank; + } } } \ No newline at end of file diff --git a/Step.Database/Migrations/201806260745029_InitMigration.resx b/Step.Database/Migrations/201806260745029_InitMigration.resx deleted file mode 100644 index 93e9aed7..00000000 --- a/Step.Database/Migrations/201806260745029_InitMigration.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - dbo - - \ No newline at end of file diff --git a/Step.Database/Migrations/201806260745029_InitMigration.Designer.cs b/Step.Database/Migrations/201806271056363_InitMigration.Designer.cs similarity index 92% rename from Step.Database/Migrations/201806260745029_InitMigration.Designer.cs rename to Step.Database/Migrations/201806271056363_InitMigration.Designer.cs index b8a28380..11392de3 100644 --- a/Step.Database/Migrations/201806260745029_InitMigration.Designer.cs +++ b/Step.Database/Migrations/201806271056363_InitMigration.Designer.cs @@ -13,7 +13,7 @@ namespace Step.Database.Migrations string IMigrationMetadata.Id { - get { return "201806260745029_InitMigration"; } + get { return "201806271056363_InitMigration"; } } string IMigrationMetadata.Source diff --git a/Step.Database/Migrations/201806260745029_InitMigration.cs b/Step.Database/Migrations/201806271056363_InitMigration.cs similarity index 98% rename from Step.Database/Migrations/201806260745029_InitMigration.cs rename to Step.Database/Migrations/201806271056363_InitMigration.cs index e1363407..0b37ce72 100644 --- a/Step.Database/Migrations/201806260745029_InitMigration.cs +++ b/Step.Database/Migrations/201806271056363_InitMigration.cs @@ -201,14 +201,14 @@ namespace Step.Database.Migrations "dbo.shank", c => new { - magazine_id = c.Byte(nullable: false), - position_id = c.Byte(nullable: false), + magazine_id = c.Byte(), + position_id = c.Byte(), id = c.Int(nullable: false, identity: true), balluf = c.Short(), magazine_position_type = c.Byte(nullable: false), }) .PrimaryKey(t => t.id) - .ForeignKey("dbo.magazine_position", t => new { t.magazine_id, t.position_id }, cascadeDelete: true) + .ForeignKey("dbo.magazine_position", t => new { t.magazine_id, t.position_id }) .Index(t => new { t.magazine_id, t.position_id }); CreateTable( diff --git a/Step.Database/Migrations/201806271056363_InitMigration.resx b/Step.Database/Migrations/201806271056363_InitMigration.resx new file mode 100644 index 00000000..0b143f86 --- /dev/null +++ b/Step.Database/Migrations/201806271056363_InitMigration.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/Step.Database/Step.Database.csproj b/Step.Database/Step.Database.csproj index c05df89a..fa39431e 100644 --- a/Step.Database/Step.Database.csproj +++ b/Step.Database/Step.Database.csproj @@ -78,9 +78,9 @@ - - - 201806260745029_InitMigration.cs + + + 201806271056363_InitMigration.cs @@ -116,8 +116,8 @@ - - 201806260745029_InitMigration.cs + + 201806271056363_InitMigration.cs diff --git a/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs b/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs new file mode 100644 index 00000000..ecb4bb60 --- /dev/null +++ b/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs @@ -0,0 +1,46 @@ +using Step.Model.DatabaseModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Step.Model.DTOModels.ToolModels +{ + public class DTONcShankModel + { + public int Id { get; set; } + + public short? Balluf { get; set; } + + public byte MagazinePositionType { get; set; } + + public byte? MagazineId { get; set; } + + public byte? PositionId { get; set; } + + public static explicit operator DTONcShankModel(NcShankModel obj) + { + return new DTONcShankModel() + { + Id = obj.ShankId, + Balluf = obj.Balluf, + MagazinePositionType = obj.MagazinePositionType, + MagazineId = obj.MagazineId, + PositionId = obj.PositionId + }; + } + + public static explicit operator NcShankModel(DTONcShankModel obj) + { + return new NcShankModel() + { + ShankId = obj.Id, + Balluf = obj.Balluf, + MagazinePositionType = obj.MagazinePositionType, + MagazineId = obj.MagazineId, + PositionId = obj.PositionId + }; + } + } +} diff --git a/Step.Model/Step.Model.csproj b/Step.Model/Step.Model.csproj index 8745c624..bd74f8cb 100644 --- a/Step.Model/Step.Model.csproj +++ b/Step.Model/Step.Model.csproj @@ -113,6 +113,7 @@ + diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index cf45f671..b63bd5fe 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -1071,6 +1071,14 @@ namespace Step.NC } } + public NcToolModel UpdateTool(NcToolModel tool, DTONcToolModel dtoTool) + { + using (NcToolManagerController toolsManager = new NcToolManagerController()) + { + return toolsManager.UpdateTool(tool, dtoTool); + } + } + public NcFamilyModel AddFamily(DTONcFamilyModel family) { using (NcToolManagerController toolsManager = new NcToolManagerController()) @@ -1078,6 +1086,14 @@ namespace Step.NC return toolsManager.AddFamily(family); } } + + public NcShankModel AddShank(DTONcShankModel shank) + { + using (NcToolManagerController toolsManager = new NcToolManagerController()) + { + return toolsManager.AddShank(shank); + } + } #endregion Write data } } \ No newline at end of file diff --git a/Step/Controllers/WebApi/NcToolTableController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs similarity index 55% rename from Step/Controllers/WebApi/NcToolTableController.cs rename to Step/Controllers/WebApi/NcToolManagerController.cs index 9f07b849..17870c71 100644 --- a/Step/Controllers/WebApi/NcToolTableController.cs +++ b/Step/Controllers/WebApi/NcToolManagerController.cs @@ -1,4 +1,5 @@ -using Step.Model.DatabaseModels; +using Step.Database.Controllers; +using Step.Model.DatabaseModels; using Step.Model.DTOModels.ToolModels; using Step.NC; using System; @@ -12,7 +13,7 @@ using System.Web.Http; namespace Step.Controllers.WebApi { [RoutePrefix("api/tool_manager/nc")] - public class NcToolTableController : ApiController + public class NcToolManagerApiController : ApiController { [Route("tools"), HttpGet] public IHttpActionResult GetNcToolTable() @@ -77,7 +78,7 @@ namespace Step.Controllers.WebApi } [Route("tool"), HttpPost] - public IHttpActionResult AddTool([FromBody][Required]DTONcToolModel tool) + public IHttpActionResult AddTool([FromBody][Required]DTONcToolModel dtoTool) { if (!ModelState.IsValid) return BadRequest(ModelState); @@ -85,14 +86,36 @@ namespace Step.Controllers.WebApi using (NcHandler ncHandler = new NcHandler()) { ncHandler.Connect(); - NcToolModel newTool = ncHandler.AddTool(tool); + NcToolModel newTool = ncHandler.AddTool(dtoTool); return Ok(newTool); } } - [Route("tool"), HttpPost] - public IHttpActionResult AddFamily([FromBody][Required]DTONcFamilyModel family) + [Route("tool/{toolId:int}"), HttpPut] + public IHttpActionResult PutTool(int toolId, [FromBody][Required]DTONcToolModel dtoTool) + { + if (!ModelState.IsValid) + return BadRequest(ModelState); + + using (NcToolManagerController toolsManager = new NcToolManagerController()) + { + NcToolModel tool = toolsManager.FindTool(toolId); + if (tool == null) + return NotFound(); + + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + NcToolModel newTool = ncHandler.UpdateTool(tool, dtoTool); + + return Ok(newTool); + } + } + } + + [Route("family"), HttpPost] + public IHttpActionResult AddFamily([FromBody][Required]DTONcFamilyModel dtoFamily) { if (!ModelState.IsValid) return BadRequest(ModelState); @@ -100,10 +123,46 @@ namespace Step.Controllers.WebApi using (NcHandler ncHandler = new NcHandler()) { ncHandler.Connect(); - NcFamilyModel newFamily = ncHandler.AddFamily(family); + NcFamilyModel newFamily = ncHandler.AddFamily(dtoFamily); return Ok(newFamily); } } + + [Route("tool/{toolId:int}"), HttpPut] + public IHttpActionResult PutFamily(int toolId, [FromBody][Required]DTONcToolModel dtoTool) + { + if (!ModelState.IsValid) + return BadRequest(ModelState); + + using (NcToolManagerController toolsManager = new NcToolManagerController()) + { + NcToolModel tool = toolsManager.FindTool(toolId); + if (tool == null) + return NotFound(); + + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + NcToolModel newTool = ncHandler.UpdateTool(tool, dtoTool); + + return Ok(newTool); + } + } + } + + [Route("shank"), HttpPost] + public IHttpActionResult AddShank([FromBody][Required] DTONcShankModel dtoShank) + { + if (!ModelState.IsValid) + return BadRequest(ModelState); + + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + NcShankModel shank = ncHandler.AddShank(dtoShank); + return Ok(shank); + } + } } } diff --git a/Step/Controllers/WebApi/SiemensToolTableController.cs b/Step/Controllers/WebApi/SiemensToolManagerController.cs similarity index 99% rename from Step/Controllers/WebApi/SiemensToolTableController.cs rename to Step/Controllers/WebApi/SiemensToolManagerController.cs index 9fac363e..c4da2a31 100644 --- a/Step/Controllers/WebApi/SiemensToolTableController.cs +++ b/Step/Controllers/WebApi/SiemensToolManagerController.cs @@ -11,7 +11,7 @@ using static CMS_CORE_Library.DataStructures; namespace Step.Controllers.WebApi { [RoutePrefix("api/tool_manager")] - public class SiemensToolTableController : ApiController + public class SiemensToolManagerController : ApiController { [Route("tools"), HttpGet] public IHttpActionResult GetToolTable() diff --git a/Step/Step.csproj b/Step/Step.csproj index 9e6dfcf8..56ce8cad 100644 --- a/Step/Step.csproj +++ b/Step/Step.csproj @@ -174,8 +174,8 @@ - - + +