diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index b4b8e6e8..51e63f88 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net8.0
enable
- 8.16.2606.113
+ 8.16.2606.118
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 91e3fb3c..093f0774 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 8.16.2606.113
+ Versione: 8.16.2606.118
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 142014de..515eeea2 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.113
+8.16.2606.118
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 9170deab..17e88865 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.113
+ 8.16.2606.118
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/MpSpecRepository.cs b/MP.Data/Controllers/MpSpecRepository.cs
index 7e42b2f1..887fbd5e 100644
--- a/MP.Data/Controllers/MpSpecRepository.cs
+++ b/MP.Data/Controllers/MpSpecRepository.cs
@@ -33,6 +33,7 @@ namespace MP.Data.Controllers
#region Public Methods
+#if false
///
/// Stacca un nuovo counter x il tipo richiesto
///
@@ -91,7 +92,7 @@ namespace MP.Data.Controllers
}
}
return answ;
- }
+ }
///
/// Restituisce l'anagrafica EVENTI generalmente disponibile per OGNI macchina
@@ -231,6 +232,8 @@ namespace MP.Data.Controllers
return numRes != 0;
}
+
+#endif
///
/// Elenco valori ammessi x Stati commessa (es Yacht Baglietto)
@@ -369,6 +372,7 @@ namespace MP.Data.Controllers
.ToListAsync();
}
+#if false
///
/// Elenco tabella Articoli da filtro
///
@@ -409,7 +413,8 @@ namespace MP.Data.Controllers
.OrderBy(x => x.CodArticolo)
.Take(numRecord)
.ToListAsync();
- }
+ }
+#endif
///
/// Elenco tabella Articoli NON IMPIEGATI (da stored stp_ART_getUsed) Async
diff --git a/MP.Data/Services/ListSelectDataSrv.cs b/MP.Data/Services/ListSelectDataSrv.cs
index 0cefec61..a41b524d 100644
--- a/MP.Data/Services/ListSelectDataSrv.cs
+++ b/MP.Data/Services/ListSelectDataSrv.cs
@@ -1,5 +1,6 @@
using Microsoft.Extensions.Configuration;
using MP.Data.DbModels;
+using MP.Data.Repository.Anag;
using Newtonsoft.Json;
using NLog;
using StackExchange.Redis;
@@ -20,8 +21,9 @@ namespace MP.Data.Services
{
#region Public Constructors
- public ListSelectDataSrv(IConfiguration configuration, IConnectionMultiplexer redConn) : base(configuration, redConn)
+ public ListSelectDataSrv(IConfiguration configuration, IConnectionMultiplexer redConn, IAnagRepository anagRepository) : base(configuration, redConn)
{
+ _anagRepository = anagRepository;
// conf DB
string connStr = _configuration.GetConnectionString("MP.All");
if (string.IsNullOrEmpty(connStr))
@@ -70,7 +72,7 @@ namespace MP.Data.Services
}
else
{
- result = await dbController.ArticoliGetSearchAsync(numRecord, tipoArt, azienda, searchVal);
+ result = await _anagRepository.ArticoliGetSearchAsync(numRecord, tipoArt, azienda, searchVal);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
await _redisDb.StringSetAsync(currKey, rawData, LongCache);
@@ -267,6 +269,7 @@ namespace MP.Data.Services
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
+ private readonly IAnagRepository _anagRepository;
private bool _disposed = false;
private string redisBaseKey = "MP:ALL:Cache";
@@ -382,7 +385,7 @@ namespace MP.Data.Services
}
answ = true;
}
- return answ;
+ return answ;
#endif
}
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index a80da490..2ffbf91e 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -157,7 +157,7 @@ namespace MP.SPEC.Data
using var activity = ActivitySource.StartActivity("AnagCountersGetNextAsync");
AnagCountersModel result = new AnagCountersModel();
string source = "DB";
- result = await dbController.AnagCountersGetNextAsync(cntType);
+ result = await _anagRepository.AnagCountersGetNextAsync(cntType);
activity?.SetTag("data.source", source);
activity?.Stop();
LogTrace($"AnagCountersGetNextAsync | {source} | {activity?.Duration.TotalMilliseconds}ms");
@@ -176,7 +176,7 @@ namespace MP.SPEC.Data
expiration: GetRandTOut(redisLongTimeCache),
fetchFunc: async () =>
{
- return await dbController.AnagEventiGeneralAsync() ?? new List();
+ return await _anagRepository.AnagEventiGeneralAsync() ?? new List();
},
tagList: [Utils.redisEventList]
);
@@ -191,7 +191,7 @@ namespace MP.SPEC.Data
using var activity = ActivitySource.StartActivity("AnagGruppiDeleteAsync");
bool result = false;
string source = "DB";
- result = await dbController.AnagGruppiDeleteAsync(updRec);
+ result = await _anagRepository.AnagGruppiDeleteAsync(updRec);
// elimino cache redis...
await FlushFusionCacheAsync(Utils.redisAnagGruppi);
activity?.SetTag("data.source", source);
@@ -210,7 +210,7 @@ namespace MP.SPEC.Data
using var activity = ActivitySource.StartActivity("AnagGruppiUpsertAsync");
bool result = false;
string source = "DB";
- result = await dbController.AnagGruppiUpsertAsync(UpdRec);
+ result = await _anagRepository.AnagGruppiUpsertAsync(UpdRec);
// elimino cache redis...
await FlushFusionCacheAsync(Utils.redisAnagGruppi);
activity?.SetTag("data.source", source);
@@ -328,7 +328,6 @@ namespace MP.SPEC.Data
public async Task> ArticoliGetSearchAsync(int numRecord, string tipoArt, string azienda, string searchVal)
{
string sKey = string.IsNullOrWhiteSpace(searchVal) ? "***" : searchVal.Trim();
-
string redisKey = $"{Utils.redisArtList}:{tipoArt}:{azienda}:{sKey}:{numRecord}";
return await GetOrFetchAsync(
@@ -336,7 +335,8 @@ namespace MP.SPEC.Data
cacheKey: redisKey,
expiration: GetRandTOut(redisLongTimeCache),
fetchFunc: async () =>
- await dbController.ArticoliGetSearchAsync(numRecord, tipoArt, azienda, searchVal) ?? new List(),
+ await _anagRepository.ArticoliGetSearchAsync(numRecord, tipoArt, azienda, searchVal) ?? new List(),
+ //await dbController.ArticoliGetSearchAsync(numRecord, tipoArt, azienda, searchVal) ?? new List(),
tagList: [Utils.redisArtList, $"{Utils.redisArtList}:Search"]
);
}
@@ -648,7 +648,7 @@ namespace MP.SPEC.Data
cacheKey: $"{Utils.redisAnagGruppi}:Aziende",
expiration: GetRandTOut(redisLongTimeCache * 2),
fetchFunc: async () =>
- await dbController.AnagGruppiAziendeAsync() ?? new List(),
+ await _anagRepository.AnagGruppiAziendeAsync() ?? new List(),
tagList: [Utils.redisAnagGruppi, $"{Utils.redisAnagGruppi}:Aziende"]
);
}
@@ -663,7 +663,7 @@ namespace MP.SPEC.Data
operationName: "ElencoGruppiFaseAsync",
cacheKey: $"{Utils.redisAnagGruppi}:FASE",
expiration: GetRandTOut(redisLongTimeCache),
- fetchFunc: async () => await dbController.AnagGruppiFaseAsync() ?? new List(),
+ fetchFunc: async () => await _anagRepository.AnagGruppiFaseAsync() ?? new List(),
tagList: [Utils.redisAnagGruppi]
);
}
@@ -693,7 +693,7 @@ namespace MP.SPEC.Data
operationName: "ElencoRepartiDtoAsync",
cacheKey: $"{Utils.redisAnagGruppi}:REPARTO",
expiration: GetRandTOut(redisLongTimeCache),
- fetchFunc: async () => await dbController.AnagGruppiRepartoDtoAsync() ?? new(),
+ fetchFunc: async () => await _anagRepository.AnagGruppiRepartoDtoAsync() ?? new(),
tagList: [Utils.redisAnagGruppi]
);
}
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 7c7b2789..2952fe88 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.SPEC
- 8.16.2606.118
+ 8.16.2606.119
1800a78a-6ff1-40f9-b490-87fb8bfc1394
en
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 093f0774..7e42922e 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
-
Versione: 8.16.2606.118
+ Versione: 8.16.2606.119
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 515eeea2..28d1df86 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.118
+8.16.2606.119
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index f23654c5..5cb1e4dd 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.118
+ 8.16.2606.119
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
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 37fb2ac3..76f7002a 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
net8.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 8.16.2606.0113
+ 8.16.2606.0118
true
en
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 31157f85..c66d2a01 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
-
Versione: 8.16.2606.0113
+ Versione: 8.16.2606.0118
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 5e53158e..9a5e6157 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2606.0113
+8.16.2606.0118
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 487a23f2..b4601710 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2606.0113
+ 8.16.2606.0118
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false