From 081a4792ba6d75396e9e6a6f0b6a9c9b39f121a8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 12:03:58 +0200
Subject: [PATCH] Completato calcoli OEE

---
 MP.Data/Controllers/MpStatsController.cs | 81 ++++++++++++++++++++++++
 MP.Data/DatabaseModels/TurniOee.cs       | 13 +++-
 MP.Data/MoonPro_STATSContext.cs          |  4 --
 3 files changed, 91 insertions(+), 7 deletions(-)

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;
         }
 
+        /// <summary>
+        /// Elenco tabella TurniOee da filtro
+        /// </summary>
+        /// <param name="DataStart"></param>
+        /// <param name="DataEnd"></param>
+        /// <param name="IdxMacchina"></param>
+        /// <param name="DataEnd"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TurniOee> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        {
+            List<DatabaseModels.TurniOee> dbResult = new List<DatabaseModels.TurniOee>();
+
+            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;
+        }
+
+        /// <summary>
+        /// Elenco tabella TurniPareto da filtro
+        /// </summary>
+        /// <param name="DataStart"></param>
+        /// <param name="DataEnd"></param>
+        /// <param name="IdxMacchina"></param>
+        /// <param name="DataEnd"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TurniPareto> StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        {
+            List<DatabaseModels.TurniPareto> dbResult = new List<DatabaseModels.TurniPareto>();
+
+            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;
+        }
+
+        /// <summary>
+        /// Elenco tabella TurniParetoOdl da filtro
+        /// </summary>
+        /// <param name="DataStart"></param>
+        /// <param name="DataEnd"></param>
+        /// <param name="IdxMacchina"></param>
+        /// <param name="DataEnd"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TurniParetoOdl> StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        {
+            List<DatabaseModels.TurniParetoOdl> dbResult = new List<DatabaseModels.TurniParetoOdl>();
+
+            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;
+        }
+
         /// <summary>
         /// Elenco tabella UserLog da filtro
         /// </summary>
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)