Fix family&tool model

This commit is contained in:
Lucio Maranta
2018-08-23 14:52:35 +02:00
parent cdf20502e3
commit 1ea0dec80c
3 changed files with 25 additions and 27 deletions
@@ -243,7 +243,7 @@ namespace Step.Database.Controllers
.Where(x => x.MagazineId == null && x.ChildsTools.Count > 0)
.ToList();
return dtoShanks;
return dtoShanks;
}
public List<DTONcToolModel> GetAvailableTools()
@@ -98,6 +98,12 @@ namespace Step.Model.DTOModels.ToolModels
public OffsetModel Offset3 { get; set; }
public int? OffsetId1 { get; set; }
public int? OffsetId2 { get; set; }
public int? OffsetId3 { get; set; }
public static explicit operator DTONcToolModel(DbNcToolModel obj)
{
// Get bit values
@@ -118,6 +124,9 @@ namespace Step.Model.DTOModels.ToolModels
Measured = bits[2],
ClockwiseRotation = bits[3],
CounterClockwiseRotation = bits[4],
OffsetId1 = obj.OffsetId1,
OffsetId2 = obj.OffsetId2,
OffsetId3 = obj.OffsetId3
};
}
@@ -135,7 +144,10 @@ namespace Step.Model.DTOModels.ToolModels
OffsetLength = obj.OffsetLength,
ResidualLife = obj.ResidualLife,
ResidualRevive = obj.ResidualRevive,
Status = status
Status = status,
OffsetId1 = obj.OffsetId1,
OffsetId2 = obj.OffsetId2,
OffsetId3 = obj.OffsetId3
};
}
}
@@ -12,72 +12,54 @@ namespace Step.Model.DTOModels.ToolModels
public class DTONewNcToolWithFamilyModel : DTONewNcToolModel
{
// Family fields
[Required]
public string Name { get; set; }
[Required]
public byte ToolType { get; set; }
[Required]
public byte RightSize { get; set; }
[Required]
public byte LeftSize { get; set; }
[Required]
public byte TcpTable { get; set; }
[Required]
public byte Gamma { get; set; }
[Required]
public byte RotationType { get; set; }
[Required]
public bool Cooling { get; set; }
[Required]
public bool Cooling1 { get; set; }
[Required]
public bool Cooling2 { get; set; }
[Required]
public bool Cooling3 { get; set; }
[Required]
public bool Cooling4 { get; set; }
[Required]
public bool Cooling5 { get; set; }
[Required]
public bool Cooling6 { get; set; }
[Required]
public bool Cooling7 { get; set; }
[Required]
public int MaxSpeed { get; set; }
[Required]
public byte MaxLoad { get; set; }
[Required]
public byte MinLoadPctAutoload { get; set; }
[Required]
public byte MaxLoadPctAutoload { get; set; }
[Required]
public byte DynamicCompensation { get; set; }
[Required]
public byte MinLoadDynamicCompensation { get; set; }
[Required]
public byte MaxLoadDynamicCompensation { get; set; }
[Required]
public byte LifeType { get; set; }
[Required]
public int NominalLife { get; set; }
[Required]
public int ReviveDelta { get; set; }
}
@@ -152,5 +134,9 @@ namespace Step.Model.DTOModels.ToolModels
[Required]
public int ReviveDelta { get; set; }
public int OffsetId1 { get; set; }
public int OffsetId2 { get; set; }
public int OffsetId3 { get; set; }
}
}