diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index 234a5247..3e87e819 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -13,107 +13,47 @@ } else { - @if (FullMode) + @if (RecMSE == null) { -
- @RecMSE.CodMacchina -
-
-
-
-
- Art -
-
- @RecMSE.CodArticolo -
-
-
-
- @($"PODL{RecMSE.IdxPOdl:00000000}") -
-
- @($"ODL{RecMSE.IdxOdl:00000000}") -
-
-
-
-
-
-
-

- @RecMSE.Nome -

-
-
-
-
- @RecMSE.DescrizioneStato -
-
- @(formatDurata(RecMSE.Durata)) -
-
-
-
-
-
- Confermati -
-
- Prodotti -
-
- Ordinati -
-
-
-
- @($"{RecMSE.PezziConf:N0}") -
-
- @($"{RecMSE.PezziProd:N0}") -
-
- @($"{RecMSE.NumPezzi:N0}") -
-
-
-
- -
-
-
-
+
+
+
No data
+
+ + + +
} else { -
-
+ @if (FullMode) + { +
+ @RecMSE.CodMacchina
- @*
-
-
-
- Art -
-
- @RecMSE.CodArticolo -
-
-
-
- @($"PODL{RecMSE.IdxPOdl:00000000}") -
-
- @($"ODL{RecMSE.IdxOdl:00000000}") -
-
-
-
*@ +
+
+
+
+ Art +
+
+ @RecMSE.CodArticolo +
+
+
+
+ @($"PODL{RecMSE.IdxPOdl:00000000}") +
+
+ @($"ODL{RecMSE.IdxOdl:00000000}") +
+
+
+
@@ -164,14 +104,69 @@ else
-
- + } + else + { +
+
+
+
+
+
+

+ @RecMSE.Nome +

+
+
+
+
+ @RecMSE.DescrizioneStato +
+
+ @(formatDurata(RecMSE.Durata)) +
+
+
+
+
+
+ Confermati +
+
+ Prodotti +
+
+ Ordinati +
+
+
+
+ @($"{RecMSE.PezziConf:N0}") +
+
+ @($"{RecMSE.PezziProd:N0}") +
+
+ @($"{RecMSE.NumPezzi:N0}") +
+
+
+
+ +
+
+
+
+
+
+
+
+ +
-
+ } + } } - - - diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor index 54a6a793..6fefc1a7 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -162,18 +162,4 @@
} - -@if (isProcessing) -{ -
-
-
-
-
- ELABORAZIONE IN CORSO -
-
-
-
-
-} \ No newline at end of file + \ No newline at end of file diff --git a/MP-TAB-SERV/Components/ShowProcessing.razor b/MP-TAB-SERV/Components/ShowProcessing.razor new file mode 100644 index 00000000..30428703 --- /dev/null +++ b/MP-TAB-SERV/Components/ShowProcessing.razor @@ -0,0 +1,19 @@ +@if (IsProcessing) +{ +
+
+
+
+
+ ELABORAZIONE IN CORSO +
+
+
+
+
+} +@code { + [Parameter] + public bool IsProcessing { get; set; } = false; + +} diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index f85cea51..aeee70c9 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.1018 + 6.16.2310.1107 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/ProdStop.razor b/MP-TAB-SERV/Pages/ProdStop.razor index b0a392ff..b94832a2 100644 --- a/MP-TAB-SERV/Pages/ProdStop.razor +++ b/MP-TAB-SERV/Pages/ProdStop.razor @@ -12,6 +12,7 @@ else +
@if (!string.IsNullOrEmpty(lblOut)) { diff --git a/MP-TAB-SERV/Pages/ProdStop.razor.cs b/MP-TAB-SERV/Pages/ProdStop.razor.cs index da6d4def..11dd336d 100644 --- a/MP-TAB-SERV/Pages/ProdStop.razor.cs +++ b/MP-TAB-SERV/Pages/ProdStop.razor.cs @@ -71,6 +71,8 @@ namespace MP_TAB_SERV.Pages #region Protected Methods + protected bool isProcessing = false; + /// /// Processo registrazione eventi /// @@ -78,9 +80,9 @@ namespace MP_TAB_SERV.Pages /// protected async Task EventRecord(int IdxEv) { + isProcessing = true; await Task.Delay(1); // salvo evento e processo... - if (IdxEv > 0) { var rigaEvento = SMServ.GetEventRow(IdxEv); @@ -90,7 +92,7 @@ namespace MP_TAB_SERV.Pages // processo evento... if (insRealtime) { - DateTime adesso = DateTime.Now.Round(TimeSpan.FromSeconds(1)); + DateTime adesso = DateTime.Now.Floor(TimeSpan.FromSeconds(1)); EventListModel newRec = new EventListModel() { IdxMacchina = IdxMacc, @@ -162,7 +164,7 @@ namespace MP_TAB_SERV.Pages // eseguo ricalcolo! DateTime startRicalcolo = DtRif.AddMinutes(minAnticipoRicalcolo); // eseguo ricalcolo periodo.. - TabServ.DDB_DoRecalc(IdxMacc, startRicalcolo, 1, rdm_nEvStep, rdm_nEvCheck, rdm_ChkOnly); + await TabServ.DDB_DoRecalc(IdxMacc, startRicalcolo, 1, rdm_nEvStep, rdm_nEvCheck, rdm_ChkOnly); // chiamo registrazione commento... if (noteEdit != null) { @@ -199,6 +201,7 @@ namespace MP_TAB_SERV.Pages // aggiorno MSE attuale CurrMSE = ListMSE.Find(x => x.IdxMacchina == IdxMacc); } + isProcessing = false; } protected override async Task OnInitializedAsync() diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 4acdd247..35f33570 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.1018

+

Versione: 6.16.2310.1107


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 3257a9bf..90516723 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.1018 +6.16.2310.1107 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 09221c2b..346dcf3b 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.1018 + 6.16.2310.1107 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/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs index 7e550dae..f4383ee3 100644 --- a/MP.Data/Controllers/MpTabController.cs +++ b/MP.Data/Controllers/MpTabController.cs @@ -316,6 +316,7 @@ namespace MP.Data.Controllers .DbSetDDB .FromSqlRaw("exec dbo.stp_DDB_getNextByMacchinaFrom @IdxMacchina, @dataRif", IdxMacchina, DataRif) .AsNoTracking() + .AsEnumerable() .FirstOrDefault(); } return dbResult; @@ -378,10 +379,10 @@ namespace MP.Data.Controllers var result = dbCtx .Database - .ExecuteSqlRaw("exec man.stp_ricalcolaDatiMacchinaFromDateFork @IdxMacchina, @inizio, @idxStatoStart, @nStepEventi, @nRecCheck, @CheckOnly", IdxMacchina, Inizio, IdxStatoStart, nStepEventi, NRecCheck, CheckOnly); + .ExecuteSqlRaw("exec man.stp_ricalcolaDatiMacchinaFromDateFork @IdxMacchina, @inizio, @idxStatoStart, @nStepEventi, @nRecCheck, @CheckOnly", IdxMacchina, Inizio, IdxStatoStart, NStepEventi, NRecCheck, CheckOnly); // indico eseguito! - fatto = result > 0; + fatto = result != 0; } return fatto; } diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index 3ccce2ad..3186a935 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -311,9 +311,11 @@ namespace MP.Data.Services /// /// /// - public bool DDB_DoRecalc(string idxMacchina, DateTime inizio, int idxStatoStart, int nStepEventi, int nRecCheck, bool checkOnly) + public async Task DDB_DoRecalc(string idxMacchina, DateTime inizio, int idxStatoStart, int nStepEventi, int nRecCheck, bool checkOnly) { - return dbTabController.DDB_DoRecalc(idxMacchina, inizio, idxStatoStart, nStepEventi, nRecCheck, checkOnly); + bool answ = dbTabController.DDB_DoRecalc(idxMacchina, inizio, idxStatoStart, nStepEventi, nRecCheck, checkOnly); + await FlushCache(); + return answ; } public void Dispose()