Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General fixes

Browse Source
This commit is contained in:
Lucio Maranta
2018-05-29 15:34:13 +00:00
parent 4664199426
commit 79abc2be3f
8 changed files with 262 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/DataStructures.cs
+19 -21
View File
@@ -332,7 +332,8 @@ namespace CMS_CORE_Library
MAX_FAMILY_REACHED = 14,
MAX_MULTITOOL_REACHED = 15,
MAX_TOOLS_PER_MULTITOOL_REACHED = 16,
MAG_POS_OCCUPIED = 17
MAX_MULTITOOL_LOCATION_REACHED = 17,
MAG_POS_OCCUPIED = 18
}
internal static CmsError NO_ERROR = new CmsError(CMS_ERROR_CODES.OK, "");
@@ -350,6 +351,7 @@ namespace CMS_CORE_Library
internal static CmsError MAX_FAMILY_REACHED_ERROR = new CmsError(CMS_ERROR_CODES.MAX_FAMILY_REACHED, "error_max_family_reached");
internal static CmsError MAX_MULTITOOL_REACHED_ERROR = new CmsError(CMS_ERROR_CODES.MAX_MULTITOOL_REACHED, "error_max_multitools_reached");
internal static CmsError MAX_TOOLS_PER_MULTITOOL_REACHED_ERROR = new CmsError(CMS_ERROR_CODES.MAX_TOOLS_PER_MULTITOOL_REACHED, "error_max_tools_per_multitool_reached");
internal static CmsError MAX_MULTITOOL_LOCATION_REACHED_ERROR = new CmsError(CMS_ERROR_CODES.MAX_MULTITOOL_LOCATION_REACHED, "error_max_multitools_location_reached");
internal static CmsError MAG_POS_OCCUPIED_ERROR = new CmsError(CMS_ERROR_CODES.MAG_POS_OCCUPIED, "error_mag_pos_occupied");
#endregion Cms Errors Codes
@@ -564,30 +566,24 @@ namespace CMS_CORE_Library
public int Number;
}
public class PositionWithMultiToolModel : PositionModel
{
public MountedMultiToolModel ChildShank;
}
public class PositionWithToolModel : PositionModel
{
public MountedToolModel ChildTool;
}
public class MountedMultiToolModel
{
public int Id;
public string Name;
public List<ShankChildModel> ChildsTools;
}
public class MountedToolModel
{
public int Id;
public string FamilyName;
public int ToolType;
public int PositionId;
public int MagazineId;
public int ToolId;
public SiemensToolModel ChildTool;
public ShankModel ChildShank;
}
//public class PositionToolModel : PositionModel
//{
// public MountedMultiToolModel ChildShank;
//}
//public class PositionWithToolModel : PositionModel
//{
// public MountedToolModel ChildTool;
//}
public class NewToolInMagazineModel
{
public int PositionId;
@@ -619,6 +615,8 @@ namespace CMS_CORE_Library
public string Category;
public bool ReadOnly;
public Dictionary<int, string> SelectValues;
public int MinValue;
public int MaxValue;
}
public class FamiliesConfiguration