From f0fcf5cafe1dd2fb87bc63fefd3022bafe6d5273 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Fri, 26 Jun 2026 17:04:26 +0200 Subject: [PATCH] Modificata modale stima tempi --- Lux.API/Lux.API.csproj | 2 +- .../Components/Compo/WorkLoad/TimeEstim.razor | 500 +++++++----------- Lux.UI/Lux.UI.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 6 files changed, 197 insertions(+), 313 deletions(-) diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index b4cce400..5fe1e51c 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2606.2615 + 1.1.2606.2617 diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor index 7e8363f6..e84f951b 100644 --- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor @@ -19,154 +19,146 @@ @DetailRecord.ListMachinesJoin
-
-
-
- @if (CurrMode == SetMode.Balance) - { -
-
-
- Lungh.Barre - - mm -
-
-
-
- @if (AllProdGroup != null && AllProdGroup.Count > 0) - { - foreach (var item in AllProdGroup) - { - if (false) - { - @* @item.ProdPlantCod - *@ - } - else - { - @item.PlantListJoin - - } - } - } -
-
-
- @if (checkSend) - { - - } - else - { - - } + @if (CurrMode == SetMode.Balance) + { +
+
+
+
+ Lungh.Barre + + mm
- } - else if (CurrMode == SetMode.AssignOk) - { -
-
-
- Lungh.Barre - - mm -
-
-
-
- @if (AllProdGroup != null && AllProdGroup.Count > 0) +
+
+
+ @if (AllProdGroup != null && AllProdGroup.Count > 0) + { +
+ @foreach (var item in AllProdGroup) { - foreach (var item in AllProdGroup) - { - if (false) - { - @* @item.ProdPlantCod - *@ - } - else - { - @item.PlantListJoin - - } - } +
+ @item.PlantListJoin + +
}
-
-
- @if (checkSend) - { - - } - else - { - - } -
+ }
- } +
+ @if (checkSend) + { + + } + else + { + + } +
+
-
-
-
- @if (DetailRecord.NumKo > 0) - { -
-
+ } + else if (CurrMode == SetMode.AssignOk) + { +
+
+
+
+ Lungh.Barre + + mm +
+
+
+
+
+ @if (AllProdGroup != null && AllProdGroup.Count > 0) + { +
+ @foreach (var item in AllProdGroup) + { +
+ @item.PlantListJoin + +
+ } +
+ } +
+
+ @if (checkSend) + { + + } + else + { + + } +
+
+
+ } +
+ @if (DetailRecord.NumKo > 0) + { +
+
+
Non producibili: @DetailRecord.NumKo
- } - @if (DetailRecord.NumOkVin > 0) - { -
-
-
-
Vincolati: @DetailRecord.NumOkVin
-
- -
+
+ } + @if (DetailRecord.NumOkVin > 0) + { +
+
+
+
Vincolati: @DetailRecord.NumOkVin
+
+
-
- - - - - - - - - - - @if (AllProdGroup != null && AllProdGroup.Count > 0) + +
+
- - - Impianti - - # Parts - - Time -
+ + + + + + + + + + @if (AllProdGroup != null && AllProdGroup.Count > 0) + { + @foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOkVin)) { - @foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOkVin)) + foreach (var wld in item.WorkGroupList) { + - } } - else - { - - - - } - -
+ + + Impianti + + # Parts + + Time +
- - - @item.PlantListJoin + @wld.Key @NumParts(item) @@ -177,201 +169,93 @@
Nessun record trovato!
-
-
- } - @if (DetailRecord.NumOk > 0) - { -
-
-
Producibili ovunque: @DetailRecord.NumOk
-
- -
-
-
- - + } + else + { - - - - - + - - - @if (AllProdGroup != null && AllProdGroup.Count > 0) - { - @foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOk)) - { - foreach (var wld in item.WorkGroupList) - { - - - - - - - - } - } - } - else - { - - - - } - -
- - - Impianti - - Time - - # Parts - - Max Time - Nessun record trovato!
- - - @* @item.PlantListJoin *@ - @wld.Key - -
@DisplayDurata(wld.Value.Time)
- 		- @NumParts(item) - - @DisplayDurata(item) -
Nessun record trovato!
-
+ } + +
- } -
-
-
-
- -
-
- @*
-
    - @if (DetailRecord.NumKo > 0) - { -
  • -
    Non producibili: @DetailRecord.NumKo
    -
    - -
    -
    • - } - @if (DetailRecord.NumOkVin > 0) - { -
  • -
    Vincolati: @DetailRecord.NumOkVin
    -
    - -
    -
    • - } - @if (DetailRecord.NumOk > 0) - { -
  • +
+ } + @if (DetailRecord.NumOk > 0) + { +
+
+
Producibili ovunque: @DetailRecord.NumOk
- - } - -
-
- - - - - - - - - - - @* - @if (AllProdAss != null && AllProdAss.Count > 0) - { - @foreach (var item in AllProdAss) - { + + +
+
- - - Impianti - - # Parts - - Time -
+ - + + + + + + + + @if (AllProdGroup != null && AllProdGroup.Count > 0) + { + @foreach (var item in AllProdGroup.Where(x => x.NumParts == DetailRecord.NumOk)) + { + foreach (var wld in item.WorkGroupList) { - + + + + + + + } - - - - - - } - } - @if (AllProdGroup != null && AllProdGroup.Count > 0) - { - @foreach (var item in AllProdGroup) - { - - - - - - } - } - else - { - - - - } - - - - - - -
- @if (CurrMode == SetMode.AssignUnwork && item.ProdPlantCod.Contains("EXT")) + + + + Impianti + + Time + + # Parts + + Max Time +
+ @wld.Key + +
@DisplayDurata(wld.Value.Time)
+ 		+ @NumParts(item) + + @DisplayDurata(item) +
- @item.ProdPlantCod - - @item.NumParts / @($"{NumPartRatio(item.NumParts):P1}") - - @item.TotalEstimTime / @($"{TotMaxTimeRatio(item.TotalEstimTime):P1}") -
- @item.PlantListJoin - - @NumParts(item) - - @DisplayDurata(item) -
Nessun record trovato!
- -
-
*@ - + } + } + else + { + + Nessun record trovato! + + } + + +
+
+ } +
+
+ + +
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 7d9fe509..fcc11fa9 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.2615 + 1.1.2606.2617 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index e706a83d..d6a3a19a 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2606.2615

+

Versione: 1.1.2606.2617


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 0402bb1e..1ba3dc67 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2606.2615 +1.1.2606.2617 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 17fbf53e..a5e9d26a 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2606.2615 + 1.1.2606.2617 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false