From f46d83e0aa180e1a8f3285f02123a20cf35aef2f Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 28 Feb 2023 17:24:57 +0100 Subject: [PATCH] fix gestione descrizioni location in itemdetails --- StockMan.CORE/Components/Movimenti.razor | 4 ++-- StockMan.Data/Controllers/StoManController.cs | 2 ++ StockMan.Data/DbModels/ItemFluxModel.cs | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/StockMan.CORE/Components/Movimenti.razor b/StockMan.CORE/Components/Movimenti.razor index 746f039..0b169d2 100644 --- a/StockMan.CORE/Components/Movimenti.razor +++ b/StockMan.CORE/Components/Movimenti.razor @@ -36,10 +36,10 @@ @flux.DtMov.Date.ToString("yyyy/MM/dd") - @flux.LocationId + @flux.Location.Descr - @flux.ExtLocationId + @flux.ExtLocation.Descr @if (flux.Qta > 0) { diff --git a/StockMan.Data/Controllers/StoManController.cs b/StockMan.Data/Controllers/StoManController.cs index 5117b08..a5f2ba5 100644 --- a/StockMan.Data/Controllers/StoManController.cs +++ b/StockMan.Data/Controllers/StoManController.cs @@ -726,6 +726,8 @@ namespace StockMan.Data.Controllers { dbResult = localDbCtx .DbSetItemFlux + .Include(l=>l.Location) + .Include(e=>e.ExtLocation) .Where(x => x.ItemId == id) .OrderByDescending(x => x.Id) .ToList(); diff --git a/StockMan.Data/DbModels/ItemFluxModel.cs b/StockMan.Data/DbModels/ItemFluxModel.cs index 863bd96..6fc3919 100644 --- a/StockMan.Data/DbModels/ItemFluxModel.cs +++ b/StockMan.Data/DbModels/ItemFluxModel.cs @@ -37,8 +37,10 @@ namespace StockMan.Data.DbModels public DateTime? DtExport { get; set; } public string ModOperatorId { get; set; } = null!; + [ForeignKey("ExtLocationId")] public virtual LocationModel ExtLocation { get; set; } = null!; public virtual ItemModel Item { get; set; } = null!; + [ForeignKey("LocationId")] public virtual LocationModel Location { get; set; } = null!; public virtual OperatorModel ModOperator { get; set; } = null!; public virtual MovTypeModel MovType { get; set; } = null!;