diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 9d9da89c..396a1a2a 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -635,21 +635,22 @@ namespace MP.Data.Controllers /// * = tutti, altrimenti solo x un dato articolo /// Data minima per estrazione records /// Data Massima per estrazione records + /// Num max record recuperati /// - public List DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd) + public async Task> DossiersGetLastFiltAsync(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd, int MaxRec) { List dbResult = new List(); using (var dbCtx = new MoonPro_FluxContext(_configuration)) { - dbResult = dbCtx + dbResult = await dbCtx .DbSetDossiers .AsNoTracking() .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodArticolo == "*" || x.CodArticolo == CodArticolo) && (x.DtRif >= DtStart && x.DtRif <= DtEnd)) .Include(m => m.MachineNav) .Include(a => a.ArticoloNav) - ////.Include(o => o.OdlNav) .OrderByDescending(x => x.DtRif) - .ToList(); + .Take(MaxRec) + .ToListAsync(); } return dbResult; } diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index d8607670..4c5528a4 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -76,6 +76,14 @@ + +
+ +
+
+ + +
diff --git a/MP.SPEC/Components/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs index 98cdbe8f..32b021dc 100644 --- a/MP.SPEC/Components/DossiersFilter.razor.cs +++ b/MP.SPEC/Components/DossiersFilter.razor.cs @@ -129,6 +129,7 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { SelFilterDossier = new SelectDossierParams(); + SelFilterDossier.MaxRecord = 1000; DateTime dtEnd = SelFilterDossier.DtEnd; DateTime dtStart = dtEnd.Subtract(SelFilterDossier.DtStart).TotalDays < 15 ? SelFilterDossier.DtStart : dtEnd.AddDays(-14); ListMacchine = await MDService.MacchineWithFlux(dtStart, dtEnd); diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 6360e323..7bf94768 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -379,6 +379,10 @@ namespace MP.SPEC.Components { get => SelFilter.IdxMacchina; } + private int MaxRec + { + get => SelFilter.MaxRecord; + } private int totalCount { @@ -432,7 +436,7 @@ namespace MP.SPEC.Components private async Task ReloadData(bool setChanged) { isLoading = true; - SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtStart, SelDtEnd); + SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtStart, SelDtEnd, MaxRec); totalCount = SearchRecords.Count; ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index ffb08dad..4f29aba5 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -832,14 +832,14 @@ namespace MP.SPEC.Data /// Data minima per estrazione records /// Data Massima per estrazione records /// - public async Task> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd) + public async Task> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd, int maxRec) { - using var activity = ActivitySource.StartActivity("DossiersGetLastFilt"); + using var activity = ActivitySource.StartActivity("DossiersGetLastFiltAsync"); List? result = new List(); string source = "DB"; - string currKey = $"{Utils.redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtStart:yyyyMMddHHmm}:{DtEnd:yyyyMMddHHmm}"; + string currKey = $"{Utils.redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtStart:yyyyMMddHHmm}:{DtEnd:yyyyMMddHHmm}:{maxRec}"; // cerco in redis dato valore sel idxMaccSel... - RedisValue rawData = redisDb.StringGet(currKey); + RedisValue rawData = await redisDb.StringGetAsync(currKey); if (rawData.HasValue) { result = JsonConvert.DeserializeObject>($"{rawData}"); @@ -847,10 +847,10 @@ namespace MP.SPEC.Data } else { - result = await Task.FromResult(dbController.DossiersGetLastFilt(IdxMacchina, CodArticolo, DtStart, DtEnd)); + result = await dbController.DossiersGetLastFiltAsync(IdxMacchina, CodArticolo, DtStart, DtEnd, maxRec); // serializzo e salvo... rawData = JsonConvert.SerializeObject(result); - redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache / 5)); + await redisDb.StringSetAsync(currKey, rawData, getRandTOut(redisLongTimeCache / 5)); } if (result == null) { @@ -859,7 +859,7 @@ namespace MP.SPEC.Data activity?.SetTag("data.source", source); activity?.SetTag("result.count", result.Count); activity?.Stop(); - LogTrace($"DossiersGetLastFilt | Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); + LogTrace($"DossiersGetLastFiltAsync | Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); return result; } @@ -2771,7 +2771,7 @@ namespace MP.SPEC.Data { using var activity = ActivitySource.StartActivity("StatOdl"); string source = "DB"; - var result= dbController.OdlStart(IdxOdl); + var result = dbController.OdlStart(IdxOdl); activity?.SetTag("data.source", source); activity?.Stop(); LogTrace($"StatOdl | {source} | {activity?.Duration.TotalMilliseconds}ms"); diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 512d9d23..5b1eda41 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2602.2509 + 6.16.2602.2510 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor index 5bbd452b..202c48f5 100644 --- a/MP.SPEC/Pages/DOSS.razor +++ b/MP.SPEC/Pages/DOSS.razor @@ -14,7 +14,6 @@ } else { - } diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 4498e7be..d0b18b50 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2602.2509

+

Versione: 6.16.2602.2510


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index bfb69c16..ce979628 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2602.2509 +6.16.2602.2510 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 122756be..c27a75d0 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2602.2509 + 6.16.2602.2510 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false