Added edit lock when tool is loaded in spindle

Fix OsaiFanuc delete tool
2019-02-05 13:31:23 +01:00
parent 69733580e8
commit 4bae9b4259
9 changed files with 115 additions and 42 deletions
@@ -75,6 +75,7 @@ namespace Step.Database.Controllers
            return dbCtx
                .Families
                .Where(x => x.FamilyId == familyId)
+                .Include("Tools")
                .FirstOrDefault();
        }

@@ -428,15 +429,15 @@ namespace Step.Database.Controllers
            return dbShank;
        }
        
-        public DbNcShankModel DeleteShank(int shankId)
+        public DbNcShankModel DeleteNcShank(int shankId)
        {
            DbNcShankModel shank = FindShankWithTools(shankId);
-            DeleteShank(shank);
+            DeleteNcShank(shank);

            return shank;
        }
        
-        public void DeleteShank(DbNcShankModel shank)
+        public void DeleteNcShank(DbNcShankModel shank)
        {
            dbCtx.Shanks.Remove(shank);