From 75b330abc41936d7ad2d45574010bb6685da25b5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 12 Dec 2023 15:52:50 +0100 Subject: [PATCH] Fix reload post ODL action --- MP-TAB-SERV/Components/MseSampler.razor.cs | 19 +++++--- MP-TAB-SERV/Components/OdlMan.razor.cs | 29 +++++++----- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- MP.Data/Services/TabDataService.cs | 54 +++++++++------------- 7 files changed, 57 insertions(+), 53 deletions(-) diff --git a/MP-TAB-SERV/Components/MseSampler.razor.cs b/MP-TAB-SERV/Components/MseSampler.razor.cs index 0c90ce82..085d46e3 100644 --- a/MP-TAB-SERV/Components/MseSampler.razor.cs +++ b/MP-TAB-SERV/Components/MseSampler.razor.cs @@ -68,12 +68,19 @@ namespace MP_TAB_SERV.Components protected void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) { - var pUpd = Task.Run(async () => - { - aTimer.Interval = fastRefreshMs; - await InvokeAsync(RefreshData); - }); - pUpd.Wait(); + try + { + var pUpd = Task.Run(async () => + { + aTimer.Interval = fastRefreshMs; + await InvokeAsync(RefreshData); + }); + pUpd.Wait(); + } + catch (Exception exc) + { + Log.Error($"Eccezione durante MseSampler.ElapsedTimer{Environment.NewLine}{exc}"); + } } protected override void OnInitialized() diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs index 6d084393..4c2b32c3 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor.cs +++ b/MP-TAB-SERV/Components/OdlMan.razor.cs @@ -242,7 +242,7 @@ namespace MP_TAB_SERV.Components await advStep(currStep++); // cancella dati correnti ODL - DoRemoveCurrOdlData(); + DoRemoveCurrOdlData(false); await advStep(currStep++); } catch @@ -255,6 +255,10 @@ namespace MP_TAB_SERV.Components await advStep(currStep++); isProcessing = false; await InvokeAsync(StateHasChanged); +#if false + await Task.Delay(50); + NavMan.NavigateTo(NavMan.Uri, true); +#endif } /// @@ -630,7 +634,7 @@ namespace MP_TAB_SERV.Components checkBtnStatus(); fixSplitBtn(false); // faccio refresh e riporto - await TabDServ.FlushCache("ODL"); + await TabDServ.FlushOdlCache(); IdxPOdlSel = 0; RecMSE = null; await RefreshData(); @@ -972,7 +976,6 @@ namespace MP_TAB_SERV.Components private bool showOdlProvv = false; private bool showReopenOdlTav = false; private bool showSplitOdlOnTav = false; - private decimal tcRichAttr = 1; #endregion Private Fields @@ -994,7 +997,6 @@ namespace MP_TAB_SERV.Components } private ODLExpModel currOdl { get; set; } = new ODLExpModel(); - private PODLExpModel currPodl { get; set; } = new PODLExpModel(); /// @@ -1185,6 +1187,8 @@ namespace MP_TAB_SERV.Components } } + private decimal tcRichAttr { get; set; } = 1; + private string titleOdlDetail { get => IdxPOdlSel > 0 ? "Verifica parametri attrezzaggio NUOVO PODL" : inAttr ? "Parametri PODL in Attrezzaggio" : "Parametri ODL Corrente"; @@ -1426,7 +1430,7 @@ namespace MP_TAB_SERV.Components /// /// Rimozione dati e parametri (TAB e su PLC) x ODL corrente /// - private void DoRemoveCurrOdlData() + private void DoRemoveCurrOdlData(bool nav2detail) { // invio task x end produzione... string setArtVal = "NO ART"; @@ -1453,8 +1457,11 @@ namespace MP_TAB_SERV.Components TabDServ.addTask4Machine(machine.IdxMacchinaSlave, taskType.setComm, setCommVal); } } - // rimando a pagina dettaglio... - NavMan.NavigateTo("machine-detail", true); + // se richiesto rimando a pagina dettaglio... + if (nav2detail) + { + NavMan.NavigateTo("machine-detail", true); + } } #if false @@ -1564,14 +1571,14 @@ namespace MP_TAB_SERV.Components // imposto tcRichAttr in base allo stato... if (odlOk) { - // prendo TCRich da ODL... - if (IdxOdl > 0) + // prendo TCRich da PODL... + if (IdxPOdlSel > 0) { - tcRichAttr = currOdl.TCRichAttr; + tcRichAttr = currPodl.Tcassegnato; } else { - tcRichAttr = currPodl.Tcassegnato; + tcRichAttr = currOdl.TCRichAttr; } } } diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 03e15603..3c00190a 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1214 + 6.16.2312.1215 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 2457f48d..61e95d92 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2312.1214

+

Versione: 6.16.2312.1215


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index d11d7a4c..14723875 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1214 +6.16.2312.1215 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 7b5b0f8a..9189f131 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1214 + 6.16.2312.1215 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index 70427841..d676ccce 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -1225,9 +1225,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.OdlClearSetup(idxODL, idxMacchina); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1236,6 +1234,17 @@ namespace MP.Data.Services } return answ; } + /// + /// Flush di tutta la cache relativa ad i dati ODL/PODL + /// + /// + public async Task FlushOdlCache() + { + await FlushCache("ODL"); + await FlushCache("PODL"); + await FlushCache("VSODL"); + await FlushCache("StatoMacc"); + } /// /// ODL corrente macchina @@ -1287,9 +1296,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.OdlDividiDaAltraTavola(idxODL, matrOpr, idxMacchinaTo); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1312,9 +1319,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.OdlFineProd(idxODL, idxMacchina); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1338,9 +1343,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.OdlFixMachineSlave(idxMacchina, numDayPrev, doInsert); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1367,9 +1370,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.OdlInizioSetup(idxODL, matrOpr, idxMacchina, tcRich, pzPallet, note); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1473,9 +1474,7 @@ namespace MP.Data.Services // riordino result = results.FirstOrDefault(); // svuoto cache - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); if (result == null) { result = new ODLModel(); @@ -1498,9 +1497,7 @@ namespace MP.Data.Services { // inserisco evento answ = await Task.FromResult(dbTabController.OdlSetupPostumo(idxODL, idxMacchina)); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1524,9 +1521,7 @@ namespace MP.Data.Services { // inserisco evento answ = await Task.FromResult(dbTabController.OdlSetupPromPostuma(idxPromOdl, matrOpr, idxMacchina)); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1555,9 +1550,7 @@ namespace MP.Data.Services { // inserisco evento answ = await Task.FromResult(dbTabController.OdlSplit(idxODL, matrOpr, idxMacchina, TCRich, pzPallet, note, startNewOdl, qtyRich)); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1583,9 +1576,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.OdlUpdate(idxODL, matrOpr, tCRichAttr, pzPallet, note); - await FlushCache("ODL"); - await FlushCache("PODL"); - await FlushCache("VSODL"); + await FlushOdlCache(); } catch (Exception exc) { @@ -1759,8 +1750,7 @@ namespace MP.Data.Services { // inserisco evento answ = dbTabController.PODL_startSetup(editRec, matrOpr, tcRich, pzPallet, note, dtEvent); - await FlushCache("ODL"); - await FlushCache("PODL"); + await FlushOdlCache(); } catch (Exception exc) {