diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 36d0edfd..ca90649c 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2605.2915 + 1.1.2605.2916 diff --git a/Lux.UI/Components/Compo/Planner/EstPorDetail.razor b/Lux.UI/Components/Compo/Planner/EstPorDetail.razor index 5d001fe3..a4bbf3c2 100644 --- a/Lux.UI/Components/Compo/Planner/EstPorDetail.razor +++ b/Lux.UI/Components/Compo/Planner/EstPorDetail.razor @@ -1,6 +1,7 @@ @using EgwCoreLib.Lux.Data.DbModel.Sales +@using WebWindowComplex.Compo - *@ + +
+
+
+
@CurrPOR.OrderRowUID
+
+ @if (balEnabled) + { + + } + else + { + + } +
+
+
+ @if (ShowDetail) + { +
+
+
@CurrPOR.ProdItemQtyTot Parts
+
Time @FormatEstTime(CurrPOR.ProdEstimTime)
+
+
+ } +
+ @code { [Parameter] diff --git a/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor.cs b/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor.cs index 2a559a97..77ebb818 100644 --- a/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor.cs +++ b/Lux.UI/Components/Compo/Planner/WLB_Estimated.razor.cs @@ -9,6 +9,8 @@ namespace Lux.UI.Components.Compo.Planner [Parameter] public EventCallback EC_DoBalance { get; set; } + [Parameter] + public EventCallback EC_DoBalanceAll { get; set; } private bool showDetail = false; @@ -23,32 +25,9 @@ namespace Lux.UI.Components.Compo.Planner private BootstrapModal.ModalMode mMode = BootstrapModal.ModalMode.ND; private Dictionary modalOpt = new Dictionary(); - private async Task SendAllAsync() + private Task SendAllAsync() { - if (AllRecords != null && AllRecords.Count > 0) - { - mTitle = "Attenzione"; - mMessage = $"Sicuro di voler processare tutti e {AllRecords.Count} gli ordini?\n "; - //if (string.IsNullOrEmpty(selRec.CompanyName)) - //{ - // mMessage = mMessage + $"Dettagli: {selRec.FirstName} | {selRec.LastName} | {selRec.VAT}"; - //} - //else - //{ - // mMessage = mMessage + $"Dettagli: {selRec.CompanyName} | {selRec.VAT}"; - //} - mMode = BootstrapModal.ModalMode.Confirm; - modalOpt = new(); - modalOpt.Add(true, "Si"); - modalOpt.Add(false, "No"); - if (!await Modal!.ShowAsync()) - return; - - foreach (var item in AllRecords) - { - await EC_DoBalance.InvokeAsync(item.OrderID); - } - } + return EC_DoBalanceAll.InvokeAsync(false); } private Task DoBalance(int OrderRowID) diff --git a/Lux.UI/Components/Pages/WorkLoadBalance.razor b/Lux.UI/Components/Pages/WorkLoadBalance.razor index 5f2a9289..226ae540 100644 --- a/Lux.UI/Components/Pages/WorkLoadBalance.razor +++ b/Lux.UI/Components/Pages/WorkLoadBalance.razor @@ -30,7 +30,7 @@
- +
@if (ListBalancedRecords == null || ListBalancedRecords.Count == 0) diff --git a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs index 9811f791..a79993cc 100644 --- a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs +++ b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs @@ -79,7 +79,7 @@ namespace Lux.UI.Components.Pages { var listEnum = Enum.GetNames(typeof(EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS)) .ToList(); - if(listEnum.Count > 0) + if (listEnum.Count > 0) { listEnum[0] = "TUTTI"; } @@ -147,6 +147,33 @@ namespace Lux.UI.Components.Pages if (!await Modal!.ShowAsync()) return; + await SendOrderBalanceReq(OrderRowID); + } + + private async Task DoBalanceAll(bool doForce) + { + if (ListEstimRecords != null && ListEstimRecords.Count > 0) + { + if (!doForce) + { + mTitle = "Attenzione"; + mMessage = $"Sicuro di voler processare tutti e {ListEstimRecords.Count} gli ordini?\n "; + mMode = BootstrapModal.ModalMode.Confirm; + modalOpt = new(); + modalOpt.Add(true, "Si"); + modalOpt.Add(false, "No"); + if (!await Modal!.ShowAsync()) + return; + } + foreach (var item in ListEstimRecords) + { + await SendOrderBalanceReq(item.OrderRowID); + } + } + } + + private async Task SendOrderBalanceReq(int OrderRowID) + { // verifico se mancassero le righe di ProdGroup e rigenero... List listProgGroup = ListBalancedRecords?.Where(x => x.OrderRowID == OrderRowID).ToList() ?? new(); // se nullo... @@ -630,7 +657,7 @@ namespace Lux.UI.Components.Pages throw new global::System.NotImplementedException(); } #endif - } + } #endregion Private Methods } diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 8b5135de..23128a62 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.2605.2915 + 1.1.2605.2916 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 59ef2111..80b6959d 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2605.2915

+

Versione: 1.1.2605.2916


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 734af6b5..c4ee575b 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2605.2915 +1.1.2605.2916 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 091048af..3174e6ac 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2605.2915 + 1.1.2605.2916 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false