From 5cb2055a2f74a1cdd363b0867cb19aabbc9ff871 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Sep 2018 19:20:40 +0200 Subject: [PATCH] tablet: mostro disegno SOLO SE HO codDisegno... --- Jenkinsfile | 2 +- MP-TAB/WebUserControls/mod_dettMacchina.ascx | 2 +- .../WebUserControls/mod_dettMacchina.ascx.cs | 26 ++++++++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6c733369..1eece216 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=831']) { + withEnv(['NEXT_BUILD_NUMBER=833']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-TAB/WebUserControls/mod_dettMacchina.ascx b/MP-TAB/WebUserControls/mod_dettMacchina.ascx index aa50a2cc..63c62f3c 100644 --- a/MP-TAB/WebUserControls/mod_dettMacchina.ascx +++ b/MP-TAB/WebUserControls/mod_dettMacchina.ascx @@ -51,7 +51,7 @@
- +
DISEGNO
diff --git a/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs b/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs index a470f99d..58aa596f 100644 --- a/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs +++ b/MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs @@ -1,7 +1,6 @@ using MapoDb; using SteamWare; using System; -using System.Web; using System.Web.UI; namespace MoonProTablet.WebUserControls @@ -27,6 +26,31 @@ namespace MoonProTablet.WebUserControls } } + public bool showDisegno(object _codArticolo) + { + // default è ND... + bool answ = false; + // recupero da anagrafica articoli... + try + { + DS_ProdTempi.AnagArticoliDataTable tab = DataLayer.obj.taAnagArt.getByCod(_codArticolo.ToString()); + if (tab.Rows.Count > 0) + { + //DS_ProdTempi.AnagArticoliRow riga = DataLayer.obj.taAnagArt.getByCod(_codArticolo.ToString())[0]; + DS_ProdTempi.AnagArticoliRow riga = tab[0]; + answ = (riga.Disegno != ""); + } + else + { + logger.lg.scriviLog(string.Format("Attenzione! nessuna informazione trovata per l'articolo {0}", _codArticolo), tipoLog.WARNING); + } + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Errore in ricostruzione URL disegno:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + } + return answ; + } /// /// caricamento pagina ///