Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: permette raggruppamento SOLO SE stesso articolo

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-05-20 19:28:20 +02:00
parent 8d1e1824d2
commit 1b104de1ea
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
MP-ADM/WebUserControls/mod_planCreate.ascx
+1 -1
View File
@@ -58,7 +58,7 @@
<asp:Label ID="lblDisegno" runat="server" Text='<%# Eval("Disegno") %>'></asp:Label>
</div>
<div class="col-6 text-right">
<asp:Label ID="lblCodArticolo" runat="server" Text='<%# Eval("CodArticolo","[{0}]") %>'></asp:Label>
cod. <asp:Label ID="lblCodArticolo" runat="server" Text='<%# Eval("CodArticolo") %>'></asp:Label>
</div>
<div class="col-12 small">
<asp:Label ID="lblDescArticolo" runat="server" Text='<%# Eval("DescArticolo") %>'></asp:Label>
MP-ADM/WebUserControls/mod_planCreate.ascx.cs
+13 -1
View File
@@ -117,6 +117,8 @@ namespace MP_ADM.WebUserControls
decimal tempoMinOrd = 0;
int numPzTot = 0;
decimal tempoMinTot = 0;
Dictionary<string, int> ElArticoli = new Dictionary<string, int>();
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();
}
/// <summary>