From 4d16ca1543cd4b699402eec9786f0ddd33082734 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Dec 2023 10:21:22 +0100 Subject: [PATCH] Fix attrezzaggio DP --- MP-TAB-SERV/Components/OdlMan.razor.cs | 17 ++++++++++++++--- MP-TAB-SERV/Components/ProdConfirm.razor.cs | 2 +- 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 +- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs index c47869cd..ec768e88 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor.cs +++ b/MP-TAB-SERV/Components/OdlMan.razor.cs @@ -669,8 +669,20 @@ namespace MP_TAB_SERV.Components emailAdmDest = rawEmailDest.Split(',').ToList(); if (RecMSE != null) { - IdxMaccSel = RecMSE.IdxMacchina; - IdxMaccParent = getIdxMaccParent(); + if (string.IsNullOrEmpty(IdxMaccSel)) + { + IdxMaccSel = RecMSE.IdxMacchina; + } + isMulti = SMServ.DictMacchMulti[RecMSE.IdxMacchina] == 1; + if (isMulti) + { + var idxMSel = MServ.UserPrefGet(IdxMaccSel); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + IdxMaccParent = getIdxMaccParent(); + } // verifica stato inAttr await CheckAttr(); await ReloadData(true); @@ -680,7 +692,6 @@ namespace MP_TAB_SERV.Components protected override async Task OnParametersSetAsync() { - isMulti = SMServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1; await ReloadData(false); } diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs index 7009a18b..b2e7cc9c 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs +++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs @@ -171,7 +171,7 @@ namespace MP_TAB_SERV.Components // verifico se la macchina sia configurata tra le MSFD... if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina)) { - isMulti = SMServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1; + isMulti = SMServ.DictMacchMulti[RecMSE.IdxMacchina] == 1; } IdxMaccSel = RecMSE.IdxMacchina; if (isMulti) diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 9d7e0b1c..bea92305 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.1509 + 6.16.2312.1510 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 169afd73..a5d4db60 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.1509

+

Versione: 6.16.2312.1510


Note di rilascio: