From 9eb3ef6645a7a96dc25a299da938d1890844ff2b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 14 Nov 2024 16:07:44 +0100 Subject: [PATCH] TAB3: - fix reset scarti confermati alla gestione ODL (chiudi/nuovo) --- MP-TAB3/Components/MachineBlock.razor | 2 +- MP-TAB3/Components/MachineBlock.razor.cs | 4 ++-- MP-TAB3/Components/OdlMan.razor.cs | 14 ++++++++++++++ MP-TAB3/Components/ScrapEditor.razor.cs | 5 +++++ MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- MP.Data/Services/StatusData.cs | 2 +- 9 files changed, 27 insertions(+), 8 deletions(-) diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index 2a8f0ff5..8a19d1a7 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -200,7 +200,7 @@ else {
- Scarto + Scarto Conf
@($"- {datiProdAct.PzConfScarto}") diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index 778388e3..6a5f74d6 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -199,7 +199,7 @@ namespace MP_TAB3.Components } /// - /// Dati produzioen rilevati + /// Dati produzione rilevati /// protected StatoProdModel? datiProdAct { get; set; } = null; @@ -258,7 +258,7 @@ namespace MP_TAB3.Components // controllo SE ho variazioni cosė rileggo if (RecMSE != null) { - if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd) + if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.PezziProd || SDService.MachProdStGet(RecMSE.IdxMacchina).IdxOdl != RecMSE.IdxOdl) { datiProdAct = await TabDServ.StatoProdMacchina(RecMSE.IdxMacchina, adesso); SDService.MachProdStSet(RecMSE.IdxMacchina, datiProdAct); diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 5a019eb3..dbb0fca1 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -429,6 +429,10 @@ namespace MP_TAB3.Components if (!await JSRuntime.InvokeAsync("confirm", $"PODL: {currPodl.IdxPromessa}{Environment.NewLine}Art: [{currPodl.CodArticolo}] {currPodl.DescArticolo}{Environment.NewLine}Pezzi: {currPodl.NumPezzi} * TCiclo: {tcRichAttr:N3}min{Environment.NewLine}Tempo stimato: {stima}{Environment.NewLine}{Environment.NewLine}Confermi la chiusura della fase di attrezzaggio?")) return; + + // prima di tutto svuoto dati prod + SDService.MachProdStRem(IdxMaccSel); + // preparo gestione progress display MaxVal = 8; int currStep = 0; @@ -547,6 +551,9 @@ namespace MP_TAB3.Components // preparo gestione progress display MaxVal = 11; int currStep = 0; + // elimino dati status... + SDService.MachProdStRem(IdxMaccSel); + SDService.MachProdStRem(IdxMaccParent); if (isMulti) { @@ -811,6 +818,7 @@ namespace MP_TAB3.Components await advStep(currStep); // leggo idxOdl da ultimo odl attivo x macchina var currOdl = await TabDServ.OdlCurrByMacc(IdxMaccSel, false); + SDService.MachProdStRem(IdxMaccSel); int idxODLCurr = currOdl.IdxOdl; int idxEvento = 7; // !!!HARD CODED confermo prod vecchio ODL @@ -980,6 +988,9 @@ namespace MP_TAB3.Components if (!await JSRuntime.InvokeAsync("confirm", $"Confermi invio FIX chiusura attrezzaggio ad impianto?")) return; + // prima di tutto svuoto dati prod + SDService.MachProdStRem(IdxMaccSel); + string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now); string outData = $"TS:{ts}|MATR:{MatrOpr}|ODL:{IdxOdl}"; TabDServ.addTask4Machine(IdxMaccSel, taskType.fixStopSetup, outData); @@ -1062,6 +1073,9 @@ namespace MP_TAB3.Components if (!await JSRuntime.InvokeAsync("confirm", $"Confermi richiesta riattrezzaggio ODL, con conseguente chiusura ODL corrente + split nuovo ODL con TC {tcRichAttr:N3}?")) return; + // prima di tutto svuoto dati prod + SDService.MachProdStRem(IdxMaccSel); + // preparo gestione progress display MaxVal = 9; int currStep = 0; diff --git a/MP-TAB3/Components/ScrapEditor.razor.cs b/MP-TAB3/Components/ScrapEditor.razor.cs index 96ef8169..466cd2c4 100644 --- a/MP-TAB3/Components/ScrapEditor.razor.cs +++ b/MP-TAB3/Components/ScrapEditor.razor.cs @@ -52,6 +52,9 @@ namespace MP_TAB3.Components } } + [Inject] + protected StatusData SDService { get; set; } = null!; + [Inject] protected SharedMemService SMServ { get; set; } = null!; @@ -105,6 +108,8 @@ namespace MP_TAB3.Components { // reset DoReset(); + // prima di tutto svuoto dati prod + SDService.MachProdStRem(IdxMaccSel); errMsg = ""; await E_Updated.InvokeAsync(true); await ReloadData(); diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 848fe611..1e25f916 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2411.706 + 6.16.2411.1415 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 4fceae5d..f5ac856b 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2411.706

+

Versione: 6.16.2411.1415


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index d755ca96..747389b7 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2411.706 +6.16.2411.1415 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 3df93341..91b4ded6 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2411.706 + 6.16.2411.1415 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs index 99ac8fc7..9d872f8a 100644 --- a/MP.Data/Services/StatusData.cs +++ b/MP.Data/Services/StatusData.cs @@ -213,7 +213,7 @@ namespace MP.Data.Services } /// - /// Restituisce numPezzi (ultimo) x macchina + /// Restituisce stato prod x NumPezzi (ultimo) x macchina /// /// ///