Egalware/lux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages update

Browse Source 
Update gestione generazione fabbisogni a livello di ordine
update metodo API x recupero filtrato x CodGroup
This commit is contained in:
Samuele Locatelli
2026-04-30 11:50:24 +02:00
parent 8525d81201
commit 0e7e0aaed0
12 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Directory.Packages.props
+1 -1
View File
@@ -40,7 +40,7 @@
<PackageVersion Include="NLog.Web.AspNetCore" Version="6.1.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.15.0-beta.1" />
EgwCoreLib.Lux.Data/Services/Warehouse/MatReqService.cs
+1 -1
View File
@@ -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;
Lux.API/Controllers/ReportController.cs
+6 -1
View File
@@ -100,14 +100,19 @@ namespace Lux.API.Controllers
/// GET: api/report/matreq-sale-ord/45
/// </summary>
/// <param name="id">id univoco</param>
/// <param name="codGroup">codGruppo per selezionare solo un tpo di item</param>
/// <returns></returns>
[HttpGet("matreq-sale-ord/{id}")]
public async Task<IActionResult> MatReqSaleOrder(int id)
public async Task<IActionResult> 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");
Lux.API/Lux.API.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2604.2818</Version>
<Version>1.1.2604.3011</Version>
</PropertyGroup>
<ItemGroup>
Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor
+4 -4
View File
@@ -4,7 +4,7 @@
}
else
{
<div class="card">
<div class="card mb-1">
<div class="card-header bg-info bg-gradient bg-opacity-25 py-1 px-2">
<div @onclick="() => ToggleGruppo()" style="cursor: pointer;">
<div class="row w-100 g-1 align-items-center">
@@ -28,17 +28,17 @@ else
</div>
</div>
<div class="row w-100 g-1 mt-1 align-items-center">
<div class="ps-3 input-group input-group-sm text-start">
<div class="col ps-3 pe-0 input-group input-group-sm text-start">
@if (descriptEdit)
{
<button class="btn btn-sm btn-primary" @onclick:stopPropagation="true" @onclick="() => SaveEditDescript(CurrRec)"><i class="fa-solid fa-floppy-disk"></i></button>
<input type="text" class="form-control bg-info bg-gradient bg-opacity-25 fs-6" @onclick:stopPropagation="true" @bind="@CurrRec.Description">
<input type="text" class="form-control fs-6" @onclick:stopPropagation="true" @bind="@CurrRec.Description">
<button class="btn btn-sm btn-warning" @onclick:stopPropagation="true" @onclick="CancelEditDescript"><i class="fa-solid fa-ban"></i></button>
}
else
{
<div class="form-control bg-info bg-gradient bg-opacity-25 fs-6">@CurrRec.Description</div>
<button class="btn btn-sm btn-primary" @onclick:stopPropagation="true" @onclick="SetEditDescript"><i class="fa-solid fa-pen"></i></button>
<button class="btn btn-sm btn-primary" @onclick:stopPropagation="true" @onclick="SetEditDescript"><i class="fa-solid fa-pen"></i></button>
}
</div>
</div>
Lux.UI/Components/Layout/NavMenu.razor
+1 -1
View File
@@ -40,7 +40,7 @@
@if (showText)
{
<span>Articoli</span>
<i class="fa-solid fa-chevron-@(isArticoliOpen ? "down" : "left") small px-2"></i>
<i class="fa-solid fa-chevron-@(isArticoliOpen ? "up" : "down") small px-2"></i>
}
</div>
</div>
Lux.UI/Components/Pages/Orders.razor
+2 -2
View File
@@ -271,13 +271,13 @@ else
</div>
@if(item.AllRowsWithReq)
{
<button class="btn btn-sm btn-success mx-1" title="Fabbisogni generati">
<button class="btn btn-sm btn-outline-success mx-1" title="Fabbisogni generati">
<i class="fa-solid fa-basket-shopping"></i>
</button>
}
else
{
<button class="btn btn-sm btn-warning mx-1" title="Genera fabbisogni">
<button class="btn btn-sm btn-warning mx-1" title="Genera Fabbisogni mancanti" @onclick="()=>DoGenFabbisogni(item)">
<i class="fa-solid fa-basket-shopping"></i>
</button>
}
Lux.UI/Components/Pages/Orders.razor.cs
+19
View File
@@ -101,6 +101,25 @@ namespace Lux.UI.Components.Pages
EditRecord = curRec;
}
private async Task DoGenFabbisogni(OrderModel curRec)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi di voler generare i fabbisogni per tutte le righe mancanti?"))
return;
isLoading = true;
await InvokeAsync(StateHasChanged);
// chiamo procedura creazione fabbisogni...
List<OrderRowModel> 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;
Lux.UI/Lux.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
<Version>1.1.2604.2818</Version>
<Version>1.1.2604.3011</Version>
</PropertyGroup>
<ItemGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>LUX - Web Windows MES</i>
<h4>Versione: 1.1.2604.2818</h4>
<h4>Versione: 1.1.2604.3011</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2604.2818
1.1.2604.3011
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2604.2818</version>
<version>1.1.2604.3011</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>