Merge branch 'develop' into User_Manager

2019-03-20 16:28:19 +01:00
parent 023b688c43 a29d5b0755
commit ea4420dff7
23 changed files with 168 additions and 57 deletions
@@ -484,7 +484,7 @@ namespace Step.Database.Controllers
            dbCtx.Shanks.Attach(shank);
            // Set ids with new positions
            shank.MagazineId = magazineId;
-            shank.PositionId = positionId;
+            //shank.PositionId = positionId;
            // Set original Ids
            shank.OriginMagazineId = magazineId;
            shank.OriginPositionId = positionId;
@@ -520,7 +520,7 @@ namespace Step.Database.Controllers
            return GetShank(shankId);
        }

-        public DTONcShankModel UnloadToolFromShank(DbNcToolModel tool)
+        public DTONcShankModel UnloadToolFromShank(DbNcToolModel tool) 
        {
            dbCtx.Tools.Attach(tool);
            int? shankId = tool.ShankId;