From c1cf1086fbdfe1d317d326909aebc616f052e6d0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 25 Jan 2021 20:02:44 +0000 Subject: [PATCH] --- docs/8.0/ayanova/docs/form-inv-part-serials.md | 3 +++ docs/8.0/ayanova/docs/form-inv-part-stock-levels.md | 3 +++ docs/8.0/ayanova/mkdocs.yml | 2 ++ server/AyaNova/biz/PartBiz.cs | 10 +++++----- server/AyaNova/util/AySchema.cs | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 docs/8.0/ayanova/docs/form-inv-part-serials.md create mode 100644 docs/8.0/ayanova/docs/form-inv-part-stock-levels.md diff --git a/docs/8.0/ayanova/docs/form-inv-part-serials.md b/docs/8.0/ayanova/docs/form-inv-part-serials.md new file mode 100644 index 00000000..3a495ced --- /dev/null +++ b/docs/8.0/ayanova/docs/form-inv-part-serials.md @@ -0,0 +1,3 @@ +# INV-PART-SERIALS Placeholder + +This is a placeholder page for sections that are not written yet diff --git a/docs/8.0/ayanova/docs/form-inv-part-stock-levels.md b/docs/8.0/ayanova/docs/form-inv-part-stock-levels.md new file mode 100644 index 00000000..727ab1ef --- /dev/null +++ b/docs/8.0/ayanova/docs/form-inv-part-stock-levels.md @@ -0,0 +1,3 @@ +# INV-PART-STOCK-LEVELS Placeholder + +This is a placeholder page for sections that are not written yet diff --git a/docs/8.0/ayanova/mkdocs.yml b/docs/8.0/ayanova/mkdocs.yml index 30544b22..dfe39237 100644 --- a/docs/8.0/ayanova/mkdocs.yml +++ b/docs/8.0/ayanova/mkdocs.yml @@ -61,6 +61,8 @@ nav: - Inventory: - 'Parts': 'form-inv-parts.md' - 'Part warehouses': 'form-inv-part-warehouses.md' + - 'Part serial numbers': 'form-inv-part-serials.md' + - 'Part stock levels': 'form-inv-part-stock-levels.md' - 'Part assemblies': 'form-inv-part-assemblies.md' - 'Part inventory': 'form-inv-part-inventory.md' - 'Part requests': 'form-inv-part-requests.md' diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs index ac8bff4e..44dcb2ea 100644 --- a/server/AyaNova/biz/PartBiz.cs +++ b/server/AyaNova/biz/PartBiz.cs @@ -236,7 +236,7 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //UPDATE STOCK LEVELS // - internal async Task> PutStockLevelsAsync(long id, List putPartStockLevels) + internal async Task> PutStockLevelsAsync(long id, List putPartStockLevels) { //Fixup serials @@ -247,7 +247,7 @@ namespace AyaNova.Biz //Remove any that should not be there anymore foreach (PartStockLevel existingPS in ExistingStockLevels) { - if (!putPartStockLevels.Any(z => z.PartWarehouseId==existingPS.PartWarehouseId)) + if (!putPartStockLevels.Any(z => z.PartWarehouseId == existingPS.PartWarehouseId)) { //no longer in the collection so ditch it ct.PartStockLevel.Remove(existingPS); @@ -258,7 +258,7 @@ namespace AyaNova.Biz //Add any new ones foreach (PartStockLevel putPS in putPartStockLevels) { - if (!ExistingStockLevels.Any(z => z.PartWarehouseId==putPS.PartWarehouseId)) + if (!ExistingStockLevels.Any(z => z.PartWarehouseId == putPS.PartWarehouseId)) { ct.PartStockLevel.Add(new PartStockLevel() { PartWarehouseId = putPS.PartWarehouseId, PartId = id }); nAdded++; @@ -279,9 +279,9 @@ namespace AyaNova.Biz return null; } - await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Modified, $"LT:PartSerialNumbersAvailable change (+{nAdded}, -{nRemoved})"), ct); + await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Modified, $"LT:PartStockingLevels change (+{nAdded}, -{nRemoved})"), ct); - return await ct.PartSerial.Where(z => z.PartId == id).OrderBy(z => z.Serial).Select(z => z.Serial).ToListAsync(); + return await ct.PartStockLevel.AsNoTracking().Where(z => z.PartId == id).OrderBy(z => z.PartWarehouseId).ToListAsync(); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index c6d91784..b4e3cbce 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,8 +22,8 @@ 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 = 700; - internal const long EXPECTED_INDEX_COUNT = 122; + internal const long EXPECTED_COLUMN_COUNT = 704; + internal const long EXPECTED_INDEX_COUNT = 124; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!