diff --git a/Jenkinsfile b/Jenkinsfile index 8a8a0c0f..b88d5df3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=822']) { + withEnv(['NEXT_BUILD_NUMBER=823']) { // 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-Admin/WebUserControls/mod_gestPromODL.ascx b/MP-Admin/WebUserControls/mod_gestPromODL.ascx index f678f6c7..978f1ddc 100644 --- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx +++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx @@ -5,25 +5,30 @@
- +
+
+
+ Nuova PROMESSA ODL +
+
+
- + Modifica
- Pezzi ODL: + # Pezzi Richiesti:
Pezzi Pallet: -
- + Annulla
@@ -47,7 +52,7 @@ - + diff --git a/MP-Admin/WebUserControls/mod_gestPromODL.ascx.cs b/MP-Admin/WebUserControls/mod_gestPromODL.ascx.cs index 71386ca4..f787424f 100644 --- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx.cs +++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx.cs @@ -91,9 +91,9 @@ namespace MoonProAdmin.WebUserControls { // mostro edit quantità... divEditQta.Visible = true; - btnNewPromOdl.Visible = true; + lbtNewPODL.Visible = true; mod_newPromessaODL.Visible = false; - var riga = DataLayer.obj.taODL.getByIdx(idxOdlSel, false)[0]; + var riga = DataLayer.obj.taPODL.getByKey(idxPOdlSel)[0]; numPz = riga.NumPezzi; pzPallet = riga.PzPallet; } @@ -226,7 +226,7 @@ namespace MoonProAdmin.WebUserControls grView.DataBind(); divEditQta.Visible = false; mod_newPromessaODL.Visible = false; - btnNewPromOdl.Visible = true; + lbtNewPODL.Visible = true; lblWarning.Visible = false; if (eh_resetSelezione != null) { @@ -275,7 +275,7 @@ namespace MoonProAdmin.WebUserControls { // nascondo controllo e mostro button mod_newPromessaODL.Visible = false; - btnNewPromOdl.Visible = true; + lbtNewPODL.Visible = true; // aggiorno! resetSelezione(); } @@ -309,7 +309,7 @@ namespace MoonProAdmin.WebUserControls /// /// /// - protected void btnNewPromOdl_Click(object sender, EventArgs e) + protected void lbtNewPODL_Click(object sender, EventArgs e) { showAddNewPODL(); } @@ -319,7 +319,7 @@ namespace MoonProAdmin.WebUserControls // mostro controllo creazione ODL mod_newPromessaODL.Visible = true; divEditQta.Visible = false; - btnNewPromOdl.Visible = false; + lbtNewPODL.Visible = false; grView.SelectedIndex = -1; grView.DataBind(); } @@ -369,9 +369,9 @@ namespace MoonProAdmin.WebUserControls protected void btnOk_Click(object sender, EventArgs e) { - if (idxOdlSel > 0) + if (idxPOdlSel > 0) { - DataLayer.obj.taODL.updateQta(numPz, pzPallet, idxOdlSel); + DataLayer.obj.taPODL.updateQta(numPz, pzPallet, idxPOdlSel); } updateCtrl(); } @@ -385,7 +385,7 @@ namespace MoonProAdmin.WebUserControls /// /// idxOdl selezionato /// - protected int idxOdlSel + protected int idxPOdlSel { get { diff --git a/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs b/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs index ede9dcee..1f809fd7 100644 --- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs +++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs @@ -13,13 +13,13 @@ namespace MoonProAdmin.WebUserControls { public partial class mod_gestPromODL { /// - /// Controllo btnNewPromOdl. + /// Controllo lbtNewPODL. /// /// /// 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.Button btnNewPromOdl; + protected global::System.Web.UI.WebControls.LinkButton lbtNewPODL; /// /// Controllo mod_newPromessaODL. @@ -40,13 +40,13 @@ namespace MoonProAdmin.WebUserControls { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEditQta; /// - /// Controllo btnOk. + /// Controllo lbtOk. /// /// /// 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.Button btnOk; + protected global::System.Web.UI.WebControls.LinkButton lbtOk; /// /// Controllo txtNewQta. @@ -67,13 +67,13 @@ namespace MoonProAdmin.WebUserControls { protected global::System.Web.UI.WebControls.TextBox txtNewPzPallet; /// - /// Controllo btnCancel. + /// Controllo lbtCancel. /// /// /// 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.Button btnCancel; + protected global::System.Web.UI.WebControls.LinkButton lbtCancel; /// /// Controllo grView. diff --git a/MP-Admin/WebUserControls/mod_newPromessaODL.ascx b/MP-Admin/WebUserControls/mod_newPromessaODL.ascx index 98a8a582..2a7c5828 100644 --- a/MP-Admin/WebUserControls/mod_newPromessaODL.ascx +++ b/MP-Admin/WebUserControls/mod_newPromessaODL.ascx @@ -105,7 +105,7 @@  
- Crea Promessa ODL + Crea Promessa ODL