From b76924be89c0cb2f95ff03039b35d454de4d978f Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 9 Feb 2026 12:07:45 +0100 Subject: [PATCH] Integration 3.1a2 : - aggiunta gestione ChosenOutput di barra (viene riportato in btm come UNLOAD). --- IntegrationEgaltech/BTL.cs | 8 +++-- IntegrationEgaltech/Generator.cs | 33 ++++++++++++++++++ .../Properties/AssemblyInfo.cs | 6 ++-- IntegrationEgaltech2/IntegrationEgaltech2.aps | Bin 3728 -> 3808 bytes IntegrationEgaltech2/IntegrationEgaltech2.rc | Bin 6892 -> 6968 bytes 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/IntegrationEgaltech/BTL.cs b/IntegrationEgaltech/BTL.cs index 7dabfa3..94e1e46 100644 --- a/IntegrationEgaltech/BTL.cs +++ b/IntegrationEgaltech/BTL.cs @@ -16,13 +16,14 @@ namespace ib.essetre.integration.egaltech public class BTL { public string projectNumber ; - public int productionId ; - public int patternId ; + public int productionId ; + public int patternId ; public string barLength ; public string panelLength ; public string panelWidth ; public string barLoad90 ; - public int RefPos ; + public string barUnload ; + public int RefPos ; public string panelDeltaX ; public string panelDeltaY ; public string panelDeltaZ ; @@ -225,6 +226,7 @@ namespace ib.essetre.integration.egaltech tw.WriteLine( "PROJID=" + projectNumber) ; tw.WriteLine( "PRODID=" + (IsFromProject ? "0" : productionId.ToString())) ; tw.WriteLine( "LOAD90=" + barLoad90) ; + tw.WriteLine( "UNLOAD=" + barUnload) ; tw.WriteLine( "REFPOS=" + RefPos.ToString()) ; tw.WriteLine( "PANELDELTAX=" + panelDeltaX) ; tw.WriteLine( "PANELDELTAY=" + panelDeltaY) ; diff --git a/IntegrationEgaltech/Generator.cs b/IntegrationEgaltech/Generator.cs index b0d7275..da22466 100644 --- a/IntegrationEgaltech/Generator.cs +++ b/IntegrationEgaltech/Generator.cs @@ -588,6 +588,7 @@ namespace ib.essetre.integration.egaltech btlObject.panelLength = GetBarLengthP( (int)dRow0["patternId"], (int)dRow0["productionId"]).ToString( "F3", CultureInfo.InvariantCulture) ; btlObject.panelWidth = GetBarWidthP( (int)dRow0["patternId"], (int)dRow0["productionId"]).ToString( "F3", CultureInfo.InvariantCulture) ; btlObject.barLoad90 = GetBarLoad90P( (int)dRow0["patternId"], (int)dRow0["productionId"]).ToString( CultureInfo.InvariantCulture) ; + btlObject.barUnload = GetBarOutput( (int)dRow0["patternId"], (int)dRow0["productionId"]).ToString( CultureInfo.InvariantCulture); btlObject.RefPos = GetBarOriginP( (int)dRow0["patternId"], (int)dRow0["productionId"]) ; // i Delta sono spostati di una posizione tra visualizzazione e salvataggio nel DB, qui si ripristina XYZ macchina btlObject.panelDeltaX = GetBarDeltaZP((int)dRow0["patternId"], (int)dRow0["productionId"]).ToString("F3", CultureInfo.InvariantCulture); @@ -1226,6 +1227,38 @@ namespace ib.essetre.integration.egaltech return nLoad90 ; } + //------------------------------------------------------------------------------------------------------------- + // Recupera il tipo di scarico nel caso Produzione (colonna "ChosenOutput") + private static int GetBarOutput(int patternId, int productionId) + { + int nOutput = 0; + + string sqlBarLength = "SELECT ChosenOutput " + + "FROM dbo.vw_Pattern " + + "WHERE patternId = @firstId " + + "AND productionId = @secondId"; + + // Connessione al DB ed esecuzione query + using (SqlConnection cn = new SqlConnection(_SqlConnectionStr)) + { + cn.Open(); + using (SqlCommand sqlCommand = new SqlCommand(sqlBarLength, cn)) + { + sqlCommand.Parameters.Add("@firstId", SqlDbType.Int); + sqlCommand.Parameters.Add("@secondId", SqlDbType.Int); + sqlCommand.Parameters["@firstId"].Value = patternId; + sqlCommand.Parameters["@secondId"].Value = productionId; + SqlDataReader reader = sqlCommand.ExecuteReader(); + while (reader.Read()) + { + nOutput = Convert.ToInt32(reader["ChosenOutput"]); + } + } + } + + return nOutput; + } + //------------------------------------------------------------------------------------------------------------- // Recupera l'indice dell'origine del pannello nel caso Produzione (colonna "RefPos") private static int GetBarOriginP( int patternId, int productionId) diff --git a/IntegrationEgaltech/Properties/AssemblyInfo.cs b/IntegrationEgaltech/Properties/AssemblyInfo.cs index 6dbdae0..0cafdd4 100644 --- a/IntegrationEgaltech/Properties/AssemblyInfo.cs +++ b/IntegrationEgaltech/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Egalware s.r.l.")] [assembly: AssemblyProduct("Beam & Wall")] -[assembly: AssemblyCopyright("Copyright © 2018-2025 by Egalware s.r.l.")] +[assembly: AssemblyCopyright("Copyright © 2018-2026 by Egalware s.r.l.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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("3.1.1.1")] -[assembly: AssemblyFileVersion("3.1.1.1")] +[assembly: AssemblyVersion("3.1.1.2")] +[assembly: AssemblyFileVersion("3.1.1.2")] diff --git a/IntegrationEgaltech2/IntegrationEgaltech2.aps b/IntegrationEgaltech2/IntegrationEgaltech2.aps index 33bd1fe53506092101f1598283f26d84dd00541c..5c8ca258e4dbfbcc4b8b2c93f81924a44290ffdb 100644 GIT binary patch delta 185 zcmbOr`#^Sr3*(B7uIa2y3e1z&vHF3if2>A~Op^`S)EOHlFXU8ajG0`^wx7{xvMqZw za}|U3A~jFS!7)EOftN3tn1noO=`+s|k?*_J(; zIfOxC@@#hh%|aYpjEo|aWjXzUg9f;NBP4q)Q`!NkDu fhn0ch|9^qWjBN6gv-s4wMVJ{FTsRS8yZF=qszWPZ diff --git a/IntegrationEgaltech2/IntegrationEgaltech2.rc b/IntegrationEgaltech2/IntegrationEgaltech2.rc index 5eb488815ff721899e3aac2b39a3e40fd68747cd..3e4216c7bd5896ec4a0087fca9e0028f3cdc2205 100644 GIT binary patch delta 83 zcmaE3y2ETk4=1D1=0HJlW=5mQfjqjCr-}GYR^V-8S71nDsAN!>+%N1sd4p)cW+gs7 Rpb}J-?~qk(-XLnj3IO+D7j6Im delta 67 zcmdmC_QrHW4=1DH=3Y*5W=6xwfjqjC_lWpSR^V-$9K@qD`HyJ8W)D6+pcJZ#cOco# Ie?)Cq0q*A&(f|Me