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

Merge branch 'release/FixPaddingXdl_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-17 14:05:19 +01:00
parent 89d03317e7 b8a4bdb8a5
commit 32f826f027
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/WebUserControls/mod_infoAggiuntive.ascx.cs
+2 -2
View File
@@ -78,8 +78,8 @@ namespace MP_SITE.WebUserControls
}
}
dataFrom = rigaOdl.DataInizio;
lblOdl.Text = idxPOdl > 0 ? $"PODL{idxPOdl:00000000} | " : "[NO PODL] ";
lblOdl.Text += $"ODL{idxOdl:00000000}";
lblOdl.Text = idxPOdl > 0 ? $"PODL{idxPOdl:000000} | " : "[NO PODL] ";
lblOdl.Text += $"ODL{idxOdl:000000}";
lblOdlPer.Text = $"start: {dataFrom:dd/MM/yy HH:mm}";
}
catch
MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
+1 -1
View File
@@ -392,7 +392,7 @@ namespace MP_SITE.WebUserControls
// leggo valori da MSE...
valMacchina.Text = tabMSE[0].Nome;
valCodArticolo.Text = tabMSE[0].CodArticolo;
valPODL.Text = tabMSE[0].idxPODL > 0 ? $"PODL{tabMSE[0].idxPODL:00000000}" : "PODL -";
valPODL.Text = tabMSE[0].idxPODL > 0 ? $"PODL{tabMSE[0].idxPODL:000000}" : "PODL -";
valODL.Text = tabMSE[0].idxODL > 0 ? $"ODL{tabMSE[0].idxODL}" : "ODL -";
// carico ultimo stato che sia durato almeno 6 sec (0.1 min)
int idxStato = 0;
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+1 -1
View File
@@ -1209,7 +1209,7 @@ namespace MoonProTablet.WebUserControls
var datiODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0];
string setArtVal = $"{datiODL.CodArticolo}";
string setPzCommVal = $"{datiODL.NumPezzi}";
string setCommVal = $"ODL{datiODL.IdxODL:00000000}";
string setCommVal = $"ODL{datiODL.IdxODL:000000}";
// FIXME TODO: scrivere come sotto? testare valvital x linea LASCO
DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.startSetup, outData);
DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setArt, setArtVal);
MP-TAB/WebUserControls/mod_dettMacchina.ascx
+1 -1
View File
@@ -21,7 +21,7 @@
</div>
<div class="col-8 px-1 small text-end">
<asp:Label runat="server" ID="lblBadge" Text='<%# Eval("CodArticolo","art: {0}") %>' />
<asp:Label runat="server" ID="lblODC" Text='<%# Eval("idxODL","ODL{0:00000000}") + " | " + Eval("idxPODL","PODL{0:00000000}") + " | " + keyRichiesta %>' />
<asp:Label runat="server" ID="lblODC" Text='<%# Eval("idxODL","ODL{0:000000}") + " | " + Eval("idxPODL","PODL{0:000000}") + " | " + keyRichiesta %>' />
</div>
<div class='col-12 px-1 <%# Eval("Semaforo") %>'>
<div class="d-flex justify-content-between">
MP-TAB/WebUserControls/mod_mappaStato.ascx
+2 -2
View File
@@ -23,10 +23,10 @@
</div>
<div class="row small">
<div class="col-6 text-start">
<asp:Label runat="server" ID="lblPODL" Text='<%# Eval("idxPODL"," PODL{0:00000000}") %>' />
<asp:Label runat="server" ID="lblPODL" Text='<%# Eval("idxPODL"," PODL{0:000000}") %>' />
</div>
<div class="col-6 text-end">
<asp:Label runat="server" ID="lblODL" Text='<%# Eval("idxODL","ODL{0:00000000}") %>' />
<asp:Label runat="server" ID="lblODL" Text='<%# Eval("idxODL","ODL{0:000000}") %>' />
</div>
</div>
</div>