From 8351cde96fd699d3a634340cf58a2e86f32a83ed Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 21 Dec 2023 17:10:15 +0100 Subject: [PATCH] Fix cehck conferma prod --- MP-TAB3/Components/OdlMan.razor.cs | 48 ++++++++++++++++-------------- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index e70df9f6..01000171 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -1150,18 +1150,8 @@ namespace MP_TAB3.Components get => MServ.MatrOpr; } - private bool needConfProd - { - get - { - bool answ = true; - if (prodMacchina != null) - { - answ = prodMacchina.pezziNonConfermati > 0 && !isSlave; - } - return answ; - } - } + private bool needConfProd { get; set; } = false; + private int numPz2Conf { @@ -1461,6 +1451,7 @@ namespace MP_TAB3.Components // recupero pz da confermare var rawData = await TabDServ.PezziProdMacchina(IdxMaccSel); prodMacchina = rawData.FirstOrDefault() ?? new PzProdModel(); + checkConfProd(); if (prodMacchina.pezziNonConfermati > 0) { // confermo produzione ZERO pezzi (in setup) @@ -1596,21 +1587,32 @@ namespace MP_TAB3.Components { var rawData = await TabDServ.PezziProdMacchina(IdxMaccSel); prodMacchina = rawData.FirstOrDefault() ?? new PzProdModel(); + checkConfProd(); + } + } + // imposto tcRichAttr in base allo stato... + if (odlOk) + { + // prendo TCRich da PODL... + if (IdxPOdlSel > 0) + { + tcRichAttr = currPodl.Tcassegnato; + } + else + { + tcRichAttr = currOdl.TCRichAttr; } } } - // imposto tcRichAttr in base allo stato... - if (odlOk) + } + + private void checkConfProd() + { + // calcolo conferma prod... + needConfProd = RecMSE != null && prodMacchina != null; + if (prodMacchina != null) { - // prendo TCRich da PODL... - if (IdxPOdlSel > 0) - { - tcRichAttr = currPodl.Tcassegnato; - } - else - { - tcRichAttr = currOdl.TCRichAttr; - } + needConfProd = prodMacchina.pezziNonConfermati > 0 && !isSlave; } } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 23861ac4..e7711e4b 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.2115 + 6.16.2312.2117 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 920814d2..78418854 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2312.2115

+

Versione: 6.16.2312.2117


Note di rilascio: