diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 2805f13d..438d0442 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -696,16 +696,31 @@ namespace MP.Data.Controllers
/// Elenco da tabella Macchine
///
///
- public List MacchineGetAll()
+ public List MacchineGetAll(string codGruppo = "*")
{
- List dbResult = new List();
+ List dbResult = new List();
using (var dbCtx = new MoonProContext(_configuration))
{
- dbResult = dbCtx
- .DbSetMacchine
- .AsNoTracking()
- .OrderBy(x => x.IdxMacchina)
- .ToList();
+ if (codGruppo == "*")
+ {
+ dbResult = dbCtx
+ .DbSetGrp2Macc
+ .AsNoTracking()
+ .Include(m => m.MachineNav)
+ .OrderBy(x => x.IdxMacchina)
+ .ToList();
+ }
+ else
+ {
+
+ dbResult = dbCtx
+ .DbSetGrp2Macc
+ .Where(c => c.CodGruppo == codGruppo)
+ .AsNoTracking()
+ .Include(m => m.MachineNav)
+ .OrderBy(x => x.IdxMacchina)
+ .ToList();
+ }
}
return dbResult;
}
diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor
index 24efa151..80655c2b 100644
--- a/MP.SPEC/Components/ListDossiers.razor
+++ b/MP.SPEC/Components/ListDossiers.razor
@@ -106,11 +106,11 @@ else
@if (item.IdxMacchina == currRecordClone.IdxMacchina)
{
-
+
}
else
{
-
+
}
}
}
diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs
index d91907a0..7fea9ec4 100644
--- a/MP.SPEC/Components/ListDossiers.razor.cs
+++ b/MP.SPEC/Components/ListDossiers.razor.cs
@@ -227,7 +227,7 @@ namespace MP.SPEC.Components
ListStati = await MDService.AnagStatiComm();
selAzienda = await MDService.tryGetConfig("AZIENDA");
ListArticoli = await MDService.ArticoliGetSearch(100000, selAzienda, "");
- ListMacchine = await MDService.MacchineGetAll();
+ ListMacchine = await MDService.MacchineGetAll("*");
await reloadData(true);
}
@@ -309,7 +309,7 @@ namespace MP.SPEC.Components
private List? ListArticoli;
private List? ListGruppiFase;
- private List? ListMacchine;
+ private List? ListMacchine;
private List? ListRecords;
private List? ListStati;
diff --git a/MP.SPEC/Components/SelFilterXDL.razor b/MP.SPEC/Components/SelFilterXDL.razor
index 526b89cc..a9fdc0e2 100644
--- a/MP.SPEC/Components/SelFilterXDL.razor
+++ b/MP.SPEC/Components/SelFilterXDL.razor
@@ -42,7 +42,7 @@
{
foreach (var item in ListMacchine)
{
-
+
}
}
diff --git a/MP.SPEC/Components/SelFilterXDL.razor.cs b/MP.SPEC/Components/SelFilterXDL.razor.cs
index 039b0c0b..f5466103 100644
--- a/MP.SPEC/Components/SelFilterXDL.razor.cs
+++ b/MP.SPEC/Components/SelFilterXDL.razor.cs
@@ -19,7 +19,7 @@ namespace MP.SPEC.Components
public List? ListGruppiFase { get; set; } = null;
[Parameter]
- public List? ListMacchine { get; set; } = null;
+ public List? ListMacchine { get; set; } = null;
[Parameter]
public List? ListStati { get; set; } = null;
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index d6c12f21..e68889fe 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -177,7 +177,8 @@ namespace MP.SPEC.Data
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string readType = "DB";
- string currKey = $"{redisArtList}:{azienda}";
+ string sKey = string.IsNullOrEmpty(searchVal) ? "***" : searchVal;
+ string currKey = $"{redisArtList}:{azienda}:{sKey}";
// cerco in redis dato valore sel macchina...
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue)
@@ -789,30 +790,30 @@ namespace MP.SPEC.Data
/// Elenco di tutte le macchine gestite
///
///
- public async Task> MacchineGetAll()
+ public async Task> MacchineGetAll(string codGruppo)
{
- List? result = new List();
+ List? result = new List();
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string readType = "DB";
- string currKey = redisMacList;
+ string currKey = $"{redisMacList}:{codGruppo}";
// cerco in redis dato valore sel macchina...
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue)
{
- result = JsonConvert.DeserializeObject>($"{rawData}");
+ result = JsonConvert.DeserializeObject>($"{rawData}");
readType = "REDIS";
}
else
{
- result = await Task.FromResult(dbController.MacchineGetAll());
+ result = await Task.FromResult(dbController.MacchineGetAll(codGruppo));
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
- redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache));
+ redisDb.StringSet(redisMacList, rawData, getRandTOut(redisLongTimeCache));
}
if (result == null)
{
- result = new List();
+ result = new List();
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 78d235dd..0db5d526 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.SPEC
- 6.16.2211.3008
+ 6.16.2211.3010
diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs
index b7662ce5..db6276c6 100644
--- a/MP.SPEC/Pages/ODL.razor.cs
+++ b/MP.SPEC/Pages/ODL.razor.cs
@@ -111,7 +111,7 @@ namespace MP.SPEC.Pages
ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList();
}
ListStati = await MDService.AnagStatiComm();
- ListMacchine = await MDService.MacchineGetAll();
+ ListMacchine = await MDService.MacchineGetAll(selReparto);
padCodXdl = await MDService.tryGetConfig("padCodXdl");
}
@@ -160,7 +160,7 @@ namespace MP.SPEC.Pages
#region Private Fields
- private List? ListMacchine;
+ private List? ListMacchine;
private List? ListStati;
#endregion Private Fields
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index 7a9d707d..97bcd278 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -161,16 +161,16 @@
{
foreach (var item in ListMacchine)
{
- @if (!item.Descrizione.Contains("NEW Descrizione"))
+ @if (!item.MachineNav.Descrizione.Contains("NEW Descrizione"))
{
if (item.IdxMacchina == currRecordControlli.IdxMacchina)
{
-
+
}
else
{
-
+
}
}
}
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs
index dc3d2cc2..1f7c79a4 100644
--- a/MP.SPEC/Pages/PODL.razor.cs
+++ b/MP.SPEC/Pages/PODL.razor.cs
@@ -98,25 +98,16 @@ namespace MP.SPEC.Pages
await localStorage.SetItemAsync(keyStor, selReparto);
}
}
-
- protected override async Task OnInitializedAsync()
+ protected override async Task OnParametersSetAsync()
{
await getReparto();
- ListAziende = await MDService.ElencoAziende();
- var allGruppiData = await MDService.ElencoGruppiFase();
- if (allGruppiData != null)
- {
- ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList();
- }
- ListMacchine = await MDService.MacchineGetAll();
- ListStati = await MDService.AnagStatiComm();
- ListArticoli = await MDService.ArticoliGetSearch(100, currAzienda, artSearch);
- //SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, selReparto, selDtStart, selDtEnd);
- currAzienda = await MDService.tryGetConfig("AZIENDA");
- padCodXdl = await MDService.tryGetConfig("padCodXdl");
- // carico dati
await reloadData();
}
+ protected override async Task OnInitializedAsync()
+ {
+ // carico dati
+ //await reloadData();
+ }
protected async Task pgResetReq(bool doReset)
{
@@ -143,6 +134,7 @@ namespace MP.SPEC.Pages
//}
//currArticolo = "";
+
if (ListArticoli != null && ListArticoli.Count > 0)
{
//var firstArt = ListArticoli.FirstOrDefault();
@@ -166,7 +158,7 @@ namespace MP.SPEC.Pages
string codMacc = "";
if (ListMacchine != null && ListMacchine.Count > 0)
{
- var firstMacc = ListMacchine.FirstOrDefault(x => x.Nome.Contains(currAzienda));
+ var firstMacc = ListMacchine.FirstOrDefault(x => x.MachineNav.Nome.Contains(currAzienda));
if (firstMacc != null)
{
codMacc = firstMacc.IdxMacchina;
@@ -232,7 +224,7 @@ namespace MP.SPEC.Pages
private List? ListGruppiFase;
- private List? ListMacchine;
+ private List? ListMacchine;
private List? ListStati;
@@ -342,8 +334,11 @@ namespace MP.SPEC.Pages
get => _currRecord;
set
{
- _currRecord = value;
- artSearch = value == null ? "" : value.CodArticolo;
+ if (value != null)
+ {
+ _currRecord = value;
+ artSearch = value == null ? "" : value.CodArticolo;
+ }
}
}
@@ -426,13 +421,24 @@ namespace MP.SPEC.Pages
{
isLoading = true;
await Task.Delay(1);
-
+ ListAziende = await MDService.ElencoAziende();
+ var allGruppiData = await MDService.ElencoGruppiFase();
+ if (allGruppiData != null)
+ {
+ ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList();
+ }
+ ListMacchine = await MDService.MacchineGetAll(selReparto);
+ ListStati = await MDService.AnagStatiComm();
ListArticoli = await MDService.ArticoliGetSearch(100, currAzienda, artSearch);
- // ListArticoli = new List();
- //}
+ //SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, selReparto, selDtStart, selDtEnd);
+ currAzienda = await MDService.tryGetConfig("AZIENDA");
+ padCodXdl = await MDService.tryGetConfig("padCodXdl");
+ //ListMacchine = await MDService.MacchineGetAll(selReparto);
+ //ListArticoli = await MDService.ArticoliGetSearch(100, currAzienda, artSearch);
+
isLoading = false;
}
- protected string header
+ protected string header
{
get => currFilter.Header;
set => currFilter.Header = value;
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 8a2ab009..a6dcc38b 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2211.3008
+ Versione: 6.16.2211.3010
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 81c7abf1..b06c03c3 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.3008
+6.16.2211.3010
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index dadec365..7b0fa5d8 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2211.3008
+ 6.16.2211.3010
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html
false