diff --git a/MP.Data/Repository/FluxLog/FluxLogRepository.cs b/MP.Data/Repository/FluxLog/FluxLogRepository.cs
index 6032c730..2bf4ca5a 100644
--- a/MP.Data/Repository/FluxLog/FluxLogRepository.cs
+++ b/MP.Data/Repository/FluxLog/FluxLogRepository.cs
@@ -1,4 +1,5 @@
 using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using MP.Core.DTO;
 using MP.Core.Objects;
@@ -8,6 +9,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using static EgwCoreLib.Utils.DtUtils;
 
 namespace MP.Data.Repository.FluxLog
 {
diff --git a/MP.Data/Repository/FluxLog/IFluxLogRepository.cs b/MP.Data/Repository/FluxLog/IFluxLogRepository.cs
index 0d50ca31..c30d4839 100644
--- a/MP.Data/Repository/FluxLog/IFluxLogRepository.cs
+++ b/MP.Data/Repository/FluxLog/IFluxLogRepository.cs
@@ -1,8 +1,10 @@
 using MP.Core.DTO;
+using MP.Core.Objects;
 using MP.Data.DbModels;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using static EgwCoreLib.Utils.DtUtils;
 
 namespace MP.Data.Repository.FluxLog
 {
diff --git a/MP.Data/Repository/Production/IProductionRepository.cs b/MP.Data/Repository/Production/IProductionRepository.cs
index 68e464a4..8a2cd94a 100644
--- a/MP.Data/Repository/Production/IProductionRepository.cs
+++ b/MP.Data/Repository/Production/IProductionRepository.cs
@@ -1,4 +1,3 @@
-using MP.Core.DTO;
 using MP.Data.DbModels;
 using System;
 using System.Collections.Generic;
@@ -12,7 +11,7 @@ namespace MP.Data.Repository.Production
 
         Task<List<ODLExpModel>> ListODLFiltAsync(bool inCorso, string codArt, string keyRichPart, string Reparto, string IdxMacchina, DateTime startDate, DateTime endDate);
 
-        Task<List<ODLExpModel>> OdlByKeyAsync(int IdxOdl);
+        Task<ODLExpModel> OdlByKeyAsync(int IdxOdl);
 
         Task<bool> ODLCloseAsync(int idxOdl, string idxMacchina, int matrOpr, bool confPezzi, bool confRett, int modoConfProd);
 
@@ -96,7 +95,7 @@ namespace MP.Data.Repository.Production
 
         Task<bool> Grp2OperInsertAsync(Gruppi2OperModel upsRec);
 
-        Task<List<StatoMacchineModel>> StatoMacchinaAsync(string idxMacchina);
+        Task<StatoMacchineModel> StatoMacchinaAsync(string idxMacchina);
 
         #endregion
 
diff --git a/MP.Data/Repository/Production/ProductionRepository.cs b/MP.Data/Repository/Production/ProductionRepository.cs
index 1d5196ac..7905e7af 100644
--- a/MP.Data/Repository/Production/ProductionRepository.cs
+++ b/MP.Data/Repository/Production/ProductionRepository.cs
@@ -1,11 +1,9 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Core.DTO;
 using MP.Data.DbModels;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -59,7 +57,7 @@ namespace MP.Data.Repository.Production
         }
 
         /// <inheritdoc />
-        public async Task<List<ODLExpModel>> OdlByKeyAsync(int IdxOdl)
+        public async Task<ODLExpModel> OdlByKeyAsync(int IdxOdl)
         {
             await using var dbCtx = await GetMoonProContextAsync();
             return await dbCtx
@@ -110,11 +108,11 @@ namespace MP.Data.Repository.Production
             List<StatODLModel> dbResult = new List<StatODLModel>();
             if (IdxOdl > 0)
             {
-                await using var dbCtx = new MoonPro_STATSContext(_configuration);
+                await using var dbCtx = await GetMoonProContextAsync();
                 var IdxODL = new SqlParameter("@IdxODL", IdxOdl);
 
                 dbResult = await dbCtx
-                                .DbSetODL
+                                .DbSetStatOdl
                                 .FromSqlRaw("EXEC stp_STAT_ODL @IdxODL", IdxODL)
                                 .AsNoTracking()
                                 .ToListAsync();
@@ -771,15 +769,14 @@ namespace MP.Data.Repository.Production
         }
 
         /// <inheritdoc />
-        public async Task<IReadOnlyCollection<StatoMacchineModel>> StatoMacchinaAsync(string idxMacchina)
+        public async Task<StatoMacchineModel> StatoMacchinaAsync(string idxMacchina)
         {
             await using var dbCtx = await GetMoonProContextAsync();
-            return (await dbCtx
+            return await dbCtx
                             .DbSetStatoMacc
-                            .AsNoTracking()
                             .Where(x => x.IdxMacchina == idxMacchina)
-                            .ToListAsync())
-                        .AsReadOnly();
+                            .AsNoTracking()
+                            .FirstOrDefaultAsync();
         }
 
         #endregion