diff --git a/server/AyaNova/DataList/PartInventoryDataList.cs b/server/AyaNova/DataList/PartInventoryDataList.cs index fa9f6673..28391d7b 100644 --- a/server/AyaNova/DataList/PartInventoryDataList.cs +++ b/server/AyaNova/DataList/PartInventoryDataList.cs @@ -11,7 +11,7 @@ namespace AyaNova.DataList { DefaultListAType = AyaType.PartInventoryDataList; - SQLFrom = "from vpartinventorylist "; + SQLFrom = "from viewpartinventorylist "; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); diff --git a/server/AyaNova/biz/PartInventoryDataListBiz.cs b/server/AyaNova/biz/PartInventoryDataListBiz.cs index f58b79d2..f5b5dd4e 100644 --- a/server/AyaNova/biz/PartInventoryDataListBiz.cs +++ b/server/AyaNova/biz/PartInventoryDataListBiz.cs @@ -44,7 +44,7 @@ namespace AyaNova.Biz var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE); idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray(); //query for this batch, comes back in db natural order unfortunately - var batchResults = await ct.VPartInventoryList.AsNoTracking().Where(z => batch.Contains(z.PartInventoryId)).ToArrayAsync(); + var batchResults = await ct.ViewPartInventoryList.AsNoTracking().Where(z => batch.Contains(z.PartInventoryId)).ToArrayAsync(); //order the results back into original var orderedList = from id in batch join z in batchResults on id equals z.PartInventoryId select z; @@ -57,7 +57,7 @@ namespace AyaNova.Biz // { // ct.Database.OpenConnection(); - foreach (VPartInventoryList w in orderedList) + foreach (ViewPartInventoryList w in orderedList) { //await PopulateVizFields(w, AyaTypesEnumList, command); var jo = JObject.FromObject(w); diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs index 24a294df..fa1585ac 100644 --- a/server/AyaNova/models/AyContext.cs +++ b/server/AyaNova/models/AyContext.cs @@ -122,7 +122,7 @@ namespace AyaNova.Models // public virtual DbSet ServiceBank { get; set; } public virtual DbSet ViewRestockRequired { get; set; } - public virtual DbSet VPartInventoryList { get; set; } + public virtual DbSet ViewPartInventoryList { get; set; } diff --git a/server/AyaNova/models/VPartInventoryList.cs b/server/AyaNova/models/ViewPartInventoryList.cs similarity index 96% rename from server/AyaNova/models/VPartInventoryList.cs rename to server/AyaNova/models/ViewPartInventoryList.cs index 7c21ac9a..fd615d2c 100644 --- a/server/AyaNova/models/VPartInventoryList.cs +++ b/server/AyaNova/models/ViewPartInventoryList.cs @@ -3,7 +3,7 @@ namespace AyaNova.Models //Note this is how to define a View backed model with no key (id) [Microsoft.EntityFrameworkCore.Keyless] - public class VPartInventoryList + public class ViewPartInventoryList { public long PartId { get; set; } public string PartNumber { get; set; } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index a093f01d..4856884d 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -902,7 +902,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); // + "left join vpartsonorder on (vpartinventorynow.partid = vpartsonorder.partid and vpartinventorynow.partwarehouseid = vpartsonorder.partwarehouseid)"); await ExecQueryAsync( - "CREATE VIEW vpartinventorylist AS select apart.id as partid, apart.partnumber, apart.name as partname, apart.active as partactive, apart.cost as partcost, apart.retail as partretail," + "CREATE VIEW viewpartinventorylist AS select apart.id as partid, apart.partnumber, apart.name as partname, apart.active as partactive, apart.cost as partcost, apart.retail as partretail," +"apartwarehouse.id as partwarehouseid, apartwarehouse.name as partwarehousename, awholesaler.name as wholesalername, awholesaler.id as wholesalerid, " +"aaltwholesaler.id as altwholesalerid, aaltwholesaler.name as altwholesalername, vpartinventorynow.balance as onhandqty,COALESCE(vpartsonorder.quantityonorder,0) as onorderqty, " +"COALESCE(vpartsonordercommitted.quantityonordercommitted,0) as onordercommittedqty,COALESCE(apartstocklevel.minimumquantity,0) as restockminqty, "