diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 843c0daf..8a01f41f 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -168,13 +168,6 @@ namespace MP.Data.Controllers { List dbResult = new List(); - //dbResult = dbCtx - // . - // .Where(x => x.Descrizione.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - // .OrderByDescending(x => x.InizioStato) - // .Take(numRecord) - // .ToList(); - var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); @@ -269,60 +262,6 @@ namespace MP.Data.Controllers 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/TurniPareto.cs b/MP.Data/DatabaseModels/TurniPareto.cs deleted file mode 100644 index 73c9d689..00000000 --- a/MP.Data/DatabaseModels/TurniPareto.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TurniPareto - { - #region Public Properties - - public string ClasseTempo { get; set; } - public string CodArticolo { get; set; } - public string CodMacchina { get; set; } - public DateTime DataRif { get; set; } - public string DescArticolo { get; set; } - public string Descrizione { get; set; } - public string IdxMacchina { get; set; } - public int IdxStato { get; set; } - public double? TotPeriodo { get; set; } - public int? TotPz { get; set; } - public string Turno { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/TurniParetoOdl.cs b/MP.Data/DatabaseModels/TurniParetoOdl.cs deleted file mode 100644 index 7a15b270..00000000 --- a/MP.Data/DatabaseModels/TurniParetoOdl.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.Data.DatabaseModels -{ - public partial class TurniParetoOdl - { - #region Public Properties - - public string ClasseTempo { get; set; } - public string CodArticolo { get; set; } - public string CodMacchina { get; set; } - public DateTime DataRif { get; set; } - 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; } - public int? TotPz { get; set; } - public string Turno { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index de2014da..f9e16cd0 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -6,6 +6,11 @@ MP.Data + + + + + diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index b6161519..3218b430 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -43,8 +43,10 @@ namespace MP.Data public virtual DbSet DbSetODL { get; set; } public virtual DbSet DbSetScarti { get; set; } public virtual DbSet DbSetTurniOee { get; set; } +#if false public virtual DbSet DbSetTurniPareto { get; set; } public virtual DbSet DbSetTurniParetoOdl { get; set; } +#endif public virtual DbSet DbSetUserLog { get; set; } #endregion Public Properties @@ -103,72 +105,6 @@ namespace MP.Data .HasMaxLength(5); }); - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_UI_Pareto_Turni"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.DescArticolo).HasMaxLength(250); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo"); - - entity.Property(e => e.Turno) - .IsRequired() - .HasMaxLength(5); - }); - - modelBuilder.Entity(entity => - { - entity.HasNoKey(); - - entity.ToView("v_UI_Pareto_TurniOdl"); - - entity.Property(e => e.ClasseTempo).HasMaxLength(50); - - entity.Property(e => e.CodArticolo) - .IsRequired() - .HasMaxLength(50); - - entity.Property(e => e.CodMacchina).HasMaxLength(50); - - entity.Property(e => e.DataRif).HasColumnType("datetime"); - - entity.Property(e => e.DescArticolo).HasMaxLength(250); - - entity.Property(e => e.Descrizione).HasMaxLength(50); - - entity.Property(e => e.IdxMacchina) - .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) - .IsRequired() - .HasMaxLength(5); - }); - modelBuilder.Entity(entity => { entity.HasNoKey();