diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index c59df2dd..0ff03486 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2607.0308 + 1.1.2607.0310 diff --git a/Lux.UI/Components/Compo/Order/OrderRowMan.razor b/Lux.UI/Components/Compo/Order/OrderRowMan.razor index 1b4e541e..2705769b 100644 --- a/Lux.UI/Components/Compo/Order/OrderRowMan.razor +++ b/Lux.UI/Components/Compo/Order/OrderRowMan.razor @@ -546,12 +546,11 @@ else if (WorkLoadRecord != null) { if (CurrEditMode == EditMode.WorkLoadDetailTime) { - @**@ } else if (CurrEditMode == EditMode.WorkLoadDetailTag) { - + } @* else if (CurrEditMode == EditMode.DetailOkVin) { diff --git a/Lux.UI/Components/Compo/WorkLoad/AssegnaBilancia.razor b/Lux.UI/Components/Compo/WorkLoad/AssegnaBilancia.razor index 8e0e95d4..742cd8e1 100644 --- a/Lux.UI/Components/Compo/WorkLoad/AssegnaBilancia.razor +++ b/Lux.UI/Components/Compo/WorkLoad/AssegnaBilancia.razor @@ -7,18 +7,19 @@ mm -
- @if (BalanceReq.MachineBalance != null && BalanceReq.MachineBalance.Count == 1) + @if (BalanceReq.MachineBalance != null && BalanceReq.MachineBalance.Count == 1) + { + @foreach (var item in BalanceReq.MachineBalance) { -
- @foreach (var item in BalanceReq.MachineBalance) - { - - } -
+ } -
-
+ } + else + { +
+
+ } +
@if (Mode == TimeEstim.SetMode.Balance) { @if (checkSend) @@ -46,14 +47,10 @@ @if (BalanceReq.MachineBalance != null && BalanceReq.MachineBalance.Count > 1) {
-
-
- @foreach (var item in BalanceReq.MachineBalance) - { - - } -
-
+ @foreach (var item in BalanceReq.MachineBalance) + { + + }
}
\ No newline at end of file diff --git a/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor b/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor index 373f28c8..66bd9fb2 100644 --- a/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor +++ b/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor @@ -5,7 +5,7 @@
Dettaglio Workload - @if (DetailRecord.Workable) + @if (DetailRecord != null && DetailRecord.Workable) { } @@ -15,19 +15,102 @@ }
-
Impianti considerati
- @DetailRecord.ListMachinesJoin +
+ Impianti considerati: + @(DetailRecord?.ListMachinesJoin ?? "") +
+
+ Riga ordine: + @MergeOrderRow.Original.OrderRowCode +
- +
} - + *@ diff --git a/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor.cs b/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor.cs index e775a234..3e7369d2 100644 --- a/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor.cs +++ b/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor.cs @@ -1,3 +1,5 @@ +using static Lux.UI.Components.Compo.Order.OrderRowMan; + namespace Lux.UI.Components.Compo.WorkLoad { public partial class PartStatus @@ -5,7 +7,7 @@ namespace Lux.UI.Components.Compo.WorkLoad #region Public Properties [Parameter] - public WorkLoadDetailDTO DetailRecord { get; set; } = null!; + public MergedOrderRow MergeOrderRow { get; set; } = null!; [Parameter] public EventCallback EC_ClosePopup { get; set; } @@ -17,6 +19,14 @@ namespace Lux.UI.Components.Compo.WorkLoad #region Protected Methods + protected override void OnParametersSet() + { + if(MergeOrderRow.WorkLoad != null) + { + DetailRecord = MergeOrderRow.WorkLoad; + } + } + protected Task ClosePopup() { return EC_ClosePopup.InvokeAsync(true); @@ -27,6 +37,35 @@ namespace Lux.UI.Components.Compo.WorkLoad return EC_ReRunReq.InvokeAsync(true); } + private WorkLoadDetailDTO? DetailRecord = null; + private bool showUnwork = false; + private bool showVinc = false; + private bool showWork = false; + + private enum TypeGroup + { + Unwork, + Vincolate, + Work + } + + private void ToggleGroup(TypeGroup mode) + { + switch(mode) + { + case TypeGroup.Unwork: + showUnwork = !showUnwork; + break; + case TypeGroup.Vincolate: + showVinc = !showVinc; + break; + case TypeGroup.Work: + showWork = !showWork; + break; + } + } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/WorkLoad/RawPartSelector.razor b/Lux.UI/Components/Compo/WorkLoad/RawPartSelector.razor index 0936d0e0..180216c7 100644 --- a/Lux.UI/Components/Compo/WorkLoad/RawPartSelector.razor +++ b/Lux.UI/Components/Compo/WorkLoad/RawPartSelector.razor @@ -1,27 +1,25 @@