diff --git a/Jenkinsfile b/Jenkinsfile index 565ae709..34739ff2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=781']) { + withEnv(['NEXT_BUILD_NUMBER=782']) { // env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.3.${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_confProd.ascx b/MP-TAB/WebUserControls/mod_confProd.ascx index 403fed18..0cc13099 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx +++ b/MP-TAB/WebUserControls/mod_confProd.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_confProd.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_confProd" %> - + +
@@ -55,10 +56,25 @@
CONFERMA
+
+ + +
+
+
+   + ELABORAZIONE IN CORSO +   +
+
+
+
+
+
+
-
Dati Globali ODL diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.cs index 53d83a2e..0a12d01a 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.cs @@ -1,6 +1,7 @@ using MapoDb; using SteamWare; using System; +using System.Threading; using System.Web.UI; namespace MoonProTablet.WebUserControls @@ -362,6 +363,7 @@ namespace MoonProTablet.WebUserControls /// protected void lbtSalva_Click(object sender, EventArgs e) { + //Thread.Sleep(3000); if (memLayer.ML.CRI("modoConfProd") == 2) { confermaPerTurni(); @@ -375,7 +377,7 @@ namespace MoonProTablet.WebUserControls // mostro output lblOut.Text = string.Format("Confermata la produzione per {0} pezzi! (+{1} pz scarto) alle {2:yyyy-MM-dd HH:mm:ss}", numPzConfermati, numPzScarto2Rec, dtReqUpdate); // cambio button conferma... - switchBtnConferma(!txtNumPezzi.Enabled); + switchBtnConferma(!txtNumPezzi.Enabled); // sollevo evento! if (eh_newVal != null) { @@ -473,5 +475,9 @@ namespace MoonProTablet.WebUserControls } } + protected void lbtTest_Click(object sender, EventArgs e) + { + Thread.Sleep(3000); + } } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs index 96ca702b..f3761a95 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs @@ -174,6 +174,15 @@ namespace MoonProTablet.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbtSalva; + /// + /// Controllo updtRicerca. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdateProgress updtRicerca; + /// /// Controllo lblPz2RecTot. ///