diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 778737f2..26d6521e 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2604.2112 + 1.1.2604.2114 diff --git a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor index cf971751..98d3a4b4 100644 --- a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor +++ b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor @@ -6,35 +6,46 @@ - - - - - + + + + + - @foreach (var item in ListRecords) + @foreach (var gruppo in AllRecordsByGroup) { - - - + - - - + + if (GruppiEspansi.Contains(gruppo.Key)) + { + foreach (var item in gruppo) + { + + + + + + + + } + } }
GruppoArticoloOrdRigaQtyGruppoArticoloOrdRigaQty
@item.CodGroup -
@item.ItemCode
-
- @if (item.ItemNav != null) - { - @item.ItemNav.Description - } - else - { - @item.ItemCode - } -
+ @* Riga Intestazione Gruppo *@ +
+ + @gruppo.Key + @gruppo.Count() @item.OrderNav?.OrderCode@item.OrderRowNav?.OrderRowCode@item.TotQty.ToString("N1")
@item.CodGroup +
@item.ItemCode
+
+ @if (item.ItemNav != null) + { + @item.ItemNav.Description + } +
+
@item.OrderNav?.OrderCode@item.OrderRowNav?.OrderRowCode@item.TotQty.ToString("N1")
diff --git a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs index f3af8038..e0553228 100644 --- a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs +++ b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs @@ -1,4 +1,7 @@ using EgwCoreLib.Lux.Data.DbModel.Warehouse; +using System; +using System.Collections.Generic; +using System.Xml.Linq; namespace Lux.UI.Components.Compo.Warehouse { @@ -17,6 +20,9 @@ namespace Lux.UI.Components.Compo.Warehouse #region Private Fields + // Memorizza i nomi dei gruppi attualmente visibili + private List GruppiEspansi = new List(); + private List AllRecords = new List(); private int currPage = 1; @@ -36,10 +42,26 @@ namespace Lux.UI.Components.Compo.Warehouse [Inject] private IMatReqService MRService { get; set; } = null!; + // Questa proprietą restituirą i dati raggruppati + private IEnumerable> AllRecordsByGroup => + AllRecords.GroupBy(x => x.CodGroup); + #endregion Private Properties #region Private Methods + private void ToggleGruppo(string nomeGruppo) + { + if (GruppiEspansi.Contains(nomeGruppo)) + { + GruppiEspansi.Remove(nomeGruppo); + } + else + { + GruppiEspansi.Add(nomeGruppo); + } + } + private async Task ReloadDataAsync() { AllRecords = await MRService.GetUnprocAsync(); diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index ba2c8d85..b6c08b65 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.2112 + 1.1.2604.2114 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index f3675a79..14990ceb 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2604.2112

+

Versione: 1.1.2604.2114


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 1dc58d56..2cc5ce67 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2604.2112 +1.1.2604.2114 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 68ab9ee7..24b1ef13 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2604.2112 + 1.1.2604.2114 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false