From 95f9b03c3efb1981456be5a16774df307d24b82d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Dec 2023 09:10:41 +0100 Subject: [PATCH] Fix conferma x doppia tavola (se ferma) --- MP-TAB-SERV/Components/MachSel.razor.cs | 8 ++-- MP-TAB-SERV/Components/ProdConfirm.razor.cs | 41 +++++++++++++++------ 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 | 1 + 7 files changed, 39 insertions(+), 19 deletions(-) diff --git a/MP-TAB-SERV/Components/MachSel.razor.cs b/MP-TAB-SERV/Components/MachSel.razor.cs index 761ef777..2c154c7a 100644 --- a/MP-TAB-SERV/Components/MachSel.razor.cs +++ b/MP-TAB-SERV/Components/MachSel.razor.cs @@ -42,7 +42,7 @@ namespace MP_TAB_SERV.Components protected Dictionary? ListMacchine { get; set; } = null; [Inject] - protected SharedMemService MServ { get; set; } = null!; + protected SharedMemService SMServ { get; set; } = null!; #endregion Protected Properties @@ -67,16 +67,16 @@ namespace MP_TAB_SERV.Components if (RecMSE != null) { // verifico se la macchina sia configurata tra le MSFD... - if (MServ.DictMacchMulti.ContainsKey(RecMSE?.IdxMacchina)) + if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina)) { - isMulti = MServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1; + isMulti = SMServ.DictMacchMulti[RecMSE.IdxMacchina] == 1; } if (isMulti) { var listMulti = await TDataService.VMSFDGetAll(); ListMacchine = listMulti - .Where(x => x.IdxMacchina.Contains($"{RecMSE?.IdxMacchina}#")) + .Where(x => x.IdxMacchina.Contains($"{RecMSE.IdxMacchina}#")) .ToDictionary(x => x.IdxMacchina, x => x.CodMaccArticolo); if (ListMacchine.Count > 0 && string.IsNullOrEmpty(idxMaccSel)) diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs index 15d8818a..7009a18b 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs +++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs @@ -82,7 +82,7 @@ namespace MP_TAB_SERV.Components protected StatusData MDataService { get; set; } = null!; [Inject] - protected MessageService MServ { get; set; } = null!; + protected MessageService MsgServ { get; set; } = null!; protected int numPz2Rec { get; set; } = 0; @@ -151,18 +151,37 @@ namespace MP_TAB_SERV.Components await Task.Delay(1); } - protected override async Task OnInitializedAsync() + protected override void OnInitialized() + { + enablePzProdLasciati = SMServ.GetConfBool("enablePzProdLasciati"); + chkPzBuoniNeg = SMServ.GetConfBool("TAB_ChkConfPz"); + confRett = SMServ.GetConfBool("confRett"); + enableMagPrint = SMServ.GetConfBool("enableMagPrint"); + modoConfProd = SMServ.GetConfInt("modoConfProd"); + } + + protected override async Task OnParametersSetAsync() { lblOut = ""; numPzLasciati = 0; - if (RecMSE != null) + if (RecMSE != null && string.IsNullOrEmpty(IdxMaccSel)) { + // verifico SE fosse doppia... + bool isMulti = false; + // verifico se la macchina sia configurata tra le MSFD... + if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina)) + { + isMulti = SMServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1; + } IdxMaccSel = RecMSE.IdxMacchina; - enablePzProdLasciati = SMServ.GetConfBool("enablePzProdLasciati"); - chkPzBuoniNeg = SMServ.GetConfBool("TAB_ChkConfPz"); - confRett = SMServ.GetConfBool("confRett"); - enableMagPrint = SMServ.GetConfBool("enableMagPrint"); - modoConfProd = SMServ.GetConfInt("modoConfProd"); + if (isMulti) + { + var idxMSel = MsgServ.UserPrefGet(IdxMaccSel); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + } await DoUpdate(); } } @@ -180,7 +199,7 @@ namespace MP_TAB_SERV.Components if (ListMSE != null) { // salvo in LocalStorage... - await MServ.SaveMse(ListMSE); + await MsgServ.SaveMse(ListMSE); // aggiorno MSE attuale RecMSE = ListMSE.Find(x => x.IdxMacchina == IdxMaccSel); } @@ -248,7 +267,7 @@ namespace MP_TAB_SERV.Components private int MatrOpr { - get => MServ.MatrOpr; + get => MsgServ.MatrOpr; } private int numPzLasc { get; set; } = 0; @@ -283,7 +302,7 @@ namespace MP_TAB_SERV.Components private async Task RefreshData() { List ListMSE = await MDataService.MseGetAll(true); - await MServ.SaveMse(ListMSE); + await MsgServ.SaveMse(ListMSE); await E_Updated.InvokeAsync(ListMSE); } diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 45e60950..9d7e0b1c 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.1419 + 6.16.2312.1509 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 89167b64..169afd73 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.1419

+

Versione: 6.16.2312.1509


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index b3b5d175..db4d26fc 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1419 +6.16.2312.1509 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 6bfa14b6..86d22056 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1419 + 6.16.2312.1509 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 94cf1b64..3f774d04 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -852,6 +852,7 @@ namespace MP.Data.Services await FlushCache("PODL"); await FlushCache("VSODL"); await FlushCache("StatoMacc"); + await FlushCache("MSFD"); } ///