From eb9fddccafd14a79210a2ab2c7dc2dacbbf3a804 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 15 Jul 2021 20:14:33 +0200 Subject: [PATCH] Aggiunta scrittura eventi in StatusMap x new/update/rem del MachGroup --- .../Controllers/MachGroupController.cs | 4 +++ .../Controllers/ProdController.cs | 29 ++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs b/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs index cf55666d..f1fd0080 100644 --- a/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs +++ b/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs @@ -193,6 +193,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers dbCtx.MachGroupList.Remove(MG2Del); // Commit changes dbCtx.SaveChanges(); + + // registro modifica StatusMap + StatusMapController.man.UpdateAction(MG2Del.SupervisorId, ProdId, MG2Del.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, ""); + ResetController(); done = true; } diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs index 47408104..d25b364d 100644 --- a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs +++ b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs @@ -384,10 +384,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers // cerco le MG esistenti --> aggiorno foreach (var item in MachGroupList) { +#if false var currMG = dbCtx - .MachGroupList - .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == item.Id) - .SingleOrDefault(); + .MachGroupList + .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == item.Id) + .SingleOrDefault(); +#endif + var currMG = MachGroupController.man.FindByMachGroupId(ProdId, item.Id); var convCurrMG = MachGroupController.ConvertFromCore(item, currData.ProdDbId); if (currMG != null) { @@ -402,11 +405,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers currMG.Name = convCurrMG.Name; // salvo dbCtx.SaveChanges(); + // registro modifica StatusMap + StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, ""); } } else { itemsMG2Add.Add(convCurrMG); + // registro modifica StatusMap + StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, ""); } } // aggiungo MachGroup @@ -417,7 +424,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers // verifico di nuovo l'elenco delle MG x le relative PART... foreach (var item in MachGroupList) { - int MachGroupDbId = MachGroupController.man.FindByMachGroupId(ProdId, item.Id).MachGroupDbId; + var currMG = MachGroupController.man.FindByMachGroupId(ProdId, item.Id); + int MachGroupDbId = currMG.MachGroupDbId; + bool addMg = false; + bool modMg = false; // verifico se uguali o meno... foreach (var currPartM in item.PartMList) { @@ -442,13 +452,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers currPart.NAM = convCurrPartM.NAM; // salvo dbCtx.SaveChanges(); + modMg = true; } } else { PartList2Add.Add(convCurrPartM); + addMg = true; } } + // verifico se salvare... + if (modMg) + { + StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, ""); + } + if(addMg) + { + StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, ""); + } } // aggiungo PartList