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

Merge remote-tracking branch 'gitlab.seriate/DataLayer' into feature/NewWarehouse

Browse Source
This commit is contained in:
Emmanuele Sassi
2024-02-16 16:14:40 +01:00
parent 19732e091b 9fac681033
commit fef8aaaa2f
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.DataLayer/Controllers/MagmanController.cs
+3 -3
View File
@@ -452,7 +452,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
// ora processo 1:1 gli items...
foreach (var rawItem in item.ItemList)
{
rawItemDbContr.Upsert(RawItemsController.ConvToModel(rawItem, true));
rawItemDbContr.Upsert(RawItemsController.ConvToModel(rawItem, true), false);
}
}
}
@@ -602,7 +602,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
{
// sovrascrivo materaile anche x ogni RawItem
rawItem.MatLocalId = matLocalId;
rawItemDbContr.Upsert(RawItemsController.ConvToModel(rawItem, true));
rawItemDbContr.Upsert(RawItemsController.ConvToModel(rawItem, true), false);
}
}
}
@@ -741,7 +741,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
// ora processo 1:1 gli items...
foreach (var rawItem in item.ItemList)
{
rawItemDbContr.Upsert(RawItemsController.ConvToModel(rawItem, true));
rawItemDbContr.Upsert(RawItemsController.ConvToModel(rawItem, true), false);
}
}
}
EgtBEAMWALL.DataLayer/Controllers/RawItemsController.cs
+8 -4
View File
@@ -263,9 +263,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
/// <summary>
/// Update or insert RawItem record
/// </summary>
/// <param name="updItem"></param>
/// <param name="updItem">Recorda da registrare</param>
/// <param name="changeUseQty">Indica se, in caso di modifica, vada aggiornato UseQty</param>
/// <returns></returns>
public int Upsert(RawItemModel updItem)
public int Upsert(RawItemModel updItem, bool changeUseQty)
{
int newIdx = 0;
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
@@ -289,7 +290,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
item2update.WMm = updItem.WMm;
item2update.IsActive = updItem.IsActive;
item2update.IsRemn = updItem.IsRemn;
item2update.UseQty = updItem.UseQty;
if (changeUseQty)
{
item2update.UseQty = updItem.UseQty;
}
localDbCtx.Entry(item2update).State = EntityState.Modified;
}
else
@@ -325,7 +329,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
int newIdx = 0;
// converto
RawItemModel updItem = ConvToModel(coreItem);
newIdx = Upsert(updItem);
newIdx = Upsert(updItem, true);
return newIdx;
}