diff --git a/EgwCoreLib.Lux.Core/Generic/BalanceReqDTO.cs b/EgwCoreLib.Lux.Core/Generic/BalanceReqDTO.cs index 255749e6..d1461fb0 100644 --- a/EgwCoreLib.Lux.Core/Generic/BalanceReqDTO.cs +++ b/EgwCoreLib.Lux.Core/Generic/BalanceReqDTO.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EgwCoreLib.Lux.Core.Generic +namespace EgwCoreLib.Lux.Core.Generic { /// /// Definizione richiesta di bilanciamento per il calcolo diff --git a/EgwCoreLib.Lux.Core/Generic/DirectAssignReqDto.cs b/EgwCoreLib.Lux.Core/Generic/DirectAssignReqDto.cs new file mode 100644 index 00000000..47efdba8 --- /dev/null +++ b/EgwCoreLib.Lux.Core/Generic/DirectAssignReqDto.cs @@ -0,0 +1,17 @@ +namespace EgwCoreLib.Lux.Core.Generic +{ + public class DirectAssignReqDto + { + #region Public Properties + + /// + /// Dizionario associazioni Part + estimTime + /// + public Dictionary DictPartAssign { get; set; } = new Dictionary(); + public int OrderRowID { get; set; } = 0; + public int ProdAssignID { get; set; } = 0; + public List TagsList { get; set; } = new List(); + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs b/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs index 120bdf02..2fb3a33a 100644 --- a/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs +++ b/EgwCoreLib.Lux.Core/RestPayload/WorkLoadDetailDTO.cs @@ -59,14 +59,6 @@ namespace EgwCoreLib.Lux.Core.RestPayload #region Public Properties - /// - /// Elenco Macchine in formato stringa join - /// - public string ListMachinesJoin - { - get => string.Join(", ", machineCalcResults.Select(x => x.Name).OrderBy(x => x).ToList()); - } - /// /// Elenco effettivo macchine /// @@ -75,6 +67,14 @@ namespace EgwCoreLib.Lux.Core.RestPayload get => machineCalcResults.Select(x => x.Name).OrderBy(x => x).ToList(); } + /// + /// Elenco Macchine in formato stringa join + /// + public string ListMachinesJoin + { + get => string.Join(", ", machineCalcResults.Select(x => x.Name).OrderBy(x => x).ToList()); + } + /// /// Elenco delle etichette parts non OK /// @@ -83,13 +83,6 @@ namespace EgwCoreLib.Lux.Core.RestPayload get => listUnWorkable ?? new List(); } - /// - /// Elenco etichette parts OK - /// - public List ListWorkable - { - get => listWorkable ?? new List(); - } /// /// Elenco parts vincolate (=non ogni impianto) /// @@ -98,6 +91,14 @@ namespace EgwCoreLib.Lux.Core.RestPayload get => listVincolated ?? new List(); } + /// + /// Elenco etichette parts OK + /// + public List ListWorkable + { + get => listWorkable ?? new List(); + } + /// /// Dettaglio combinazioni carico di lavoro /// @@ -140,6 +141,11 @@ namespace EgwCoreLib.Lux.Core.RestPayload get => numOkVin; } + public int NumParts + { + get => listComplete?.Count() ?? 0; + } + /// /// Tempo massimo complessivo in ORE /// @@ -173,8 +179,8 @@ namespace EgwCoreLib.Lux.Core.RestPayload private List? listComplete = null; private List? listUnWorkable = null; - private List? listWorkable = null; private List? listVincolated = null; + private List? listWorkable = null; private List machineCalcResults = new List(); private int numKo = 0; private int numOk = 0; diff --git a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs index b6536973..9d5a0daf 100644 --- a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs +++ b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs @@ -12,7 +12,6 @@ using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using NLog; using System.Globalization; -using System.Linq; using static EgwCoreLib.Lux.Core.Enums; namespace EgwCoreLib.Lux.Data.Controllers @@ -3367,6 +3366,34 @@ namespace EgwCoreLib.Lux.Data.Controllers return dbResult; } + /// + /// Reset impostazione ProdItem x ripartire senza settings + /// + /// + /// + internal async Task ProdItemResetOrderAssign(int orderRowID) + { + int numItem = 0; + //using (DataLayerContext dbCtx = new DataLayerContext(_config)) + using (DataLayerContext dbCtx = new DataLayerContext()) + { + try + { + numItem = await dbCtx.DbSetProdItem + .Where(p => p.OrderRowID == orderRowID) + .ExecuteUpdateAsync(setters => setters + .SetProperty(p => p.ProdAssignID, (int?)null) + .SetProperty(p => p.EstimTime, 0) + ); + } + catch (Exception exc) + { + Log.Error($"Eccezione durante ProdItemResetOrderAssign{Environment.NewLine}{exc}"); + } + } + return numItem; + } + internal async Task> ProdPlantGetAllAsync() { List dbResult = new List(); diff --git a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs b/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs index 65f4d16d..153062b8 100644 --- a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs +++ b/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs @@ -1609,7 +1609,7 @@ namespace EgwCoreLib.Lux.Data.Services sw.Start(); List? result = new List(); // cerco in redis... - string currKey = $"{redisBaseKey}:ProdAssign:OrdRow:{OrderRowID}"; + string currKey = $"{redisBaseKey}:ProdAssign:OrdRowId:{OrderRowID}"; RedisValue rawData = await redisDb.StringGetAsync(currKey); if (rawData.HasValue && rawData.Length() > 2) { @@ -1645,7 +1645,7 @@ namespace EgwCoreLib.Lux.Data.Services sw.Start(); List? result = new List(); // cerco in redis... - string currKey = $"{redisBaseKey}:ProdAssign:OrdRow:{OrderRowID}"; + string currKey = $"{redisBaseKey}:ProdAssign:OrdRowId:{OrderRowID}"; RedisValue rawData = await redisDb.StringGetAsync(currKey); if (rawData.HasValue && rawData.Length() > 2) { @@ -1680,7 +1680,10 @@ namespace EgwCoreLib.Lux.Data.Services // calcolo int fatto = await dbController.ProdItemBulkAssignItems(OrderRowId, ProdAssignId, itemsToAssign); // svuoto cache... - await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:ProdItems:*"); + //await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:ProdItems:*"); + await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:ProdItems:OrdRowId:*"); + await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:ProdAssign:OrdRowId:*"); + await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:OrderRows:*"); sw.Stop(); Log.Debug($"ProdItemBulkAssignItems in {sw.Elapsed.TotalMilliseconds} ms"); return fatto; @@ -1721,6 +1724,20 @@ namespace EgwCoreLib.Lux.Data.Services return result; } + /// + /// Reset assegnazioni x ProdItems dato OrderRowID + /// + /// + /// + public async Task ProdItemResetOrderAssign(int orderRowID) + { + int result = await dbController.ProdItemResetOrderAssign(orderRowID); + await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:ProdItems:OrdRowId:*"); + await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:ProdAssign:OrdRowId:*"); + await ExecFlushRedisPatternAsync((RedisValue)$"{redisBaseKey}:OrderRows:*"); + return result; + } + /// /// Elenco completo plant gestiti /// diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index f0fdef3d..f437f8f5 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2512.2415 + 0.9.2512.2417 diff --git a/Lux.UI/Components/Compo/OrderRowMan.razor b/Lux.UI/Components/Compo/OrderRowMan.razor index dac1b5ed..e9ccbe36 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) { diff --git a/Lux.UI/Components/Compo/OrderRowMan.razor.cs b/Lux.UI/Components/Compo/OrderRowMan.razor.cs index 7abc5c5f..721c71fe 100644 --- a/Lux.UI/Components/Compo/OrderRowMan.razor.cs +++ b/Lux.UI/Components/Compo/OrderRowMan.razor.cs @@ -8,6 +8,7 @@ using EgwCoreLib.Lux.Data.DbModel.Utils; using EgwCoreLib.Lux.Data.Migrations; using EgwCoreLib.Lux.Data.Services; using Lux.UI.Components.Compo.WorkLoad; +using Lux.UI.Components.Pages; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; using Microsoft.AspNetCore.Cors.Infrastructure; @@ -1816,5 +1817,46 @@ namespace Lux.UI.Components.Compo } #endregion Private Methods + + /// + /// Esegue assegnazione diretta valori ricevuti + /// + /// + /// + private async Task DirectAssign(DirectAssignReqDto updInfo) + { + if (updInfo != null) + { + int numDone= await DLService.ProdItemBulkAssignItems(updInfo.OrderRowID, updInfo.ProdAssignID, updInfo.DictPartAssign); + // fix display + + await ForceOrderReload(updInfo.OrderRowID); + } + } + /// + /// Esegue reset assegnazioni + /// + /// + /// + private async Task ResetAssign(int OrderRowID) + { + await DLService.ProdItemResetOrderAssign(OrderRowID); + await ForceOrderReload(OrderRowID); + } + + private async Task ForceOrderReload(int OrderRowID) + { + // chiudo modale... + ClosePopup(); + // rileggo i dati! + await ReloadData(); + // recupero il record con orderId indicato + var item = ListRecords.FirstOrDefault(x => x.Original.OrderRowID == OrderRowID); + if (item != null) + { + // seleziono nuovamente i dati... + await ShowWLD(item, EditMode.WorkLoadDetailTime); + } + } } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor index ec84dda7..3972ec9d 100644 --- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor @@ -26,7 +26,7 @@
- @if (setBalance) + @if (CurrMode == SetMode.Balance) {
@@ -60,6 +60,74 @@
} + @* else if (CurrMode == SetMode.AssignUnwork) + { +
+
+
+ Lungh.Barre + + mm +
+
+
+
+ @if (AllProdAss != null && AllProdAss.Count > 0) + { + foreach (var item in AllProdAss) + { + @item.ProdPlantCod + + } + } +
+
+
+ @if (checkSend) + { + + } + else + { + + } +
+
+ } *@ + else if (CurrMode == SetMode.AssignOk) + { +
+
+
+ Lungh.Barre + + mm +
+
+
+
+ @if (AllProdAss != null && AllProdAss.Count > 0) + { + foreach (var item in AllProdAss) + { + @item.ProdPlantCod + + } + } +
+
+
+ @if (checkSend) + { + + } + else + { + + } +
+
+ }
@@ -70,7 +138,7 @@
  • Non producibili: @DetailRecord.NumKo
    - +
    • } @@ -79,7 +147,7 @@
  • Vincolati: @DetailRecord.NumOkVin
    - +
    • } @@ -88,7 +156,7 @@
  • Producibili ovunque: @DetailRecord.NumOk
    - +
    • } @@ -99,7 +167,7 @@ - SEL + Impianto @@ -119,15 +187,19 @@ { + @if (CurrMode == SetMode.AssignUnwork && item.ProdPlantCod.Contains("EXT")) + { + + } @item.ProdPlantCod - @item.NumParts / 0% + @item.NumParts / @($"{NumPartRatio(item.NumParts):P1}") - @item.TotalEstimTime / 0% + @item.TotalEstimTime / @($"{TotMaxTimeRatio(item.TotalEstimTime):P1}") } @@ -142,7 +214,7 @@ - + diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs index f676be15..c56c1725 100644 --- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs @@ -4,6 +4,7 @@ using EgwCoreLib.Lux.Data.DbModel.Production; using EgwCoreLib.Lux.Data.DbModel.Sales; using EgwCoreLib.Lux.Data.Services; using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; using NLog.Targets.Wrappers; namespace Lux.UI.Components.Compo.WorkLoad @@ -12,9 +13,6 @@ namespace Lux.UI.Components.Compo.WorkLoad { #region Public Properties - [Parameter] - public OrderRowModel OrderRowRecord { get; set; } = null!; - [Parameter] public List? AllProdAss { get; set; } @@ -29,17 +27,56 @@ namespace Lux.UI.Components.Compo.WorkLoad [Parameter] public EventCallback EC_RunBalance { get; set; } + [Parameter] + public EventCallback EC_DirectAssign { get; set; } + [Parameter] + public EventCallback EC_ResetAssign { get; set; } + + [Parameter] + public OrderRowModel OrderRowRecord { get; set; } = null!; #endregion Public Properties + + #region Protected Fields - [Inject] - protected DataLayerServices DLService { get; set; } = null!; protected BalanceReqDto cBalanceReq = new BalanceReqDto(); + /// + /// Gestione modalità assegnazione Parts a macchine + /// + protected SetMode CurrMode = SetMode.None; + #endregion Protected Fields + #region Protected Enums + + protected enum SetMode + { + /// + /// Modalità non definita + /// + None = 0, + + /// + /// Modalità preparazione richiesta balance + /// + Balance, + + /// + /// Assegnazione diretta pezzi OK + /// + AssignOk, + + /// + /// Assegnazione pezzi non lavorabili + /// + AssignUnwork + } + + #endregion Protected Enums + #region Protected Properties protected int BarLenght @@ -59,6 +96,8 @@ namespace Lux.UI.Components.Compo.WorkLoad set => cBalanceReq.MachineBalance = value; } + [Inject] + protected DataLayerServices DLService { get; set; } = null!; protected string MainCss { @@ -73,10 +112,40 @@ namespace Lux.UI.Components.Compo.WorkLoad { await EC_ClosePopup.InvokeAsync(true); } - - protected override void OnParametersSet() + protected async Task ForceResetAssign() { - ReloadData(); + if (!await JSRuntime.InvokeAsync("confirm", $"Confermi di vole resettare tutte le assegnazioniper gli articoli?")) + return; + + await EC_ResetAssign.InvokeAsync(OrderRowRecord.OrderRowID); + } + + protected async Task DirectAssign() + { + await Task.Delay(200); + } + + protected override async Task OnParametersSetAsync() + { + await ReloadData(); + } + + private double TotMaxTimeRatio(double currTime) + { + return DetailRecord.TotMaxTime > 0 ? currTime / (double)DetailRecord.TotMaxTime : 0.0; + } + private double NumPartRatio(int numPart) + { + return DetailRecord.NumParts > 0 ? (double)numPart / DetailRecord.NumParts : 0.0; + } + + /// + /// Rilettura dati da DB associazioni + /// + /// + protected async Task ReloadData() + { + await Task.Delay(500); } protected async Task ReqBalance() @@ -89,46 +158,47 @@ namespace Lux.UI.Components.Compo.WorkLoad await EC_ReRunReq.InvokeAsync(true); } - protected void ToggleBalance(List listTag) - { - setBalance = !setBalance; - if (setBalance) - { - cBalanceReq.TagsList = listTag; - ResetDictReq(); - } - } + [Inject] + protected IJSRuntime JSRuntime { get; set; } = null!; /// /// Assegnazione item unworkable a EXT /// /// - protected async Task SendUnworkExt() + protected async Task SendUnworkExt(int ProdAssignId) { - // recupero ProdAssignId x EXT... da elenco record mostrati... - int ProdAssignId = 0; + if (!await JSRuntime.InvokeAsync("confirm", $"Confermi assegnazione Ext/Manual per {DetailRecord.NumKo} articoli?")) + return; + if (OrderRowRecord.OrderRowID > 0 && ProdAssignId > 0) { // recupero elenco e converto in Dict - var dictUnwokr = DetailRecord + var dictPartUnwokr = DetailRecord .ListUnWorkable .ToDictionary(x => x, x => 0.0); - // chiamo update! - await DLService.ProdItemBulkAssignItems(OrderRowRecord.OrderRowID, ProdAssignId, dictUnwokr); + DirectAssignReqDto assignReq = new DirectAssignReqDto() + { + OrderRowID = OrderRowRecord.OrderRowID, + ProdAssignID = ProdAssignId, + DictPartAssign = dictPartUnwokr + }; + await EC_DirectAssign.InvokeAsync(assignReq); + CurrMode = SetMode.None; } - // rileggo! - await ReloadData(); } - /// - /// Rilettura dati da DB associazioni - /// - /// - protected async Task ReloadData() + protected void ToggleAssignMode(List listTag, SetMode reqMode) { - await Task.Delay(500); + // se era già attivo --> chiude... altrimenti assegna! + CurrMode = CurrMode == reqMode ? SetMode.None : reqMode; + // ora imposto secondo modo... + if (CurrMode == reqMode) + { + cBalanceReq.TagsList = listTag; + PrepareSendReq(); + } } #endregion Protected Methods @@ -137,13 +207,11 @@ namespace Lux.UI.Components.Compo.WorkLoad private string selUid = ""; - private bool setBalance = false; - #endregion Private Fields #region Private Methods - private void ResetDictReq() + private void PrepareSendReq() { DictPercReq.Clear(); var cList = AllProdAss; @@ -152,7 +220,31 @@ namespace Lux.UI.Components.Compo.WorkLoad { stdPerc = 1.0 / (cList.Count - 1); } - DictPercReq = cList.ToDictionary(x => x.ProdPlantCod, x => x.ProdPlantCod != "EXT" ? stdPerc : 0); + + if (cList != null) + { + // valutare se determinare EXT/manuale in modo diverso da ProdPlantModel + switch (CurrMode) + { + case SetMode.None: + break; + + case SetMode.Balance: + DictPercReq = cList.ToDictionary(x => x.ProdPlantCod, x => x.ProdPlantCod != "EXT" ? stdPerc : 0.0); + break; + + case SetMode.AssignOk: + DictPercReq = cList.ToDictionary(x => x.ProdPlantCod, x => 0.0); + break; + + case SetMode.AssignUnwork: + DictPercReq = cList.ToDictionary(x => x.ProdPlantCod, x => x.ProdPlantCod == "EXT" ? 1.0 : 0.0); + break; + + default: + break; + } + } } #endregion Private Methods diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 9c1335f9..320ae845 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.2415 + 0.9.2512.2417 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 88953519..d18690af 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

    Versione: 0.9.2512.2415

    +

    Versione: 0.9.2512.2417


    Note di rilascio:
    • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 5b18ae59..cee2fb13 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2512.2415 +0.9.2512.2417 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 2d3516e3..5b3a0bd7 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2512.2415 + 0.9.2512.2417 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false