diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 674a660d..69e332de 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -1213,9 +1213,6 @@ namespace MP_TAB3.Components } private bool setupActive { get; set; } = false; -#if false - private string IdxMaccSelLast = ""; -#endif /// /// Verifica visibilità btn riprendi ODL su 2° tavola SE: @@ -1291,7 +1288,7 @@ namespace MP_TAB3.Components } } - private decimal tcRichAttr { get; set; } = 1; + private decimal tcRichAttr { get; set; } = 0; private string titleOdlDetail { @@ -1452,7 +1449,7 @@ namespace MP_TAB3.Components { if (tcRichAttr == 0) { - tcRichAttr = IdxPOdlSel == 0 ? currOdl.Tcassegnato : currPodl.Tcassegnato; + tcRichAttr = IdxPOdlSel == 0 ? currOdl.TCRichAttr : currPodl.Tcassegnato; } if (string.IsNullOrEmpty(noteAttr)) { diff --git a/MP-TAB3/Components/ParamsMan.razor.cs b/MP-TAB3/Components/ParamsMan.razor.cs index 27b00ecc..dcea9053 100644 --- a/MP-TAB3/Components/ParamsMan.razor.cs +++ b/MP-TAB3/Components/ParamsMan.razor.cs @@ -95,9 +95,14 @@ namespace MP_TAB3.Components setupConf(); StartTimer(); currItem = null; - if (RecMSE != null) + } + + protected override async Task OnParametersSetAsync() + { + if (RecMSE != null && !RecMSE.MostlyEquals(lastRecMSE)) { IdxMaccSel = RecMSE.IdxMacchina; + lastRecMSE = RecMSE; await ReloadData(); } await Task.Delay(1); @@ -153,8 +158,8 @@ namespace MP_TAB3.Components #region Private Properties private ObjItemDTO? currItem { get; set; } = null; - private string IdxMaccSel { get; set; } = ""; + private MappaStatoExpl? lastRecMSE { get; set; } = null; #endregion Private Properties diff --git a/MP-TAB3/Components/SelTempoMSMC.razor.cs b/MP-TAB3/Components/SelTempoMSMC.razor.cs index 68e58fa9..060c6baf 100644 --- a/MP-TAB3/Components/SelTempoMSMC.razor.cs +++ b/MP-TAB3/Components/SelTempoMSMC.razor.cs @@ -171,7 +171,7 @@ namespace MP_TAB3.Components /// protected TimeSpan minCent2Sec(decimal valore) { - TimeSpan answ = TimeSpan.FromSeconds((double)valore * 60); + TimeSpan answ = TimeSpan.FromSeconds(Math.Round((double)(valore * 60))); return answ; } @@ -211,7 +211,7 @@ namespace MP_TAB3.Components /// /// tempo min:sec /// - private TimeSpan _tempoMS { get; set; } = TimeSpan.FromSeconds(1); + private TimeSpan _tempoMS { get; set; } = TimeSpan.FromSeconds(3599); private string baseLang { diff --git a/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs b/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs index ed4f55b1..672fa1f4 100644 --- a/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs +++ b/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs @@ -44,9 +44,18 @@ namespace MP_TAB3.Components { if (IdxOdl > 0 && !string.IsNullOrEmpty(CodGruppo)) { - await ReloadData(); + if (CodArticolo != codArticoloLast || IdxOdl != idxOdlLast || CodGruppo!=codGruppoLast) + { + codArticoloLast = CodArticolo; + idxOdlLast = IdxOdl; + codGruppoLast = CodGruppo; + await ReloadData(); + } } } + private int idxOdlLast = 0; + private string codArticoloLast = ""; + private string codGruppoLast = ""; [Inject] protected TabDataService TabServ { get; set; } = null!; diff --git a/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs b/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs index cd94ab5e..927cea93 100644 --- a/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs +++ b/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs @@ -26,8 +26,8 @@ namespace MP_TAB3.Components { if (IdxOdl > 0) { - var rawData = TabDServ.STAR_pendByOdl(IdxOdl); - showChecks = rawData.Count > 0; + var rawData = TabDServ.STAR_pendByOdl(IdxOdl); + showChecks = rawData.Count > 0; } else { @@ -69,13 +69,20 @@ namespace MP_TAB3.Components protected override void OnParametersSet() { - checkInputData(); + if (CodArticolo != codArticoloLast || IdxOdl != idxOdlLast) + { + codArticoloLast = CodArticolo; + idxOdlLast = IdxOdl; + checkInputData(); + } } #endregion Protected Methods #region Private Fields + private string codArticoloLast = ""; + private int idxOdlLast = 0; private string lastBCodeVal = ""; private string MessageCss = ""; private string MessageText = ""; diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index c22dc9bb..25c9eff4 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2402.2811 + 6.16.2402.2815 enable MP_TAB3 diff --git a/MP-TAB3/Pages/BasePage.razor.cs b/MP-TAB3/Pages/BasePage.razor.cs index a00cde6f..e031fb07 100644 --- a/MP-TAB3/Pages/BasePage.razor.cs +++ b/MP-TAB3/Pages/BasePage.razor.cs @@ -63,7 +63,6 @@ namespace MP_TAB3.Pages protected override async Task OnParametersSetAsync() { await ReloadData(); - //return base.OnParametersSetAsync(); } /// diff --git a/MP-TAB3/Pages/ProdStop.razor b/MP-TAB3/Pages/ProdStop.razor index 38a97c95..ef7a49cb 100644 --- a/MP-TAB3/Pages/ProdStop.razor +++ b/MP-TAB3/Pages/ProdStop.razor @@ -26,10 +26,10 @@ else } else { - @foreach (var item in events2show) - { - - } + @foreach (var item in events2show) + { + + } } } diff --git a/MP-TAB3/Pages/ProdStop.razor.cs b/MP-TAB3/Pages/ProdStop.razor.cs index 570e791c..82bf43aa 100644 --- a/MP-TAB3/Pages/ProdStop.razor.cs +++ b/MP-TAB3/Pages/ProdStop.razor.cs @@ -223,6 +223,9 @@ namespace MP_TAB3.Pages rdm_nEvStep = SMServ.GetConfInt("rdm_nEvStep"); rdm_nEvCheck = SMServ.GetConfInt("rdm_nEvCheck"); rdm_ChkOnly = SMServ.GetConfBool("rdm_ChkOnly"); + } + protected override async Task OnParametersSetAsync() + { // leggo gli altri dati await ReloadData(); } diff --git a/MP-TAB3/Pages/Scrap.razor.cs b/MP-TAB3/Pages/Scrap.razor.cs index 5937d133..8b72312b 100644 --- a/MP-TAB3/Pages/Scrap.razor.cs +++ b/MP-TAB3/Pages/Scrap.razor.cs @@ -10,6 +10,7 @@ namespace MP_TAB3.Pages await ReloadData(); } + protected void SetMacc(string selIdxMacc) { IdxMaccSubSel = selIdxMacc; diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 91757d55..0d55db6f 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2402.2811

+

Versione: 6.16.2402.2815


Note di rilascio: