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-09 09:55:43 +01:00
parent 84f76348ad 8dceab40f3
commit 6f91af6546
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.DataLayer/Controllers/MagmanController.cs
+1 -1
View File
@@ -138,7 +138,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
{
foreach (var item in list2MergeDb)
{
_ = dbContr.Insert(item);
_ = dbContr.Upsert(item);
}
}
}
EgtBEAMWALL.DataLayer/Controllers/MaterialsController.cs
-2
View File
@@ -234,8 +234,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
if (item2update != null)
{
//// update, vers 1...
//localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
newIdx = item2update.MatId;
}
else
EgtBEAMWALL.DataLayer/Controllers/RawItemsController.cs
+10 -2
View File
@@ -275,8 +275,16 @@ namespace EgtBEAMWALL.DataLayer.Controllers
if (item2update != null)
{
// update, vers 1...
localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
//// update, vers 1...
//localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
item2update.RawItemCloudId = updItem.RawItemCloudId;
item2update.QtyAvail = updItem.QtyAvail;
item2update.HMm = updItem.HMm;
item2update.LMm = updItem.LMm;
item2update.WMm = updItem.WMm;
item2update.IsActive = updItem.IsActive;
item2update.IsRemn = updItem.IsRemn;
localDbCtx.Entry(item2update).State = System.Data.Entity.EntityState.Modified;
}
else
{
EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj
+1 -1
View File
@@ -47,7 +47,7 @@
<HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
</Reference>
<Reference Include="EgwProxy.MagMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.MagMan.1.0.2402.616\lib\EgwProxy.MagMan.dll</HintPath>
<HintPath>..\packages\EgwProxy.MagMan.1.0.2402.619\lib\EgwProxy.MagMan.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
EgtBEAMWALL.DataLayer/packages.config
+1 -1
View File
@@ -2,7 +2,7 @@
<packages>
<package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
<package id="DotNetZip" version="1.16.0" targetFramework="net472" />
<package id="EgwProxy.MagMan" version="1.0.2402.616" targetFramework="net472" />
<package id="EgwProxy.MagMan" version="1.0.2402.619" targetFramework="net472" />
<package id="EntityFramework" version="6.4.4" targetFramework="net452" />
<package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
<package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net472" />