diff --git a/Jenkinsfile b/Jenkinsfile index fdd6f038..491ddeb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,9 +18,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1138']) { - // env.versionNumber = VersionNumber(versionNumberString : '6.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '6.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=1139']) { + // env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '6.5.${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-ADM/BCode.aspx.cs b/MP-ADM/BCode.aspx.cs index 71c1d6e2..2839f66e 100644 --- a/MP-ADM/BCode.aspx.cs +++ b/MP-ADM/BCode.aspx.cs @@ -7,11 +7,14 @@ namespace MP_ADM { protected void Page_Load(object sender, EventArgs e) { - checkEnabled(); - string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre"); - mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR"; - mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase"); - mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo"); + if (!Page.IsPostBack) + { + checkEnabled(); + string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre"); + mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR"; + mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase"); + mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo"); + } } private void checkEnabled() { diff --git a/MP-ADM/WebUserControls/mod_gestPromODL.ascx.cs b/MP-ADM/WebUserControls/mod_gestPromODL.ascx.cs index ae4fcc3c..297cd9a7 100644 --- a/MP-ADM/WebUserControls/mod_gestPromODL.ascx.cs +++ b/MP-ADM/WebUserControls/mod_gestPromODL.ascx.cs @@ -302,13 +302,11 @@ namespace MP_ADM.WebUserControls { mod_newPromessaODL.Visible = false; grView.PageSize = pageSize; -#if false // se ho in sessione selezione la recupero... if (memLayer.ML.isInSessionObject("selFaseBCode") && enableSelFase) { ddlCodGruppo.SelectedValue = memLayer.ML.StringSessionObj("selFaseBCode"); - } -#endif + } } mod_newPromessaODL.eh_nuovoValore += new EventHandler(mod_newOdl1_eh_nuovoValore); } diff --git a/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs b/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs index 05dd5a8f..c96e147a 100644 --- a/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs +++ b/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs @@ -33,40 +33,44 @@ namespace MP_ADM.WebUserControls { // se ho una promessa da clonare copio dati da quella... int idxProm = 0; - - if (memLayer.ML.isInSessionObject("idxProm2Clone")) + try { - idxProm = memLayer.ML.IntSessionObj("idxProm2Clone"); - } - else if (memLayer.ML.isInSessionObject("idxProm2Edit")) - { - idxProm = memLayer.ML.IntSessionObj("idxProm2Edit"); - } - // provo a selezionare - var tPODL = DataLayer.obj.taPODL.getByKey(idxProm); - if (tPODL.Rows.Count > 0) - { - var rPODL = tPODL[0]; - txtSearch.Text = rPODL.CodArticolo; - ddlArticolo.DataBind(); - ddlGruppi.DataBind(); - ddlGruppi.SelectedValue = rPODL.CodGruppo; - txtNumPz.Text = rPODL.NumPezzi.ToString(); - txtPzPallet.Text = rPODL.PzPallet.ToString(); - txtPrio.Text = rPODL.Priorita.ToString(); - if (memLayer.ML.cdvb("ADM_TC_MinSec")) + if (memLayer.ML.isInSessionObject("idxProm2Clone")) { - txtTCms.Text = TempiCiclo.minSec(rPODL.TCAssegnato); + idxProm = memLayer.ML.IntSessionObj("idxProm2Clone"); } - else + else if (memLayer.ML.isInSessionObject("idxProm2Edit")) { - txtTCmc.Text = rPODL.TCAssegnato.ToString("N3"); + idxProm = memLayer.ML.IntSessionObj("idxProm2Edit"); + } + // provo a selezionare + var tPODL = DataLayer.obj.taPODL.getByKey(idxProm); + if (tPODL.Rows.Count > 0) + { + var rPODL = tPODL[0]; + txtSearch.Text = rPODL.CodArticolo; + ddlArticolo.DataBind(); + ddlGruppi.DataBind(); + ddlGruppi.SelectedValue = rPODL.CodGruppo; + txtNumPz.Text = rPODL.NumPezzi.ToString(); + txtPzPallet.Text = rPODL.PzPallet.ToString(); + txtPrio.Text = rPODL.Priorita.ToString(); + if (memLayer.ML.cdvb("ADM_TC_MinSec")) + { + txtTCms.Text = TempiCiclo.minSec(rPODL.TCAssegnato); + } + else + { + txtTCmc.Text = rPODL.TCAssegnato.ToString("N3"); + } + ddlMacchine.SelectedValue = rPODL.IdxMacchina; + txtKeyExt.Text = rPODL.KeyRichiesta; + // svuoto se ci fosse cloning...... + memLayer.ML.emptySessionVal("idxProm2Clone"); } - ddlMacchine.SelectedValue = rPODL.IdxMacchina; - txtKeyExt.Text = rPODL.KeyRichiesta; - // svuoto se ci fosse cloning...... - memLayer.ML.emptySessionVal("idxProm2Clone"); } + catch + { } } private void setDefaults()