From 49a38e1d92bf206589c64b2ac24167d9e04c348e Mon Sep 17 00:00:00 2001 From: "marco.locatelli@steamware.net" Date: Wed, 2 Feb 2022 11:03:27 +0100 Subject: [PATCH] Gestione N-ordini per calcolo venduto --- GWMS.Data/Controllers/GWMSController.cs | 20 ++++++++++---------- GWMS.UI/GWMS.UI.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/GWMS.Data/Controllers/GWMSController.cs b/GWMS.Data/Controllers/GWMSController.cs index 7c4547c..27c37a1 100644 --- a/GWMS.Data/Controllers/GWMSController.cs +++ b/GWMS.Data/Controllers/GWMSController.cs @@ -870,11 +870,11 @@ namespace GWMS.Data.Controllers else { double venduto = firstRecord.ValNumber - nextRecord.ValNumber; - // controllo se ho ordini chiusi - var ordRecords = rawDepOrderData.Where(x => x.DtExecStart.Date == currDay).FirstOrDefault(); - if (ordRecords != null) + // controllo se ho ordini chiusi ieri + var ordQty = rawDepOrderData.Where(x => x.DtExecStart.Date == currDay).Sum(x => x.ExecutionQty); + if (ordQty > 0 ) { - venduto += ordRecords.ExecutionQty; + venduto += ordQty; } // salvo TS @@ -897,12 +897,12 @@ namespace GWMS.Data.Controllers else { double vendutoOggi = firstRecord1.ValNumber - lastRecord1.ValNumber; - // controllo se ho ordini chiusi - var ordRecords = rawDepOrderData.Where(x => x.DtExecStart.Date == today).FirstOrDefault(); - if (ordRecords != null) - { - vendutoOggi += ordRecords.ExecutionQty; - } + // 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 }); diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index 9961b80..906b0e8 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2202.0209 + 1.0.2202.0211 95c9f021-52d1-4390-a670-5810b7b777b0 true true diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 544ef55..1edb258 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2202.0209

+

Versione: 1.0.2202.0211


Note di rilascio: