From 57f43fd85bfc91e67be655c5dd52dfecabc0d6b6 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 13 Jul 2016 13:50:52 +0200 Subject: [PATCH] v1.0.11 x SCM, testata x dati prod --- MTC_Sim/MTC_Sim/AdapterESA.cs | 15 ++++++++++----- MTC_Sim/VersGen/AdapterVers.cs | 4 ++-- MTC_Sim/VersGen/AdapterVers.tt | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/MTC_Sim/MTC_Sim/AdapterESA.cs b/MTC_Sim/MTC_Sim/AdapterESA.cs index 037203e..4c0dabd 100644 --- a/MTC_Sim/MTC_Sim/AdapterESA.cs +++ b/MTC_Sim/MTC_Sim/AdapterESA.cs @@ -275,6 +275,8 @@ namespace MTC_Adapter { } } + // uso un INT x delta qta da sommare... + int deltaQta = 0; // in primis devo verificare che sia > 0 num oggetti su entrambi i vettori if (nRecCur + nRecIst > 0) { @@ -285,16 +287,19 @@ namespace MTC_Adapter Array.Resize(ref elencoDatiProd, nRecCur + 1); // carico nuovo record elencoDatiProd[nRecCur] = elencoDatiProdNew[nRecCur]; + deltaQta = elencoDatiProd[nRecCur].qta; nRecCur++; } else if (nRecCur == nRecIst) { // devo confrontare ULTIMO record Curr con equivalente record NEW x verificare se sia variato.. verifico PRG + start - bool checkName = elencoDatiProd[nRecCur].fileName == elencoDatiProdNew[nRecCur].fileName; - bool checkStart = elencoDatiProd[nRecCur].start == elencoDatiProdNew[nRecCur].start; + bool checkName = elencoDatiProd[nRecCur - 1].fileName == elencoDatiProdNew[nRecCur - 1].fileName; + bool checkStart = elencoDatiProd[nRecCur - 1].start == elencoDatiProdNew[nRecCur - 1].start; if (checkName && checkStart) { - elencoDatiProd[nRecCur] = elencoDatiProdNew[nRecCur]; + // salvo se variata quantità... + deltaQta = elencoDatiProdNew[nRecCur - 1].qta - elencoDatiProd[nRecCur - 1].qta; + elencoDatiProd[nRecCur - 1] = elencoDatiProdNew[nRecCur - 1]; } } else @@ -309,10 +314,10 @@ namespace MTC_Adapter { string prgName = elencoDatiProd[nRecCur - 1].fileName; prgName = prgName.Substring(prgName.LastIndexOf(@"\") + 1); - // se il mio articolo NON cambia imposto qta come SOMMATA... + // se il mio articolo NON cambia... if (istPathPartId[0] == prgName) { - istPathPartCount[0] += Convert.ToUInt32(elencoDatiProd[nRecCur - 1].qta); + istPathPartCount[0] += (uint)deltaQta; } else { diff --git a/MTC_Sim/VersGen/AdapterVers.cs b/MTC_Sim/VersGen/AdapterVers.cs index 703dfdc..9fd5613 100644 --- a/MTC_Sim/VersGen/AdapterVers.cs +++ b/MTC_Sim/VersGen/AdapterVers.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.10.92")] -[assembly: AssemblyFileVersion("1.0.10.92")] +[assembly: AssemblyVersion("1.0.11.93")] +[assembly: AssemblyFileVersion("1.0.11.93")] [assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")] [assembly: AssemblyCompany("Steamware-SCM-CMS")] diff --git a/MTC_Sim/VersGen/AdapterVers.tt b/MTC_Sim/VersGen/AdapterVers.tt index 23fb91c..2704ca0 100644 --- a/MTC_Sim/VersGen/AdapterVers.tt +++ b/MTC_Sim/VersGen/AdapterVers.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.10.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.0.10.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.0.11.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.0.11.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware-SCM-CMS")] <#+