Added OriginPosition

Fixed fanuc TT
& Minorfixes

Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs

@@ -12,7 +12,7 @@ namespace Step.Model.DTOModels.ToolModels
     {
         public byte MagazineId { get; set; }
 
-        public byte PositionId { get; set; }
+        public int PositionId { get; set; }
 
         [Required]
         public bool Disabled { get; set; }

Step.Model/DTOModels/ToolModels/DTONcShankModel.cs

@@ -38,9 +38,15 @@ namespace Step.Model.DTOModels.ToolModels
         [Range(1, byte.MaxValue)]
         public byte? MagazineId { get; set; }
 
+        [Range(1, ushort.MaxValue)]
+        public int? PositionId { get; set; }
+        
         [Range(1, byte.MaxValue)]
-        public byte? PositionId { get; set; }
+        public byte? OriginMagazineId { get; set; }
 
+        [Range(1, ushort.MaxValue)]
+        public int? OriginPositionId { get; set; }
+        
         public List<DTONcToolModel> ChildsTools { get; set; }
 
         public static explicit operator DTONcShankModel(DbNcShankModel obj)
@@ -60,6 +66,8 @@ namespace Step.Model.DTOModels.ToolModels
                 MagazinePositionType = obj.MagazinePositionType,
                 MagazineId = obj.MagazineId,
                 PositionId = obj.PositionId,
+                OriginMagazineId = obj.OriginMagazineId, 
+                OriginPositionId = obj.OriginPositionId,
                 ChildsTools = tools
             };
         }
@@ -72,7 +80,9 @@ namespace Step.Model.DTOModels.ToolModels
                 Balluf = obj.Balluf,
                 MagazinePositionType = obj.MagazinePositionType,
                 MagazineId = obj.MagazineId,
-                PositionId = obj.PositionId
+                PositionId = obj.PositionId,
+                OriginMagazineId = obj.OriginMagazineId,
+                OriginPositionId = obj.OriginPositionId,
             };
         }
     }

Step.Model/DatabaseModels/NcMagazinePositionModel.cs

@@ -12,7 +12,7 @@ namespace Step.Model.DatabaseModels
         public byte MagazineId { get; set; }
 
         [Key, Column("position_id", Order = 1)]
-        public byte PositionId { get; set; }
+        public int PositionId { get; set; }
         
         [Column("type")]
         public byte Type { get; set; }
@@ -25,7 +25,7 @@ namespace Step.Model.DatabaseModels
             return new NcMagazinePositionModel()
             {
                 MagazineId = obj.MagazineId,
-                PositionId = obj.PositionId,
+                PositionId = (ushort)obj.PositionId,
                 Disabled = obj.Disabled ? (byte)1 : (byte)0,
                 Type = obj.Type
             };

Step.Model/DatabaseModels/NcShankModel.cs

@@ -24,7 +24,14 @@ namespace Step.Model.DatabaseModels
         public byte? MagazineId { get; set; }
 
         [ForeignKey("MagazinePosition"), Column("position_id", Order = 1)]
-        public byte? PositionId { get; set; }
+        public int? PositionId { get; set; }
+
+        [Column("origin_magazine_id")]
+        public byte? OriginMagazineId { get; set; }
+
+        [Column("origin_position_id")]
+        public int? OriginPositionId { get; set; }
+
 
         public DbNcMagazinePositionModel MagazinePosition { get; set; }
 
@@ -37,8 +44,10 @@ namespace Step.Model.DatabaseModels
                 ShankId = (ushort)obj.ShankId,
                 Balluf = obj.Balluf == null ? (ushort)0 : (ushort)obj.Balluf.Value,
                 MagazineId = obj.MagazineId == null ? (byte)0 : obj.MagazineId.Value,
-                PositionId = obj.PositionId == null ? (byte)0 : obj.PositionId.Value,
+                PositionId = obj.PositionId == null ? (ushort)0 : (ushort)obj.PositionId.Value,
                 MagazinePositionType = obj.MagazinePositionType,
+                OriginMagazineId = obj.OriginMagazineId == null ? (byte)0 : obj.OriginMagazineId.Value,
+                OriginPositionId = obj.OriginPositionId == null ? (ushort)0 : (ushort)obj.OriginPositionId.Value,
             }; 
         }
     }