diff --git a/MP-TAB3/Components/CurrOdlDetail.razor b/MP-TAB3/Components/CurrOdlDetail.razor index dca1043f..7a729968 100644 --- a/MP-TAB3/Components/CurrOdlDetail.razor +++ b/MP-TAB3/Components/CurrOdlDetail.razor @@ -1,6 +1,6 @@ @if (showKitDetail) { - + }
@@ -90,7 +90,7 @@ { @if (CheckIsKit(CurrOdl.CodArticolo)) { - + } @CurrOdl.DescArticolo } @@ -98,7 +98,7 @@ { @if (CheckIsKit(CurrPodl.CodArticolo)) { - + } @CurrPodl.DescArticolo } diff --git a/MP-TAB3/Components/CurrOdlDetail.razor.cs b/MP-TAB3/Components/CurrOdlDetail.razor.cs index 70be5a57..2a440564 100644 --- a/MP-TAB3/Components/CurrOdlDetail.razor.cs +++ b/MP-TAB3/Components/CurrOdlDetail.razor.cs @@ -68,17 +68,24 @@ namespace MP_TAB3.Components return answ; } - protected void KitToggleDetail(string? selCodArt) + protected void KitToggleDetail(string? selCodArt, int idxPOdl) { - CodArtParent = selCodArt ?? ""; - if (!string.IsNullOrEmpty(CodArtParent)) + if (!string.IsNullOrEmpty(selCodArt)) { - ListKitTemplate = TDService.TemplateKitFilt(CodArtParent, ""); + ListKitTemplate = TDService.TemplateKitFilt(selCodArt, ""); } else { ListKitTemplate = null; } + if (idxPOdl>0) + { + ListPOdlKit = TDService.POdlListByKitParent(idxPOdl); + } + else + { + ListPOdlKit = null; + } showKitDetail = !showKitDetail; } @@ -102,7 +109,6 @@ namespace MP_TAB3.Components #region Private Fields - private string CodArtParent = ""; /// /// Elenco articoli tipo KIT @@ -110,6 +116,7 @@ namespace MP_TAB3.Components private List? ListArtKit; private List? ListKitTemplate = null; + private List? ListPOdlKit; private bool showKitDetail = false; diff --git a/MP-TAB3/Components/ProdKIT/KitDetailModal.razor b/MP-TAB3/Components/ProdKIT/KitDetailModal.razor index 98177bee..335ec458 100644 --- a/MP-TAB3/Components/ProdKIT/KitDetailModal.razor +++ b/MP-TAB3/Components/ProdKIT/KitDetailModal.razor @@ -3,18 +3,18 @@
-

Dettaglio KIT @CodArtParent

+

Dettaglio KIT

