From f6f2d901f86b3e1672a67f61cb452ac900c03d46 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 26 Feb 2021 21:09:12 +0000 Subject: [PATCH] --- server/AyaNova/DataList/PartRestockDataList.cs | 6 +++--- server/AyaNova/util/AySchema.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/DataList/PartRestockDataList.cs b/server/AyaNova/DataList/PartRestockDataList.cs index 94bb582b..298808b1 100644 --- a/server/AyaNova/DataList/PartRestockDataList.cs +++ b/server/AyaNova/DataList/PartRestockDataList.cs @@ -7,7 +7,7 @@ namespace AyaNova.DataList //NOTE: this object has NO rowid as it's a synthetic list not primarily based on any particular db table public PartRestockDataList() { - + // SELECT apart.id AS partid, apartwarehouse.id AS partwarehouseid, apart.partnumber, apartwarehouse.name AS displaywarehouse, " // + "amanufacturer.id AS manufactureid, amanufacturer.name AS displaymanufacturer, awholesaler.id AS wholesalerid, awholesaler.name AS displaywholesaler, " // + "aalternativewholesaler.id AS alternativewholesalerid, aalternativewholesaler.name AS displayalternativewholesaler," @@ -18,8 +18,8 @@ namespace AyaNova.DataList SQLFrom = "FROM vrestockrequired"; var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { - "PartPartNumber", "PartWarehouseName", Vendor,manufac,whlsl "PartByWarehouseInventoryMinStockLevel", + DefaultColumns = new List() { + "PartPartNumber", "PartWarehouseName", "PartWholesalerID","PartAlternativeWholesalerID","PartManufacturerID", "PartByWarehouseInventoryMinStockLevel", "PartInventoryBalance", "PartByWarehouseInventoryQuantityOnOrder", "PartByWarehouseInventoryReorderQuantity", "PartRestocktags" }; DefaultSortBy = new Dictionary() { { "PartRestockname", "+" } }; diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 4a8e2f33..51828cf3 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 15; - internal const long EXPECTED_COLUMN_COUNT = 747; + internal const long EXPECTED_COLUMN_COUNT = 753; internal const long EXPECTED_INDEX_COUNT = 125; internal const long EXPECTED_CHECK_CONSTRAINTS = 328; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 70;