diff --git a/Directory.Packages.props b/Directory.Packages.props index ceaa51a..21bec67 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -40,7 +40,7 @@ - + diff --git a/EgwCoreLib.Lux.Data/Services/Warehouse/MatReqService.cs b/EgwCoreLib.Lux.Data/Services/Warehouse/MatReqService.cs index 1738981..e7e3831 100644 --- a/EgwCoreLib.Lux.Data/Services/Warehouse/MatReqService.cs +++ b/EgwCoreLib.Lux.Data/Services/Warehouse/MatReqService.cs @@ -75,7 +75,6 @@ listaSpesa.AddRange(newReq); } - //bool success = await _repo.AddManyAsync(listaSpesa); bool success = await _repo.UpsertManyAsync(listaSpesa); activity?.SetTag("db.operation", "ReconcileOrderRowsAsync"); @@ -83,6 +82,7 @@ if (success) { await ClearCacheAsync($"{_redisBaseKey}:{_className}:*"); + await ClearCacheAsync($"{_redisBaseKey}:Order:*"); } return success; diff --git a/Lux.API/Controllers/ReportController.cs b/Lux.API/Controllers/ReportController.cs index e11d8bb..e131d8b 100644 --- a/Lux.API/Controllers/ReportController.cs +++ b/Lux.API/Controllers/ReportController.cs @@ -100,14 +100,19 @@ namespace Lux.API.Controllers /// GET: api/report/matreq-sale-ord/45 /// /// id univoco + /// codGruppo per selezionare solo un tpo di item /// [HttpGet("matreq-sale-ord/{id}")] - public async Task MatReqSaleOrder(int id) + public async Task MatReqSaleOrder(int id, string codGroup = "") { Stopwatch sw = new Stopwatch(); sw.Start(); // recupera dal DB l'offerta con le righe relative var ordData = await _mrService.GetByOrderAsync(id); + if (!string.IsNullOrWhiteSpace(codGroup)) + { + ordData = ordData.Where(x => x.CodGroup.Equals(codGroup, StringComparison.InvariantCultureIgnoreCase)).ToList(); + } sw.Stop(); Log.Debug($"MatReqSaleOrder | {id} | {sw.Elapsed.TotalMilliseconds:N3} ms"); diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 4a57277..2d0387c 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2604.2818 + 1.1.2604.3011 diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor index 6801127..be6f122 100644 --- a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor +++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor @@ -4,7 +4,7 @@ } else { -
+
@@ -28,17 +28,17 @@ else
-
+
@if (descriptEdit) { - + } else {
@CurrRec.Description
- + }
diff --git a/Lux.UI/Components/Layout/NavMenu.razor b/Lux.UI/Components/Layout/NavMenu.razor index 7342597..03cac82 100644 --- a/Lux.UI/Components/Layout/NavMenu.razor +++ b/Lux.UI/Components/Layout/NavMenu.razor @@ -40,7 +40,7 @@ @if (showText) { Articoli - + }
diff --git a/Lux.UI/Components/Pages/Orders.razor b/Lux.UI/Components/Pages/Orders.razor index 92a790f..4f7b3f8 100644 --- a/Lux.UI/Components/Pages/Orders.razor +++ b/Lux.UI/Components/Pages/Orders.razor @@ -271,13 +271,13 @@ else
@if(item.AllRowsWithReq) { - } else { - } diff --git a/Lux.UI/Components/Pages/Orders.razor.cs b/Lux.UI/Components/Pages/Orders.razor.cs index e50ce71..2d25a52 100644 --- a/Lux.UI/Components/Pages/Orders.razor.cs +++ b/Lux.UI/Components/Pages/Orders.razor.cs @@ -101,6 +101,25 @@ namespace Lux.UI.Components.Pages EditRecord = curRec; } + private async Task DoGenFabbisogni(OrderModel curRec) + { + + if (!await JSRuntime.InvokeAsync("confirm", $"Confermi di voler generare i fabbisogni per tutte le righe mancanti?")) + return; + + isLoading = true; + await InvokeAsync(StateHasChanged); + // chiamo procedura creazione fabbisogni... + List listReq = curRec.OrderRowNav.ToList(); + await MRService.ReconcileOrderRowsAsync(listReq); + await ReloadDataAsync(); + UpdateTable(); + isLoading = false; + } + + [Inject] + private IMatReqService MRService { get; set; } = null!; + private void DoReset() { EditRecord = null; diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index d9579d8..06be574 100644 --- a/Lux.UI/Lux.UI.csproj +++ b/Lux.UI/Lux.UI.csproj @@ -5,7 +5,7 @@ enable enable aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50 - 1.1.2604.2818 + 1.1.2604.3011 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index ce10aac..01bf1d6 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2604.2818

+

Versione: 1.1.2604.3011


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 003dd3f..48f7ae9 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2604.2818 +1.1.2604.3011 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 4a824d5..9878d49 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2604.2818 + 1.1.2604.3011 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false