diff --git a/Jenkinsfile b/Jenkinsfile index b5a2eef9..4b2d30f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1202']) { + withEnv(['NEXT_BUILD_NUMBER=1203']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${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/WebUserControls/mod_planCreate.ascx b/MP-ADM/WebUserControls/mod_planCreate.ascx index 2a1bbae2..c65faf1d 100644 --- a/MP-ADM/WebUserControls/mod_planCreate.ascx +++ b/MP-ADM/WebUserControls/mod_planCreate.ascx @@ -58,7 +58,7 @@
- + cod.
diff --git a/MP-ADM/WebUserControls/mod_planCreate.ascx.cs b/MP-ADM/WebUserControls/mod_planCreate.ascx.cs index c7b5eccc..a8d95f9e 100644 --- a/MP-ADM/WebUserControls/mod_planCreate.ascx.cs +++ b/MP-ADM/WebUserControls/mod_planCreate.ascx.cs @@ -117,6 +117,8 @@ namespace MP_ADM.WebUserControls decimal tempoMinOrd = 0; int numPzTot = 0; decimal tempoMinTot = 0; + Dictionary ElArticoli = new Dictionary(); + string CodArt = ""; foreach (GridViewRow riga in grView.Rows) { numPzOrd = 0; @@ -129,7 +131,17 @@ namespace MP_ADM.WebUserControls // idxPromessa = Convert.ToInt32(((Label)riga.FindControl("lblIdxODL")).Text); int.TryParse(((Label)riga.FindControl("lblNumPezzi")).Text.Replace(".", ""), out numPzOrd); decimal.TryParse(((Label)riga.FindControl("lblTotMinuti")).Text, out tempoMinOrd); + CodArt = ((Label)riga.FindControl("lblCodArticolo")).Text; if (numPzOrd > 0) numOrd++; + // salvo dictionary articoli... + if (ElArticoli.ContainsKey(CodArt)) + { + ElArticoli[CodArt]++; + } + else + { + ElArticoli[CodArt] = 1; + } } catch { } @@ -142,7 +154,7 @@ namespace MP_ADM.WebUserControls // controllo SE abilitare il crea gruppo o split... divSplitOdl.Visible = numOrd == 1; divConfirm.Visible = numOrd > 0; - divCreaGrp.Visible = numOrd > 1; + divCreaGrp.Visible = (numOrd > 1) && (ElArticoli.Count == 1); ddlMacc.DataBind(); } ///