diff --git a/MP-TAB-SERV/Components/MachSel.razor b/MP-TAB-SERV/Components/MachSel.razor index bc8487d4..aef38a54 100644 --- a/MP-TAB-SERV/Components/MachSel.razor +++ b/MP-TAB-SERV/Components/MachSel.razor @@ -3,7 +3,6 @@
Selezione Impianto
- @* - - - - - *@ } diff --git a/MP-TAB-SERV/Components/MachSel.razor.cs b/MP-TAB-SERV/Components/MachSel.razor.cs index 32a9a6b0..755f933f 100644 --- a/MP-TAB-SERV/Components/MachSel.razor.cs +++ b/MP-TAB-SERV/Components/MachSel.razor.cs @@ -43,7 +43,6 @@ namespace MP_TAB_SERV.Components #region Protected Methods - protected override async Task OnParametersSetAsync() { // inizilamente riporto machcina corrente da MSE @@ -59,6 +58,12 @@ namespace MP_TAB_SERV.Components var listMulti = await TDataService.VMSFDGetAll(); ListMacchine = listMulti.Where(x => x.IdxMacchina.Contains($"{RecMSE?.IdxMacchina}#")).ToDictionary(x => x.IdxMacchina, x => $"{x.IdxMacchina.Replace($"{RecMSE?.IdxMacchina}#", "")}"); + + if (ListMacchine.Count > 0 && string.IsNullOrEmpty(idxMaccSel)) + { + IdxMaccSel = ListMacchine.FirstOrDefault().Key; + //await E_MachSel.InvokeAsync(idxMaccSel); + } } } await Task.Delay(1); diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor index ecc0106e..54a6a793 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -1,4 +1,5 @@  +
@if (odlOk) @@ -9,7 +10,6 @@ @ConfTitle
-
} else @@ -93,9 +93,7 @@
@if (isProcessing) { -
- -
+ } else { @@ -112,9 +110,7 @@
@if (isProcessing) { -
- -
+ } else { @@ -131,9 +127,7 @@
@if (isProcessing) { -
- -
+ } else { @@ -150,9 +144,7 @@
@if (isProcessing) { -
- -
+ } else { diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index de401236..c829ab60 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.2310.515 + 6.16.2310.519 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor.cs b/MP-TAB-SERV/Pages/MachineDetail.razor.cs index f4f24b32..3f74f5cd 100644 --- a/MP-TAB-SERV/Pages/MachineDetail.razor.cs +++ b/MP-TAB-SERV/Pages/MachineDetail.razor.cs @@ -15,6 +15,9 @@ namespace MP_TAB_SERV.Pages [Inject] protected MessageService MsgServ { get; set; } = null!; + [Inject] + protected SharedMemService MStor { get; set; } = null!; + [Inject] protected TabDataService TabServ { get; set; } = null!; @@ -25,12 +28,20 @@ namespace MP_TAB_SERV.Pages protected override async Task OnInitializedAsync() { await ReloadData(); -#if false if (enableSchedaTecnica) { checkLottiOdl(); } -#endif + } + + protected async Task RefreshMBlock() + { + // recupero MSE macchina.... + if (!string.IsNullOrEmpty(IdxMacc)) + { + CurrMSE = await MsgServ.GetMachineMse(IdxMacc); + } + await Task.Delay(1); } #endregion Protected Methods @@ -38,8 +49,8 @@ namespace MP_TAB_SERV.Pages #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); - private List? CurrConfig = null; + private bool enableMagLotti = false; private bool enableSchedaTecnica = false; #endregion Private Fields @@ -70,16 +81,6 @@ namespace MP_TAB_SERV.Pages #endif } - protected async Task RefreshMBlock() - { - // recupero MSE macchina.... - if (!string.IsNullOrEmpty(IdxMacc)) - { - CurrMSE = await MsgServ.GetMachineMse(IdxMacc); - } - await Task.Delay(1); - } - private async Task ReloadData() { if (string.IsNullOrEmpty(IdxMacc)) @@ -104,21 +105,9 @@ namespace MP_TAB_SERV.Pages private async Task setupConf() { - CurrConfig = await TabServ.ConfigGetAll(); -#if false - if (CurrConfig != null && CurrConfig.Count > 0) - { - // sistemo i parametri opzionali... - getConfValInt("keepAliveMin", ref keepAliveMin); - getConfValInt("MON_maxCol", ref maxCol); - int intDoAnim = 0; - getConfValInt("doAnimate", ref intDoAnim); - doAnimate = intDoAnim == 1; - getConfValInt("pageRefreshSec", ref slowRefreshSec); - getConfVal("sART", ref showArt); - Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec}"); - } -#endif + enableSchedaTecnica = MStor.GetConfBool("enableSchedaTecnica"); + enableMagLotti = MStor.GetConfBool("enableMagLotti"); + await Task.Delay(1); } #endregion Private Methods diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index e1243fcc..d8c36b01 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.515

+

Versione: 6.16.2310.519


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 038428d5..d492269e 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.515 +6.16.2310.519 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index b8d8b1ed..e62fd14e 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.515 + 6.16.2310.519 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