Merge tag 'Tab3_FixOdl04' into develop

Fix gestione display odl + riattrezzaggio
This commit is contained in:
Samuele Locatelli
2024-01-05 11:53:34 +01:00
+5 -20
View File
@@ -964,18 +964,6 @@ namespace MP_TAB3.Components
{
showSplitOdlRiattr = !showSplitOdlRiattr;
await ReloadXDL(true);
#if false
if (tcRichAttr == 0)
{
tcRichAttr = currPodl.Tcassegnato;
}
if (string.IsNullOrEmpty(noteAttr))
{
noteAttr = currOdl.Note;
}
PzPallet = currOdl.PzPallet;
#endif
}
protected async Task SplitOdl()
@@ -1014,8 +1002,6 @@ namespace MP_TAB3.Components
}
await advStep(currStep++);
// invio email!
await advStep(currStep++);
// processo chiusura setup
string evText = "Registrato Riattrezzaggio ODL (old :{0})";
StringBuilder sb = new StringBuilder();
@@ -1033,6 +1019,8 @@ namespace MP_TAB3.Components
await RefreshData();
await CheckAttr();
await advStep(currStep++);
showSplitOdlRiattr = false;
await ReloadXDL(true);
// chiudo update...
isProcessing = false;
await InvokeAsync(StateHasChanged);
@@ -1525,7 +1513,6 @@ namespace MP_TAB3.Components
.Where(x => x.IdxMacchinaSlave.Equals(RecMSE?.IdxMacchina, StringComparison.InvariantCultureIgnoreCase))
.ToList().Count > 0;
}
Log.Trace("OdlMan.ReloadData 02");
if (!string.IsNullOrEmpty(IdxMaccSel))
{
ListODLAll = await TabDServ.VSOdlGetUnused(IdxMaccParent, ShowAll, numDayOdl);
@@ -1537,7 +1524,7 @@ namespace MP_TAB3.Components
{
ListODL = ListODLAll.Where(x => x.label.Contains(SearchPodl, StringComparison.InvariantCultureIgnoreCase) || x.value == 0).ToList();
}
Log.Trace($"OdlMan.ReloadData 03 | found {ListODL.Count} rec");
Log.Trace($"OdlMan.ReloadData | found {ListODL.Count} rec");
if (forceReload)
{
if (!isMulti || (isMulti && IdxMaccSel.IndexOf("#") > 0))
@@ -1545,11 +1532,10 @@ namespace MP_TAB3.Components
var rawData = await TabDServ.PezziProdMacchina(IdxMaccSel);
datiProdAct = await TabDServ.StatoProdMacchina(IdxMaccSel, DateTime.Now);
checkConfProd();
Log.Trace("OdlMan.ReloadData | check checkConfProd done");
}
}
Log.Trace("OdlMan.ReloadData 04");
await updateIdxOdl();
Log.Trace("OdlMan.ReloadData 05");
// imposto tcRichAttr in base allo stato...
if (odlOk)
{
@@ -1567,10 +1553,9 @@ namespace MP_TAB3.Components
PzPallet = currOdl.PzPallet;
}
}
Log.Trace("OdlMan.ReloadData 06");
}
isLoading = false;
Log.Trace("OdlMan.ReloadData 07 | END");
Log.Trace("OdlMan.ReloadData | END");
}
private async Task ReloadPOdlDetailData()