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

Fix tool update

Browse Source
This commit is contained in:
Lucio Maranta
2018-07-05 17:35:34 +02:00
parent 10ba0176c3
commit 28e65cbdda
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/NcToolManagerController.cs
+14 -15
View File
@@ -156,12 +156,12 @@ namespace Step.Database.Controllers
return positions;
}
public List<NcOffsetModel> GetOffsets()
{
List<NcOffsetModel> offsets = dbCtx.Offsets.ToList();
//public List<NcOffsetModel> GetOffsets()
//{
// List<NcOffsetModel> offsets = dbCtx.Offsets.ToList();
return offsets;
}
// return offsets;
//}
public List<DTONcShankModel> GetMountedShanks(int magazineId)
{
@@ -197,16 +197,15 @@ namespace Step.Database.Controllers
public NcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
{
NcToolModel tool = FindTool(toolId);
//// Update db model
//tool.FamilyId = obj.FamilyId;
//tool.Type = obj.Type;
//tool.OffsetLength = obj.OffsetLength;
//tool.ResidualLife = obj.ResidualLife;
//tool.ResidualRevive = obj.ResidualRevive;
//tool.OffsetId1 = obj.OffsetId1;
//tool.OffsetId2 = obj.OffsetId2;
//tool.OffsetId3 = obj.OffsetId3;
tool = (NcToolModel)dtoTool;
// Update db model
tool.FamilyId = dtoTool.FamilyId;
tool.Type = dtoTool.Type;
tool.OffsetLength = dtoTool.OffsetLength;
tool.ResidualLife = dtoTool.ResidualLife;
tool.ResidualRevive = dtoTool.ResidualRevive;
tool.OffsetId1 = dtoTool.OffsetId1;
tool.OffsetId2 = dtoTool.OffsetId2;
tool.OffsetId3 = dtoTool.OffsetId3;
// Save
dbCtx.SaveChanges();
Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
+3 -3
View File
@@ -30,7 +30,7 @@ namespace Step.Model.DTOModels.ToolModels
return new DTONcTool()
{
FamilyId = obj.FamilyId,
ShankId = obj.ShankId.Value,
ShankId = obj.ShankId == null ? 0 : obj.ShankId.Value,
Type = obj.Type,
OffsetLength = obj.OffsetLength,
ResidualLife = obj.ResidualLife,
@@ -68,7 +68,7 @@ namespace Step.Model.DTOModels.ToolModels
{
Id = obj.ToolId,
FamilyId = obj.FamilyId,
ShankId = obj.ShankId.Value,
ShankId = obj.ShankId == null ? 0 : obj.ShankId.Value,
Type = obj.Type,
OffsetLength = obj.OffsetLength,
ResidualLife = obj.ResidualLife,
@@ -104,7 +104,7 @@ namespace Step.Model.DTOModels.ToolModels
return new DTONewNcToolModel()
{
FamilyId = obj.FamilyId,
ShankId = obj.ShankId.Value,
ShankId = obj.ShankId == null ? 0 : obj.ShankId.Value,
Type = obj.Type,
OffsetLength = obj.OffsetLength,
ResidualLife = obj.ResidualLife,
Step/Controllers/WebApi/NcToolManagerController.cs
+7
View File
@@ -90,6 +90,13 @@ namespace Step.Controllers.WebApi
if (tool == null)
return NotFound();
if(tool.FamilyId != dtoTool.FamilyId)
{
// Check if family exists
NcFamilyModel fam = toolsManager.FindFamily(dtoTool.FamilyId);
if (fam == null)
return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
}
using (NcHandler ncHandler = new NcHandler())
{