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

WIP removed autoincrement

Browse Source
This commit is contained in:
Lucio Maranta
2018-09-25 15:27:58 +02:00
parent 830e36acbf
commit 1191750fe6
14 changed files with 189 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/NcToolManagerController.cs
+29 -11
View File
@@ -265,19 +265,25 @@ namespace Step.Database.Controllers
return dtoTools;
}
public DbNcToolModel AddTool(DTONewNcToolModel dtoTool)
public DbNcToolModel AddTool(DTONewNcToolModel dtoTool, int toolId)
{
DbNcToolModel tool = (DbNcToolModel)dtoTool;
dbCtx.Tools.Add(tool);
// Copy data
DbNcToolModel dbTool = (DbNcToolModel)dtoTool;
if (toolId == 0)
// Get next id
dbTool.ToolId = GetFirstFreeId(dbCtx.Tools.Select(x => x.ToolId).ToList());
else
dbTool.ToolId = toolId;
dbCtx.Tools.Add(dbTool);
dbCtx.SaveChanges();
// Get foreign key data
dbCtx.Entry(tool).Reference(x => x.Family).Load();
dbCtx.Entry(tool).Reference(x => x.Shank).Load();
// GetFirstId(dbCtx.Tools.Select(x => x.ToolId).ToList());
return tool;
dbCtx.Entry(dbTool).Reference(x => x.Family).Load();
dbCtx.Entry(dbTool).Reference(x => x.Shank).Load();
return dbTool;
}
public DbNcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
@@ -336,8 +342,13 @@ namespace Step.Database.Controllers
public DbNcFamilyModel AddFamily(DTONewNcFamilyModel family)
{
DbNcFamilyModel dbFamily = (DbNcFamilyModel)family;
dbCtx.Families.Add(dbFamily);
if(dbFamily.FamilyId == 0)
// Get next id
dbFamily.FamilyId = GetFirstFreeId(dbCtx.Families.Select(x => x.FamilyId).ToList());
dbCtx.Families.Add(dbFamily);
dbCtx.SaveChanges();
return dbFamily;
@@ -367,9 +378,16 @@ namespace Step.Database.Controllers
dbCtx.SaveChanges();
}
public DbNcShankModel AddShank(DTONewNcShankModel shank)
public DbNcShankModel AddShank(DTONewNcShankModel shank, int shankId = 0)
{
DbNcShankModel dbShank = (DbNcShankModel)shank;
if (shankId == 0)
// Get next id
dbShank.ShankId = GetFirstFreeId(dbCtx.Shanks.Select(x => x.ShankId).ToList());
else
dbShank.ShankId = shankId;
dbCtx.Shanks.Add(dbShank);
dbCtx.SaveChanges();