From b829e21c8b1bd9db576f3d5bb8a092903679a81d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 13 Apr 2019 08:37:25 +0000 Subject: [PATCH] Integration 2.1d1 : - migliorata gestione ritorno risultati e messaggi. --- IntegrationEgaltech/Generator.cs | 11 ++++++++++- IntegrationEgaltech/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/IntegrationEgaltech/Generator.cs b/IntegrationEgaltech/Generator.cs index 4bf6370..af1e0ec 100644 --- a/IntegrationEgaltech/Generator.cs +++ b/IntegrationEgaltech/Generator.cs @@ -191,9 +191,18 @@ namespace ib.essetre.integration.egaltech } } pattInfo.SetTaskState( cutId, taskId, resExe, textErr) ; + if ( resExe == PatternInfo.Results.OK) { + pattInfo.Result = PatternInfo.Results.OK ; + pattInfo.DetailResult = PatternInfo.DetailResults.ALL_OK ; + } + else { + pattInfo.Result = PatternInfo.Results.ERROR ; + pattInfo.DetailResult = PatternInfo.DetailResults.MEMORY ; + } + pattInfo.EstimatedTime = 32.7 ; // Lettura OutputFilename e scrittura nel parametro stringa Iso (solo nel caso UIModes.HIDDEN) - if ( parameters.UIMode == InOutParameters.UIModes.HIDDEN) { + if ( resExe == PatternInfo.Results.OK && parameters.UIMode == InOutParameters.UIModes.HIDDEN) { string CncPath = Path.ChangeExtension( BtlPath, ".cnc") ; if ( File.Exists( CncPath)) { diff --git a/IntegrationEgaltech/Properties/AssemblyInfo.cs b/IntegrationEgaltech/Properties/AssemblyInfo.cs index d56d1b1..ee385a0 100644 --- a/IntegrationEgaltech/Properties/AssemblyInfo.cs +++ b/IntegrationEgaltech/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.3.1")] -[assembly: AssemblyFileVersion("2.1.3.1")] +[assembly: AssemblyVersion("2.1.4.1")] +[assembly: AssemblyFileVersion("2.1.4.1")]