diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 8961479b..3613e06b 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2601.1318 + 0.9.2601.1411 diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs index 6b1afd06..06ebee7d 100644 --- a/Lux.API/Services/ExternalMessageProcessor.cs +++ b/Lux.API/Services/ExternalMessageProcessor.cs @@ -179,7 +179,7 @@ namespace Lux.API.Services // gestione ritorno tipo Balance dei gruppi di lavorazione (x carico macchine/schedulazione) if (retData.Args.ContainsKey("Balance")) { - // ATTENZIONE! qui oltre al valore UID deve leggere ANCHE il gruppo cui è riferito (es: Group: G01) + // ATTENZIONE! qui oltre al valore UID deve leggere ANCHE il gruppo cui è riferito (es: Group: 1) // recupero lista risultati calcolo... string refGroup = retData.Args["Group"]; string rawBalance = retData.Args["Balance"]; diff --git a/Lux.UI/Components/Compo/Planner/EstPorDetail.razor b/Lux.UI/Components/Compo/Planner/EstPorDetail.razor index f5a5cb47..d157fd16 100644 --- a/Lux.UI/Components/Compo/Planner/EstPorDetail.razor +++ b/Lux.UI/Components/Compo/Planner/EstPorDetail.razor @@ -5,6 +5,10 @@
@CurrPOR.OrderRowUID | @CurrPOR.ProdItemQtyTot
+
  • +
    @CurrPOR.ProdItemQtyTot Parts
    +
    WorkTime @CurrPOR.ProdItemQtyTot
    +
  • @*
  • Saomad
    diff --git a/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor b/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor index 188f091d..a665e957 100644 --- a/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor +++ b/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor @@ -7,7 +7,7 @@ else { if (AllRecords.Count == 0) { -
    Nessun Ordine Da bilanciare
    +
    Nessun Ordine da Bilanciare
    } else { diff --git a/Lux.UI/Components/Pages/WorkLoadBalance.razor b/Lux.UI/Components/Pages/WorkLoadBalance.razor index ae211e64..18059f6c 100644 --- a/Lux.UI/Components/Pages/WorkLoadBalance.razor +++ b/Lux.UI/Components/Pages/WorkLoadBalance.razor @@ -13,10 +13,17 @@
    - +
    - + @if (ListBalancedRecords == null || ListBalancedRecords.Count == 0) + { +
    Nessun Order Balance Attivo
    + } + else + { + + }
    diff --git a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs index 4ab3b143..71271dff 100644 --- a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs +++ b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs @@ -66,8 +66,8 @@ namespace Lux.UI.Components.Pages private async Task ReloadData() { // prendo solo ordini stimati (NON ancora bilanciati o pianificati) - ListEstimRecords = await DLService.OrderRowGetByState(OrderStates.Estimated); - ListBalancedRecords = await DLService.ProdGroupByOrderState(OrderStates.Estimated); + ListEstimRecords = await DLService.OrderRowGetByStateMin(OrderStates.Estimated, PeriodoSel.Inizio, PeriodoSel.Fine); + ListBalancedRecords = await DLService.ProdGroupByOrderState(OrderStates.Assigned); } private async Task DoBalance(int OrderRowID) diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index b34d8183..239428e4 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 - 0.9.2601.1318 + 0.9.2601.1411 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 5d3275e5..b4c36cf2 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

    Versione: 0.9.2601.1318

    +

    Versione: 0.9.2601.1411


    Note di rilascio:
    • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 4295b4f7..547fcdc8 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2601.1318 +0.9.2601.1411 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 659366b5..8c1a878b 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2601.1318 + 0.9.2601.1411 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false