diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index d94728f9..f5958e4c 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -13,7 +13,7 @@ - + @@ -282,5 +282,7 @@ else @if (enableDisegno && showDraw && RecMSE != null) { string docUrl = string.IsNullOrEmpty(RecMSE.Disegno) ? $"disegni/{RecMSE.CodArticolo}.pdf" : $"disegni/{RecMSE.Disegno}.pdf"; - +
+ +
} \ No newline at end of file diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 1a8965e4..3b8aa9ac 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -195,8 +195,10 @@ namespace MP_TAB3.Components protected async Task CheckAttr() { +#if false // rileggo ODL - await updateIdxOdl(); + await updateIdxOdl(); +#endif // verifico attrezzaggio su macchina corrente o se multi su parent string idxMacc2check = isMulti ? IdxMaccParent : IdxMaccSel; StatoMacchineModel rigaStato = TabDServ.StatoMacchina(idxMacc2check); @@ -214,19 +216,13 @@ namespace MP_TAB3.Components { await ReloadXDL(true); } + else + { + // rileggo ODL + await updateIdxOdl(); + } } - /// - /// Aggiorno... - /// - /// - protected async Task DoUpdate() - { - isProcessing = true; - await Task.Delay(1); - isProcessing = false; - await Task.Delay(1); - } /// /// Restituisce il codice IdxMacchina dell'impianto PARENT (se multi) altrimenti la stessa macchina... @@ -984,12 +980,13 @@ namespace MP_TAB3.Components IdxMaccSel = selIdxMacc; // recupero dati RecMSE = TabDServ.MseGetSub(IdxMaccParent, selIdxMacc, true); - await CheckAttr(); await ReloadData(true); - await DoUpdate(); + await CheckAttr(); if (showOdlDetail || inAttr) { + isProcessing = true; await ReloadXDL(true); + isProcessing = false; } await E_MachSel.InvokeAsync(selIdxMacc); } @@ -1096,7 +1093,7 @@ namespace MP_TAB3.Components private int expTimeMsec = 500; private bool forceCloseOdl = true; private int gPeriodReopenOdlTav = 1; - private string IdxMaccSel = ""; + private string IdxMaccSel { get; set; } = ""; private int idxPOdlSel = 0; private bool isMaster = false; private bool isMulti = false; @@ -1337,13 +1334,6 @@ namespace MP_TAB3.Components private void checkConfProd() { // calcolo conferma prod... -#if false - needConfProd = RecMSE != null && prodMacchina != null; - if (prodMacchina != null) - { - needConfProd = prodMacchina.pezziNonConfermati > 0 && !isSlave; - } -#endif needConfProd = RecMSE != null && datiProdAct != null; if (datiProdAct != null) { diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 51e44589..6462dae8 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2403.2211 + 6.16.2403.2214 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index dee16967..e7a4c943 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2403.2211

+

Versione: 6.16.2403.2214


Note di rilascio: