Added load/unload into shank
Fixed magazine position returned data WIP loading/unloading rules
This commit is contained in:
@@ -180,6 +180,8 @@ namespace Step.Model
|
||||
public static class API_ERROR_KEYS
|
||||
{
|
||||
public const string INCORRECT_PARAMETERS = "error_incorrect_parameters";
|
||||
public const string MAGAZINE_POSITION_OCCUPIED = "error_magazine_position_occupied";
|
||||
public const string TOOL_IS_MOUNTED = "error_tool_mounted";
|
||||
public const string OPTION_NOT_ACTIVE = "error_option_not_active";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
using Step.Model.DatabaseModels;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Step.Model.DTOModels.ToolModels
|
||||
{
|
||||
public class DTONcMagazinePositionModel
|
||||
{
|
||||
public byte MagazineId { get; set; }
|
||||
|
||||
public byte PositionId { get; set; }
|
||||
|
||||
[Required]
|
||||
public bool Disabled { get; set; }
|
||||
|
||||
[Required]
|
||||
public byte Type { get; set; }
|
||||
|
||||
public int? ShankId { get; set; }
|
||||
|
||||
public static explicit operator DTONcMagazinePositionModel(NcMagazinePositionModel obj)
|
||||
{
|
||||
return new DTONcMagazinePositionModel()
|
||||
{
|
||||
MagazineId = obj.MagazineId,
|
||||
PositionId = obj.PositionId,
|
||||
Disabled = obj.Disabled,
|
||||
Type = obj.Type
|
||||
};
|
||||
}
|
||||
|
||||
public static explicit operator NcMagazinePositionModel(DTONcMagazinePositionModel obj)
|
||||
{
|
||||
return new NcMagazinePositionModel()
|
||||
{
|
||||
MagazineId = obj.MagazineId,
|
||||
PositionId = obj.PositionId,
|
||||
Disabled = obj.Disabled,
|
||||
Type = obj.Type
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace Step.Model.DTOModels.ToolModels
|
||||
{
|
||||
public class DTONcMountedShank
|
||||
public class DTONcMountedShankModel
|
||||
{
|
||||
public byte PositionId;
|
||||
public byte MagazineId;
|
||||
@@ -131,30 +131,4 @@ namespace Step.Model.DTOModels.ToolModels
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public class DTONcMagazinesPositionsModel
|
||||
{
|
||||
public byte MagazineId { get; set; }
|
||||
|
||||
public byte PositionId { get; set; }
|
||||
|
||||
[Required]
|
||||
public bool Disabled { get; set; }
|
||||
|
||||
[Required]
|
||||
public byte Type { get; set; }
|
||||
|
||||
public int? ShankId { get; set; }
|
||||
|
||||
public static explicit operator DTONcMagazinesPositionsModel(NcMagazinePositionModel obj)
|
||||
{
|
||||
return new DTONcMagazinesPositionsModel()
|
||||
{
|
||||
MagazineId = obj.MagazineId,
|
||||
PositionId = obj.PositionId,
|
||||
Disabled = obj.Disabled,
|
||||
Type = obj.Type
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -114,7 +114,8 @@
|
||||
<Compile Include="DTOModels\ToolModels\DTOEdgeModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTOMagazineStatusModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTONcFamilyModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTONcMountedTool.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTONcMagazinePositionModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTONcMountedShankModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTONcShankModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTONcToolModel.cs" />
|
||||
<Compile Include="DTOModels\ToolModels\DTOShankModel.cs" />
|
||||
|
||||
Reference in New Issue
Block a user