- @if (ListRecords == null) + @if (ListTK == null && ListPODL == null) { } - else if (totalKitCount == 0) + else if (numIstKit == 0) {
Nessun record trovato @@ -22,7 +22,56 @@ } else { - + if (ListPODL != null) + { +
+

PODL KIT → Ordini

+
+
+ + + + + + + + + + @foreach (var record in ListPODL) + { + + + + + + + } + +
PODL Cod Ord Cod Art Qty
+
@record.IdxPromessa
+ 		+
@record.KeyRichiesta
+ 		+
@record.CodArticolo
+ 		+
@record.NumPezzi
+
+ } + } +
+
+ @if (numTempKit == 0) + { +
+ Nessun record trovato +
+ } + else + { +
+ Template KIT +
+ @@ -31,7 +80,7 @@ - @foreach (var record in ListRecords) + @foreach (var record in ListTK) {
Cod Kit (Parent)
@@ -55,25 +104,26 @@ @code { - [Parameter] - public string CodArtParent { get; set; } = ""; - [Parameter] public EventCallback EC_Close { get; set; } + [Parameter] + public List? ListPODL { get; set; } = null; [Parameter] - public List? ListRecords { get; set; } = null; + public List? ListTK { get; set; } = null; protected override void OnParametersSet() { - // base.OnParametersSet(); - totalKitCount = ListRecords != null ? ListRecords.Count() : 0; + numTempKit = ListTK != null ? ListTK.Count() : 0; + numIstKit = ListPODL != null ? ListPODL.Count() : 0; } - private int totalKitCount = 0; protected async void ReqClose() { await EC_Close.InvokeAsync(true); } + + private int numTempKit = 0; + private int numIstKit = 0; } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index b185dbab..9e427c82 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2505.1312 + 6.16.2505.1517 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index bc2ec3b5..b13f8c61 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2505.1312

+

Versione: 6.16.2505.1517


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index b61cfc2f..2118c9ae 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2505.1312 +6.16.2505.1517 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 4480397c..c4ddec88 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2505.1312 + 6.16.2505.1517 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs index 55efbb29..3104a874 100644 --- a/MP.Data/Controllers/MpTabController.cs +++ b/MP.Data/Controllers/MpTabController.cs @@ -823,6 +823,27 @@ namespace MP.Data.Controllers return fatto; } + /// + /// Elenco PODL in un istanza KIT dall'ID del parent + /// + /// IDX PODL parent + /// + public List ListPODL_ByKitParent(int IdxPodlParent) + { + List dbResult = new List(); + using (var dbCtx = new MoonProContext(_configuration)) + { + var pIdxPodlParent = new SqlParameter("@IdxPodlParent", IdxPodlParent); + + dbResult = dbCtx + .DbSetPODLExp + .FromSqlRaw("EXEC stp_PODL_getByParentKitIdx @IdxPodlParent", pIdxPodlParent) + .AsNoTracking() + .ToList(); + } + return dbResult; + } + /// /// Elenco PODL macchina /// diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index 09e09bff..7e2844d1 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -2435,6 +2435,42 @@ namespace MP.Data.Services return result; } + /// + /// Elenco PODL in un istanza KIT dall'ID del parent + /// + /// IDX PODL parent + /// + public List POdlListByKitParent(int IdxPodlParent) + { + List? result = new List(); + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string readType = "DB"; + string currKey = $"{Utils.redisPOdlList}_kit:ByParent:{IdxPodlParent}"; + // cerco in redis dato valore sel idxMaccSel... + RedisValue rawData = redisDb.StringGet(currKey); + if (rawData.HasValue) + { + result = JsonConvert.DeserializeObject>($"{rawData}"); + readType = "REDIS"; + } + else + { + result = dbTabController.ListPODL_ByKitParent(IdxPodlParent); + // serializzo e salvo... + rawData = JsonConvert.SerializeObject(result); + redisDb.StringSet(currKey, rawData, LongCache); + } + if (result == null) + { + result = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"POdlListByKitParent | Read from {readType}: {ts.TotalMilliseconds}ms"); + return result; + } + /// /// Restituisce il contapezzi salvato per la macchina /// diff --git a/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs b/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs index e79574b7..7506dc87 100644 --- a/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs +++ b/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs @@ -309,7 +309,6 @@ namespace MP.SPEC.Components.ProdKit ListRecordsPODL = new List(); ListRecordsPODL = PodlRecords - //.Where(x => !string.IsNullOrEmpty(x.KeyRichiesta)) .Where(x => !string.IsNullOrEmpty(x.KeyRichiesta) && x.KeyRichiesta.StartsWith("KIT")) .Skip(numRecord * (currPage - 1)) .Take(numRecord) diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index c2d85793..5892720f 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -2063,6 +2063,42 @@ namespace MP.SPEC.Data return fatto; } + /// + /// Elenco PODL in un istanza KIT dall'ID del parent + /// + /// IDX PODL parent + /// + public List POdlListByKitParent(int IdxPodlParent) + { + List? result = new List(); + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string readType = "DB"; + string currKey = $"{Utils.redisPOdlList}_kit:ByParent:{IdxPodlParent}"; + // cerco in redis dato valore sel idxMaccSel... + RedisValue rawData = redisDb.StringGet(currKey); + if (rawData.HasValue) + { + result = JsonConvert.DeserializeObject>($"{rawData}"); + readType = "REDIS"; + } + else + { + result = dbController.ListPODL_ByKitParent(IdxPodlParent); + // serializzo e salvo... + rawData = JsonConvert.SerializeObject(result); + redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(redisShortTimeCache)); + } + if (result == null) + { + result = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"POdlListByKitParent | Read from {readType}: {ts.TotalMilliseconds}ms"); + return result; + } + /// /// Elenco PODL non avviati filtrati x articolo, KeyRich (che contiene stato) /// @@ -2145,42 +2181,6 @@ namespace MP.SPEC.Data return result; } - /// - /// Elenco PODL in un istanza KIT dall'ID del parent - /// - /// IDX PODL parent - /// - public List POdlListByKitParent(int IdxPodlParent) - { - List? result = new List(); - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - string readType = "DB"; - string currKey = $"{Utils.redisPOdlList}_kit:ByParent:{IdxPodlParent}"; - // cerco in redis dato valore sel idxMaccSel... - RedisValue rawData = redisDb.StringGet(currKey); - if (rawData.HasValue) - { - result = JsonConvert.DeserializeObject>($"{rawData}"); - readType = "REDIS"; - } - else - { - result = dbController.ListPODL_ByKitParent(IdxPodlParent); - // serializzo e salvo... - rawData = JsonConvert.SerializeObject(result); - redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(redisShortTimeCache)); - } - if (result == null) - { - result = new List(); - } - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Debug($"POdlListByKitParent | Read from {readType}: {ts.TotalMilliseconds}ms"); - return result; - } - /// /// Elenco PODL per composizione KIT (Async) non avviati filtrati x articolo, KeyRich (che contiene stato) ///