diff --git a/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs b/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs index 90f039f..751d6df 100644 --- a/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs +++ b/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs @@ -34,7 +34,14 @@ namespace FruitBank.Common.Dtos { get => StockQuantityHistoryExt?.NetWeight; set => StockQuantityHistoryExt!.NetWeight = value; - } + } + + [NotColumn, JsonIgnore, System.Text.Json.Serialization.JsonIgnore] + public bool IsInconsistent + { + get => StockQuantityHistoryExt?.IsInconsistent ?? false; + set => StockQuantityHistoryExt!.IsInconsistent = value; + } [Association(ThisKey = nameof(Id), OtherKey = nameof(StockQuantityHistoryExt.StockQuantityHistoryId), CanBeNull = true)] public StockQuantityHistoryExt? StockQuantityHistoryExt { get; set; } diff --git a/FruitBank.Common/Entities/StockQuantityHistoryExt.cs b/FruitBank.Common/Entities/StockQuantityHistoryExt.cs index c416e6c..20ab928 100644 --- a/FruitBank.Common/Entities/StockQuantityHistoryExt.cs +++ b/FruitBank.Common/Entities/StockQuantityHistoryExt.cs @@ -18,6 +18,7 @@ namespace Mango.Nop.Core.Entities public int StockQuantityHistoryId { get; set; } public double? NetWeightAdjustment { get; set; } public double? NetWeight { get; set; } + public bool IsInconsistent { get; set; } } [Table(Name = FruitBankConstClient.StockQuantityHistoryExtDbTableName)] @@ -31,5 +32,7 @@ namespace Mango.Nop.Core.Entities [Column(DataType = DataType.DecFloat, CanBeNull = true)] public double? NetWeight { get; set; } + + public bool IsInconsistent { get; set; } } } diff --git a/FruitBank.Common/Interfaces/IStockQuantityHistoryDto.cs b/FruitBank.Common/Interfaces/IStockQuantityHistoryDto.cs index 0befd91..b583778 100644 --- a/FruitBank.Common/Interfaces/IStockQuantityHistoryDto.cs +++ b/FruitBank.Common/Interfaces/IStockQuantityHistoryDto.cs @@ -15,6 +15,7 @@ namespace FruitBank.Common.Interfaces public int? StockQuantityHistoryId { get; set; } public double? NetWeightAdjustment { get; set; } public double? NetWeight { get; set; } + public bool IsInconsistent { get; set; } public StockQuantityHistoryExt? StockQuantityHistoryExt { get; set; } } diff --git a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor index 926fc21..a59afca 100644 --- a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor @@ -28,6 +28,7 @@ + diff --git a/FruitBankHybrid.sln b/FruitBankHybrid.sln index 9880a46..c6f9f87 100644 --- a/FruitBankHybrid.sln +++ b/FruitBankHybrid.sln @@ -29,6 +29,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyCode.Blazor.Models.Server EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyCode.Maui.Core", "..\..\..\Aycode\Source\AyCode.Blazor\AyCode.Maui.Core\AyCode.Maui.Core.csproj", "{F7C67754-A59C-C355-2A10-C614F0585627}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + SqlSchemaCompare_Dev_to_Prod.scmp = SqlSchemaCompare_Dev_to_Prod.scmp + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/SqlSchemaCompare_Dev_to_Prod.scmp b/SqlSchemaCompare_Dev_to_Prod.scmp index 477f3a1..779a84c 100644 --- a/SqlSchemaCompare_Dev_to_Prod.scmp +++ b/SqlSchemaCompare_Dev_to_Prod.scmp @@ -3,12 +3,12 @@ 10 - Data Source=195.26.231.218;Initial Catalog=FruitBank_DEV;Integrated Security=False;Persist Security Info=False;User ID=sa;Pooling=False;Trust Server Certificate=True + Data Source=195.26.231.218;Initial Catalog=FruitBank_DEV;Integrated Security=False;Persist Security Info=False;User ID=sa;Password=v6f_?xNfg9N1;Trust Server Certificate=True - Data Source=195.26.231.218;Initial Catalog=FruitBank_PROD;Integrated Security=False;Persist Security Info=False;User ID=sa;Pooling=False;Trust Server Certificate=True + Data Source=195.26.231.218;Initial Catalog=FruitBank_PROD;Integrated Security=False;Persist Security Info=False;User ID=sa;Password=v6f_?xNfg9N1;Trust Server Certificate=True