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

Merge branch 'release/FixCalcoloVenduto'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-03 10:03:28 +01:00
parent cd108c1327 d88f2a5d12
commit 29ead2e26c
5 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GWMS.Data/Controllers/GWMSController.cs
+20 -46
View File
@@ -847,9 +847,10 @@ namespace GWMS.Data.Controllers
.OrderBy(x => x.DtOrder)
.ToList();
// imposto x ora a soli 2 gg (torno indietro di 1...)
int numDays = 1;
DateTime oggi = DateTime.Today;
// Ciclare su ultimi numDays gg
// recupero ultimi record carichi x numDays gg
var rawDepOrderData = localDbCtx
.DbSetOrders
.Where(x => x.PlantId == PlantId && x.ExecutionQty > 0 && x.DtExecStart >= oggi.AddDays(-numDays))
@@ -857,59 +858,32 @@ namespace GWMS.Data.Controllers
.ToList();
// ciclo numDays giorni precedenti
double startLevel = 0;
for (int i = numDays; i > 0; i--)
double venduto = 0;
double versatoQty = 0;
PlantLogModel firstRecord = null;
PlantLogModel nextRecord = null;
DateTime currDay = oggi;
for (int i = numDays; i >= 0; i--)
{
DateTime currDay = oggi.AddDays(-i);
var firstRecord = rawLevelData.Where(x => x.DtEvent >= currDay).FirstOrDefault();
var nextRecord = rawLevelData.Where(x => x.DtEvent >= currDay.AddDays(1)).FirstOrDefault();
currDay = oggi.AddDays(-i);
firstRecord = rawLevelData.Where(x => x.DtEvent >= currDay).FirstOrDefault();
nextRecord = rawLevelData.Where(x => x.DtEvent >= currDay.AddDays(1)).FirstOrDefault();
if (nextRecord == null)
{
nextRecord = rawLevelData.Where(x => x.DtEvent < currDay.AddDays(1)).OrderByDescending(x => x.DtEvent).FirstOrDefault();
}
versatoQty = rawDepOrderData.Where(x => x.DtExecStart.Date == currDay).Sum(x => x.ExecutionQty);
if (firstRecord == null || nextRecord == null)
{
double venduto = 0;
venduto = 0;
}
else
{
double venduto = firstRecord.ValNumber - nextRecord.ValNumber;
// controllo se ho ordini chiusi ieri
var ordQty = rawDepOrderData.Where(x => x.DtExecStart.Date == currDay).Sum(x => x.ExecutionQty);
if (ordQty > 0 )
{
venduto += ordQty;
}
// salvo TS
SoldTS.Add(new TSData() { DtEvent = currDay, ValDouble = venduto });
if (SoldTS[0] == null)
{
SoldTS.Add(new TSData() { DtEvent = currDay, ValDouble = 0 });
}
venduto = firstRecord.ValNumber - nextRecord.ValNumber;
venduto += versatoQty;
}
}
// aggiungo oggi
DateTime today = oggi;
var firstRecord1 = rawLevelData.Where(x => x.DtEvent >= today).FirstOrDefault();
var lastRecord1 = rawLevelData.Where(x => x.DtEvent >= today).LastOrDefault();
if (firstRecord1 == null || lastRecord1 == null)
{
double vendutoOggi = 0;
}
else
{
double vendutoOggi = firstRecord1.ValNumber - lastRecord1.ValNumber;
// controllo se ho ordini chiusi oggi
var ordQty = rawDepOrderData.Where(x => x.DtExecStart.Date == today).Sum(x => x.ExecutionQty);
if (ordQty > 0 )
{
vendutoOggi += ordQty;
}
// salvo TS
SoldTS.Add(new TSData() { DtEvent = today, ValDouble = vendutoOggi });
if (SoldTS[1] == null)
{
SoldTS.Add(new TSData() { DtEvent = today, ValDouble = 0 });
}
SoldTS.Add(new TSData() { DtEvent = currDay, ValDouble = venduto });
}
LevelTS = rawLevelData
GWMS.UI/GWMS.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.0.2202.0309</Version>
<Version>1.0.2202.0310</Version>
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GWMS - Gas Warehouse Management System</i>
<h4>Versione: 1.0.2202.0309</h4>
<h4>Versione: 1.0.2202.0310</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2202.0309
1.0.2202.0310
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2202.0309</version>
<version>1.0.2202.0310</version>
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>