Fix Osai Tool Manager
This commit is contained in:
@@ -268,12 +268,14 @@ namespace Step.Database.Controllers
|
||||
{
|
||||
DbNcToolModel tool = (DbNcToolModel)dtoTool;
|
||||
dbCtx.Tools.Add(tool);
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -355,9 +357,10 @@ namespace Step.Database.Controllers
|
||||
return dbFamily;
|
||||
}
|
||||
|
||||
public void DeleteFamily(DbNcFamilyModel family)
|
||||
public void DeleteFamily(int famId)
|
||||
{
|
||||
dbCtx.Families.Attach(family);
|
||||
var family = FindFamily(famId);
|
||||
|
||||
dbCtx.Families.Remove(family);
|
||||
|
||||
dbCtx.SaveChanges();
|
||||
@@ -482,5 +485,17 @@ namespace Step.Database.Controllers
|
||||
|
||||
dbCtx.SaveChanges();
|
||||
}
|
||||
|
||||
public int GetFirstId(IEnumerable<int> objIds)
|
||||
{
|
||||
List<int> listOfPossibleIds = Enumerable.Range(1, objIds.Max()).ToList();
|
||||
|
||||
IEnumerable<int> res = listOfPossibleIds.Except(objIds).ToList();
|
||||
|
||||
if (res.Count() > 0)
|
||||
return res.First();
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user