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

Added offset management

Browse Source 
Added family put
Model fix
This commit is contained in:
Lucio Maranta
2018-07-05 17:11:45 +02:00
parent fa335443f3
commit 30b72ff724
16 changed files with 581 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/NcToolManagerController.cs
+48 -21
View File
@@ -52,6 +52,7 @@ namespace Step.Database.Controllers
public NcShankModel FindShank(int shankId)
{
return dbCtx.Shanks
.Include("Tools")
.Where(x => x.ShankId == shankId)
.FirstOrDefault();
}
@@ -180,27 +181,33 @@ namespace Step.Database.Controllers
return dtoShanks;
}
public NcToolModel AddTool(DTONcToolModel dtoTool)
public NcToolModel AddTool(DTONewNcToolModel dtoTool)
{
NcToolModel tool = (NcToolModel)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();
return tool;
}
public NcToolModel UpdateTool(NcToolModel tool, DTONcToolModel dtoTool)
public NcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
{
tool.FamilyId = dtoTool.FamilyId;
tool.Type = dtoTool.Type;
tool.OffsetLength = dtoTool.OffsetLength;
tool.ResidualLife = dtoTool.ResidualLife;
tool.ResidualRevive = dtoTool.ResidualRevive;
NcToolModel tool = FindTool(toolId);
//// Update db model
//tool.FamilyId = obj.FamilyId;
//tool.Type = obj.Type;
//tool.OffsetLength = obj.OffsetLength;
//tool.ResidualLife = obj.ResidualLife;
//tool.ResidualRevive = obj.ResidualRevive;
//tool.OffsetId1 = obj.OffsetId1;
//tool.OffsetId2 = obj.OffsetId2;
//tool.OffsetId3 = obj.OffsetId3;
tool = (NcToolModel)dtoTool;
// Save
dbCtx.SaveChanges();
return tool;
@@ -219,7 +226,7 @@ namespace Step.Database.Controllers
dbCtx.SaveChanges();
}
public NcFamilyModel AddFamily(DTONcFamilyModel family)
public NcFamilyModel AddFamily(DTONewNcFamilyModel family)
{
NcFamilyModel dbFamily = (NcFamilyModel)family;
dbCtx.Families.Add(dbFamily);
@@ -230,7 +237,26 @@ namespace Step.Database.Controllers
return dbFamily;
}
public NcShankModel AddShank(DTONcShankModel shank)
public NcFamilyModel UpdateFamily(int familyId, DTONewNcFamilyModel family)
{
NcFamilyModel dbFamily = FindFamily(familyId);
dbFamily = (NcFamilyModel)family;
dbCtx.SaveChanges();
dbCtx.Families.Attach(dbFamily);
return dbFamily;
}
public void DeleteFamily(NcFamilyModel family)
{
dbCtx.Families.Attach(family);
dbCtx.Families.Remove(family);
dbCtx.SaveChanges();
}
public NcShankModel AddShank(DTONewNcShankModel shank)
{
NcShankModel dbShank = (NcShankModel)shank;
dbCtx.Shanks.Add(dbShank);
@@ -238,14 +264,24 @@ namespace Step.Database.Controllers
dbCtx.SaveChanges();
dbCtx.Shanks.Attach(dbShank);
return dbShank;
}
public NcShankModel UpdateShank(NcShankModel dbShank, DTONcShankModel dtoShank)
public NcShankModel UpdateShank(int shankId, DTONewNcShankModel dtoShank)
{
NcShankModel ncShank = FindShank(shankId);
return UpdateShank(ncShank, dtoShank);
}
public NcShankModel UpdateShank(NcShankModel dbShank, DTONewNcShankModel dtoShank)
{
dbShank.MagazinePositionType = dtoShank.MagazinePositionType;
dbCtx.SaveChanges();
dbCtx.Shanks.Attach(dbShank);
return dbShank;
}
@@ -274,15 +310,6 @@ namespace Step.Database.Controllers
return dbPos;
}
public void DeleteFamily(NcFamilyModel family)
{
dbCtx.Families.Attach(family);
dbCtx.Families.Remove(family);
dbCtx.SaveChanges();
}
public NcMagazinePositionModel LoadShankInMagazine(byte magazineId, byte positionId, NcShankModel shank)
{
dbCtx.Shanks.Attach(shank);