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

Added: Restore magazine table lock on startup

Browse Source 
Added tool table import status
This commit is contained in:
Lucio Maranta
2019-04-24 17:33:28 +02:00
parent 84904a3bb5
commit 617586d4bd
7 changed files with 114 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/NcToolManagerController.cs
+56 -1
View File
@@ -571,8 +571,10 @@ namespace Step.Database.Controllers
};
}
public void ImportData(DTOExportToolTableModel data)
public List<DTOImportStatusModel> ImportData(DTOExportToolTableModel data)
{
List<DTOImportStatusModel> importStatus = new List<DTOImportStatusModel>();
List<DbNcToolModel> tools = FindTools();
List<DbNcFamilyModel> families = FindFamilies();
List<DbNcShankModel> shanks = FindShanks();
@@ -583,7 +585,24 @@ namespace Step.Database.Controllers
{
// Check if not exist
if (families.FirstOrDefault(x => x.FamilyId == family.FamilyId) == null)
{
dbCtx.Families.Add(family);
importStatus.Add(new DTOImportStatusModel()
{
Id = family.FamilyId,
Status = IMPORT_STATUS.OK.ToString(),
Type = "FAMILY"
});
}
else
{
importStatus.Add(new DTOImportStatusModel()
{
Id = family.FamilyId,
Status = IMPORT_STATUS.EXIST.ToString(),
Type = "FAMILY"
});
}
}
if(data.Shanks != null)
@@ -592,7 +611,24 @@ namespace Step.Database.Controllers
{
// Check if not exist
if (shanks.FirstOrDefault(x => x.ShankId == shank.ShankId) == null)
{
dbCtx.Shanks.Add(shank);
importStatus.Add(new DTOImportStatusModel()
{
Id = shank.ShankId,
Status = IMPORT_STATUS.OK.ToString(),
Type = "SHANK"
});
}
else
{
importStatus.Add(new DTOImportStatusModel()
{
Id = shank.ShankId,
Status = IMPORT_STATUS.EXIST.ToString(),
Type = "SHANK"
});
}
}
if(data.Tools != null)
@@ -601,11 +637,30 @@ namespace Step.Database.Controllers
{
// Check if not exist
if (tools.FirstOrDefault(x => x.ToolId == tool.ToolId) == null)
{
dbCtx.Tools.Add(tool);
importStatus.Add(new DTOImportStatusModel()
{
Id = tool.ToolId,
Status = IMPORT_STATUS.EXIST.ToString(),
Type = "TOOL"
});
}
else
{
importStatus.Add(new DTOImportStatusModel()
{
Id = tool.ToolId,
Status = IMPORT_STATUS.EXIST.ToString(),
Type = "TOOL"
});
}
}
// Save
dbCtx.SaveChanges();
return importStatus;
}
}
}