diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs
index 61036130..853d1c02 100644
--- a/MP.Data/Controllers/MpStatsController.cs
+++ b/MP.Data/Controllers/MpStatsController.cs
@@ -220,6 +220,87 @@ namespace MP.Data.Controllers
return dbResult;
}
+ ///
+ /// Elenco tabella TurniOee da filtro
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+ {
+ List dbResult = new List();
+
+ var dataFrom = new SqlParameter("@dataFrom", DataStart);
+ var dataTo = new SqlParameter("@dataTo", DataEnd);
+ var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+ var idxODL = new SqlParameter("@IdxODL", IdxODL);
+ var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+ var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
+ dbResult = dbCtx
+ .DbSetTurniOee
+ .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
+ .ToList();
+
+ return dbResult;
+ }
+
+ ///
+ /// Elenco tabella TurniPareto da filtro
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public List StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+ {
+ List dbResult = new List();
+
+ var dataFrom = new SqlParameter("@dataFrom", DataStart);
+ var dataTo = new SqlParameter("@dataTo", DataEnd);
+ var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+ var idxODL = new SqlParameter("@IdxODL", IdxODL);
+ var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+ var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
+ dbResult = dbCtx
+ .DbSetTurniPareto
+ .FromSqlRaw("EXEC stp_UI_ParetoTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
+ .ToList();
+
+ return dbResult;
+ }
+
+ ///
+ /// Elenco tabella TurniParetoOdl da filtro
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public List StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+ {
+ List dbResult = new List();
+
+ var dataFrom = new SqlParameter("@dataFrom", DataStart);
+ var dataTo = new SqlParameter("@dataTo", DataEnd);
+ var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+ var idxODL = new SqlParameter("@IdxODL", IdxODL);
+ var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+ var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
+ dbResult = dbCtx
+ .DbSetTurniParetoOdl
+ .FromSqlRaw("EXEC stp_UI_ParetoTurniOdl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
+ .ToList();
+
+ return dbResult;
+ }
+
///
/// Elenco tabella UserLog da filtro
///
diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs
index ec0a36c1..2187765c 100644
--- a/MP.Data/DatabaseModels/TurniOee.cs
+++ b/MP.Data/DatabaseModels/TurniOee.cs
@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
#nullable disable
@@ -16,10 +18,15 @@ namespace MP.Data.DatabaseModels
public string DescArticolo { get; set; }
public string Descrizione { get; set; }
public string IdxMacchina { get; set; }
- public int? IdxOdl { get; set; }
public int IdxStato { get; set; }
- public string KeyRichiesta { get; set; }
- public double? TotPeriodo { get; set; }
+
+ [NotMapped]
+ [DisplayFormat(DataFormatString = "{0:P2}", ApplyFormatInEditMode = true)]
+ public double OEE => (double)TotPeriodo / 480;
+
+ [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)]
+ public double TotPeriodo { get; set; }
+
public int? TotPz { get; set; }
public string Turno { get; set; }
diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs
index ffb3bcc6..b6161519 100644
--- a/MP.Data/MoonPro_STATSContext.cs
+++ b/MP.Data/MoonPro_STATSContext.cs
@@ -96,10 +96,6 @@ namespace MP.Data
.IsRequired()
.HasMaxLength(50);
- entity.Property(e => e.IdxOdl).HasColumnName("IdxODL");
-
- entity.Property(e => e.KeyRichiesta).HasMaxLength(50);
-
entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo");
entity.Property(e => e.Turno)