From 7d1cae90613778681a4efeb8d8f4d57f71253ddd Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 29 Sep 2025 15:09:45 +0200 Subject: [PATCH] Update datamodel --- EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj | 2 +- EgwCoreLib.Lux.Data/DataLayerContext.cs | 8 ++++---- EgwCoreLib.Lux.Data/DbModel/Sales/OfferModel.cs | 15 +++++++-------- .../DbModel/Sales/OfferRowModel.cs | 15 +++++++++++++-- EgwCoreLib.Lux.Data/ModelBuilderExtensions.cs | 16 ++++++---------- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj index 59a004c1..1c8405f1 100644 --- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj +++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj @@ -21,6 +21,6 @@ - + diff --git a/EgwCoreLib.Lux.Data/DataLayerContext.cs b/EgwCoreLib.Lux.Data/DataLayerContext.cs index 7dcf1874..e6268c2f 100644 --- a/EgwCoreLib.Lux.Data/DataLayerContext.cs +++ b/EgwCoreLib.Lux.Data/DataLayerContext.cs @@ -1,8 +1,10 @@ using EgwCoreLib.Lux.Data.DbModel.Cost; -using EgwCoreLib.Lux.Data.DbModel.Utils; +using EgwCoreLib.Lux.Data.DbModel.Items; using EgwCoreLib.Lux.Data.DbModel.Production; using EgwCoreLib.Lux.Data.DbModel.Sales; +using EgwCoreLib.Lux.Data.DbModel.Stock; using EgwCoreLib.Lux.Data.DbModel.Task; +using EgwCoreLib.Lux.Data.DbModel.Utils; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using NLog; @@ -11,8 +13,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using EgwCoreLib.Lux.Data.DbModel.Stock; -using EgwCoreLib.Lux.Data.DbModel.Items; namespace EgwCoreLib.Lux.Data { @@ -45,8 +45,8 @@ namespace EgwCoreLib.Lux.Data } } - public virtual DbSet DbSetCounters { get; set; } + public virtual DbSet DbSetItemGroup { get; set; } public virtual DbSet DbSetItem { get; set; } public virtual DbSet DbSetSellItem { get; set; } diff --git a/EgwCoreLib.Lux.Data/DbModel/Sales/OfferModel.cs b/EgwCoreLib.Lux.Data/DbModel/Sales/OfferModel.cs index cb72b191..fee06031 100644 --- a/EgwCoreLib.Lux.Data/DbModel/Sales/OfferModel.cs +++ b/EgwCoreLib.Lux.Data/DbModel/Sales/OfferModel.cs @@ -1,11 +1,5 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using static EgwCoreLib.Lux.Core.Enums; namespace EgwCoreLib.Lux.Data.DbModel.Sales @@ -23,6 +17,11 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales [Key] public int OfferID { get; set; } + /// + /// Environment della richiesta + /// + public EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS Envir { get; set; } = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW; + /// /// Anno rif offerta /// @@ -77,7 +76,6 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales /// public DateTime Modified { get; set; } = DateTime.Now; - /// /// Enum stato offerta /// @@ -150,6 +148,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales [ForeignKey("DealerID")] public virtual DealerModel DealerNav { get; set; } = null!; + /// /// Navigazione alle righe offerta /// diff --git a/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs b/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs index 8a4914be..1c9e9cdf 100644 --- a/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs +++ b/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs @@ -7,6 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; +using static EgwCoreLib.Lux.Core.Enums; namespace EgwCoreLib.Lux.Data.DbModel.Sales { @@ -34,9 +35,9 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales public int RowNum { get; set; } = 0; /// - /// Campo salvato dell'Environment + /// Environment della richiesta /// - public string Environment { get; set; } = "WINDOW"; + public EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS Envir { get; set; } = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW; /// /// Campo salvato dell'UID da codice DataMatrix calcolato @@ -178,6 +179,16 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales /// public DateTime Modified { get; set; } = DateTime.Now; + /// + /// Indica che è in attesa aggiornamento BOM + /// + public bool AwaitBom { get; set; } = false; + + /// + /// Indica che è in attesa aggiornamento Price + /// + public bool AwaitPrice { get; set; } = false; + /// /// Navigazione Offer /// diff --git a/EgwCoreLib.Lux.Data/ModelBuilderExtensions.cs b/EgwCoreLib.Lux.Data/ModelBuilderExtensions.cs index 75befcf7..c546538e 100644 --- a/EgwCoreLib.Lux.Data/ModelBuilderExtensions.cs +++ b/EgwCoreLib.Lux.Data/ModelBuilderExtensions.cs @@ -1,15 +1,10 @@ using EgwCoreLib.Lux.Data.DbModel.Cost; -using EgwCoreLib.Lux.Data.DbModel.Utils; -using EgwCoreLib.Lux.Data.DbModel.Sales; -using EgwCoreLib.Lux.Data.DbModel.Task; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using EgwCoreLib.Lux.Data.DbModel.Stock; using EgwCoreLib.Lux.Data.DbModel.Items; +using EgwCoreLib.Lux.Data.DbModel.Sales; +using EgwCoreLib.Lux.Data.DbModel.Stock; +using EgwCoreLib.Lux.Data.DbModel.Task; +using EgwCoreLib.Lux.Data.DbModel.Utils; +using Microsoft.EntityFrameworkCore; namespace EgwCoreLib.Lux.Data { @@ -23,6 +18,7 @@ namespace EgwCoreLib.Lux.Data /// public static void Seed(this ModelBuilder modelBuilder) { + // inizializzazione dei valori di default x Ruoli/Tags modelBuilder.Entity().HasData( new TagsModel { TagID = 1, Description = "Tag 01" },