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

Added alarm notes

Browse Source 
WIP Fanuc tool table
WIP Siemens Active program fix
This commit is contained in:
Lucio Maranta
2018-10-23 17:33:00 +02:00
parent a36c2aa951
commit d85bb1fd0e
36 changed files with 543 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/NcToolManagerController.cs
+5 -5
View File
@@ -48,7 +48,7 @@ namespace Step.Database.Controllers
{
DbNcShankModel shank = FindShankWithTools(shankId);
// Get only families id
int[] ids = shank.Tools.Select(x => x.FamilyId).ToArray();
short[] ids = shank.Tools.Select(x => x.FamilyId).ToArray();
return FindFamilies() // Get Families
.Where(x => ids.Contains(x.FamilyId)) // Filter by ids
@@ -265,7 +265,7 @@ namespace Step.Database.Controllers
return dtoTools;
}
public DbNcToolModel AddTool(DTONewNcToolModel dtoTool, int toolId)
public DbNcToolModel AddTool(DTONewNcToolModel dtoTool, short toolId)
{
// Copy data
DbNcToolModel dbTool = (DbNcToolModel)dtoTool;
@@ -303,7 +303,7 @@ namespace Step.Database.Controllers
return tool;
}
public DbNcToolModel UpdateToolOffset(int toolId, int position, int offsetId)
public DbNcToolModel UpdateToolOffset(int toolId, int position, short offsetId)
{
DbNcToolModel tool = FindTool(toolId);
@@ -378,7 +378,7 @@ namespace Step.Database.Controllers
dbCtx.SaveChanges();
}
public DbNcShankModel AddShank(DTONewNcShankModel shank, int shankId = 0)
public DbNcShankModel AddShank(DTONewNcShankModel shank, short shankId = 0)
{
DbNcShankModel dbShank = (DbNcShankModel)shank;
@@ -465,7 +465,7 @@ namespace Step.Database.Controllers
return FindMagazinePosition(magazineId, positionId);
}
public DTONcShankModel LoadToolIntoShank(DbNcToolModel tool, int shankId)
public DTONcShankModel LoadToolIntoShank(DbNcToolModel tool, short shankId)
{
dbCtx.Tools.Attach(tool);
// Set tool shankId