diff --git a/Jenkinsfile b/Jenkinsfile
index fc482227..30e30f98 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1365']) {
+ withEnv(['NEXT_BUILD_NUMBER=1366']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${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-MAG/BaseUserControl.cs b/MP-MAG/BaseUserControl.cs
index 9b0b8a8c..63da1011 100644
--- a/MP-MAG/BaseUserControl.cs
+++ b/MP-MAG/BaseUserControl.cs
@@ -346,6 +346,17 @@ namespace MP_MAG
}
}
+ ///
+ /// titolo pagina
+ ///
+ public string titolo
+ {
+ get
+ {
+ return devicesAuthProxy.getPage(Request.Url).Replace(".aspx", "");
+ }
+ }
+
#endregion Public Properties
#region Public Methods
diff --git a/MP-MAG/WebUserControls/cmp_currODL.ascx b/MP-MAG/WebUserControls/cmp_currODL.ascx
index 4b5706bd..7db7cb2c 100644
--- a/MP-MAG/WebUserControls/cmp_currODL.ascx
+++ b/MP-MAG/WebUserControls/cmp_currODL.ascx
@@ -53,6 +53,9 @@
+
+ Refresh
+
\ No newline at end of file
diff --git a/MP-MAG/WebUserControls/cmp_currODL.ascx.cs b/MP-MAG/WebUserControls/cmp_currODL.ascx.cs
index b9dc0627..0f35b06f 100644
--- a/MP-MAG/WebUserControls/cmp_currODL.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_currODL.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,6 +12,26 @@ namespace MP_MAG.WebUserControls
{
#region Protected Methods
+ protected void lbtForceReload_Click(object sender, EventArgs e)
+ {
+ // rileggo
+ MagData.prodPrintData newProdPrintData = MagData.MagDataLayer.man.currProdPrintData;
+ // calcolo
+ var tabOdl = DataLayerObj.taODL.getByIdx(newProdPrintData.IdxOdl, false);
+ if (tabOdl.Rows.Count > 0)
+ {
+ newProdPrintData.QtaOdl = tabOdl[0].NumPezzi;
+ }
+ var tabDatiProdAct = DataLayerObj.taStatoProd.GetData(newProdPrintData.IdxMacchina, DateTime.Now);
+ if (tabDatiProdAct.Rows.Count > 0)
+ {
+ newProdPrintData.QtaConf = tabDatiProdAct[0].PzConfBuoni;
+ }
+ // salvo in oggetto dedicato...
+ MagData.MagDataLayer.man.currProdPrintData = newProdPrintData;
+ Response.Redirect(titolo);
+ }
+
protected void Page_Load(object sender, EventArgs e)
{
}
diff --git a/MP-MAG/WebUserControls/cmp_currODL.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_currODL.ascx.designer.cs
index 861691b2..9021de61 100644
--- a/MP-MAG/WebUserControls/cmp_currODL.ascx.designer.cs
+++ b/MP-MAG/WebUserControls/cmp_currODL.ascx.designer.cs
@@ -13,5 +13,14 @@ namespace MP_MAG.WebUserControls
public partial class cmp_currODL
{
+
+ ///
+ /// Controllo lbtForceReload.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbtForceReload;
}
}