diff --git a/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs b/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs index 52872131..8d6ed467 100644 --- a/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs +++ b/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs @@ -156,7 +156,7 @@ else { if (LoadDetail != null && LoadDetail.Count > 0) - ans = LoadDetail.Max(x => x.MaxTime); + ans = LoadDetail.Sum(x => x.MaxTime); else ans = 0; } diff --git a/EgwCoreLib.Lux.Data/DbModel/Production/ProductionGroupModel.cs b/EgwCoreLib.Lux.Data/DbModel/Production/ProductionGroupModel.cs index 9695e82f..13b29bad 100644 --- a/EgwCoreLib.Lux.Data/DbModel/Production/ProductionGroupModel.cs +++ b/EgwCoreLib.Lux.Data/DbModel/Production/ProductionGroupModel.cs @@ -76,7 +76,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Production /// Num parts complessivamente incluse /// [NotMapped] - public int NumParts => WorkGroupList?.Sum(x => x.Value.NumParts) ?? 0; + public int NumParts => WorkGroupList?.Max(x => x.Value.NumParts) ?? 0; /// /// Tempo stimato complessivo diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 835f8423..cc71069c 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2606.2517 + 1.1.2606.2614 diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor index 33fffbb6..b4f688b3 100644 --- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor @@ -114,8 +114,147 @@ } -
-
+
+
+ @if (DetailRecord.NumKo > 0) + { +
+
+
Non producibili: @DetailRecord.NumKo
+
+ +
+
+
+ } + @if (DetailRecord.NumOkVin > 0) + { +
+
+
+
Vincolati: @DetailRecord.NumOkVin
+
+ +
+
+
+
+ + + + + + + + + + + @if (AllProdGroup != null && AllProdGroup.Count > 0) + { + @foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOkVin)) + { + + + + + + + } + } + else + { + + + + } + +
+ + + Impianti + + # Parts + + Time +
+ + + @item.PlantListJoin + + @NumParts(item) + + @DisplayDurata(item) +
Nessun record trovato!
+
+
+ } + @if (DetailRecord.NumOk > 0) + { +
+
+
Producibili ovunque: @DetailRecord.NumOk
+
+ +
+
+
+ + + + + + + + + + + @if (AllProdGroup != null && AllProdGroup.Count > 0) + { + @foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOk)) + { + + + + + + + } + } + else + { + + + + } + +
+ + + Impianti + + # Parts + + Time +
+ + + @item.PlantListJoin + + @NumParts(item) + + @DisplayDurata(item) +
Nessun record trovato!
+
+
+ } +
+
+
+
+ +
+
+ @*
    @if (DetailRecord.NumKo > 0) { @@ -188,29 +327,20 @@ } - } *@ + } @if (AllProdGroup != null && AllProdGroup.Count > 0) { @foreach (var item in AllProdGroup) { - - @* @if (CurrMode == SetMode.AssignUnwork && item.ProdPlantCod.Contains("EXT")) - { - - } *@ - - @item.PlantListJoin @NumParts(item) - @* @item.NumParts / @($"{NumPartRatio(item.NumParts):P1}") *@ @DisplayDurata(item) - @* @DisplayDurata(item) / @($"{TotMaxTimeRatio(item.TotalEstimTime):P1}") *@ } @@ -230,8 +360,8 @@ -
-
+
*@ + diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 2ad419a5..02c1b81e 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.2606.2517 + 1.1.2606.2614 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 89b12763..fc3c93fe 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2606.2517

+

Versione: 1.1.2606.2614


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 24150892..c8f6dc02 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2606.2517 +1.1.2606.2614 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index a5d9326a..9da002a2 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2606.2517 + 1.1.2606.2614 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false