diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj index e60189cf..a74b52ec 100644 --- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj +++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs index 6eaf554c..91bca091 100644 --- a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs +++ b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs @@ -3031,6 +3031,10 @@ namespace EgwCoreLib.Lux.Data.Controllers if (currRec != null) { currRec.ProdEstimate = prodEstim; + if (!string.IsNullOrEmpty(prodEstim) && currRec.OrderRowState == OrderStates.Created) + { + currRec.OrderRowState = OrderStates.Estimated; + } dbCtx.Entry(currRec).State = EntityState.Modified; // genero WLD x controllo var currWLD = new WorkLoadDetailDTO(currRec.OrderRowUID, currRec.ProdEstimate); diff --git a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj index b0a81288..caf99854 100644 --- a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj +++ b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj @@ -27,7 +27,7 @@ - + diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 346a1afc..294562a0 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2512.2310 + 0.9.2512.2312 diff --git a/Lux.UI.Client/Lux.UI.Client.csproj b/Lux.UI.Client/Lux.UI.Client.csproj index 440f903d..b47e51af 100644 --- a/Lux.UI.Client/Lux.UI.Client.csproj +++ b/Lux.UI.Client/Lux.UI.Client.csproj @@ -9,7 +9,7 @@ - + diff --git a/Lux.UI/Components/Compo/OrderRowMan.razor b/Lux.UI/Components/Compo/OrderRowMan.razor index 59fe6236..bfef4fb8 100644 --- a/Lux.UI/Components/Compo/OrderRowMan.razor +++ b/Lux.UI/Components/Compo/OrderRowMan.razor @@ -454,7 +454,7 @@ else if (WorkLoadRecord != null) { if (CurrEditMode == EditMode.WorkLoadDetailTime) { - - } - else if (CurrEditMode == EditMode.WorkLoadDetailTag) - { - - - @* *@ + + } + else if (CurrEditMode == EditMode.WorkLoadDetailTag) + { + } @* else if (CurrEditMode == EditMode.DetailOkVin) { diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor index f8adb019..b3f025c0 100644 --- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor @@ -1,5 +1,106 @@ -

TimeEstim

+ -@code { -} diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs new file mode 100644 index 00000000..2c17a5d0 --- /dev/null +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs @@ -0,0 +1,55 @@ +using EgwCoreLib.Lux.Core.RestPayload; +using Microsoft.AspNetCore.Components; + +namespace Lux.UI.Components.Compo.WorkLoad +{ + public partial class TimeEstim + { + #region Public Properties + + [Parameter] + public WorkLoadDetailDTO DetailRecord { get; set; } = null!; + + [Parameter] + public EventCallback EC_ClosePopup { get; set; } + + [Parameter] + public EventCallback EC_ReRunReq { get; set; } + + [Parameter] + public EventCallback EC_RunBalance { get; set; } + + #endregion Public Properties + + #region Public Classes + + /// + /// Definizione richiesta di bilanciamento per il calcolo + /// + public class BalanceReq + { + #region Public Properties + + public Dictionary MachineBalance { get; set; } = new Dictionary(); + public List TagsList { get; set; } = new List(); + + #endregion Public Properties + } + + #endregion Public Classes + + #region Protected Methods + + protected async Task ClosePopup() + { + await EC_ClosePopup.InvokeAsync(true); + } + + protected async Task ReRunJob() + { + await EC_ReRunReq.InvokeAsync(true); + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 8346d61d..9f476827 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.2512.2310 + 0.9.2512.2312 @@ -17,7 +17,7 @@ - + diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 5fea9f2a..da7282a5 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 0.9.2512.2310

+

Versione: 0.9.2512.2312


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index afedc8ad..db4ff637 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2512.2310 +0.9.2512.2312 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index be2ab775..aba1c5ec 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2512.2310 + 0.9.2512.2312 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false