From 25c3ea4bf4e87165eb4809298867de5f3a641ef8 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 13 Sep 2021 20:13:51 +0000 Subject: [PATCH] --- server/AyaNova/biz/PurchaseOrderBiz.cs | 7 ++++--- server/AyaNova/models/PurchaseOrderItem.cs | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index 0cb77b3e..ce51ef44 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -164,8 +164,8 @@ namespace AyaNova.Biz po.VendorContactViz = vnd.Contact; po.VendorContactNotesViz = vnd.ContactNotes; - po.VendorPopUpNotesViz=vnd.PopUpNotes; - po.VendorAccountNumberViz=vnd.AccountNumber; + po.VendorPopUpNotesViz = vnd.PopUpNotes; + po.VendorAccountNumberViz = vnd.AccountNumber; } @@ -176,9 +176,10 @@ namespace AyaNova.Biz { - var partInfo = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => new { partViz = x.PartNumber, partNameViz = x.Name }).FirstOrDefaultAsync(); + var partInfo = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => new { partViz = x.PartNumber, partNameViz = x.Name, partunitofmeasureviz = x.UnitOfMeasure }).FirstOrDefaultAsync(); item.PartViz = partInfo.partViz; item.PartNameViz = partInfo.partNameViz; + item.PartUnitOfMeasureViz = partInfo.partunitofmeasureviz; item.WarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == item.PartWarehouseId).Select(x => x.Name).FirstOrDefaultAsync(); if (item.WorkOrderItemPartRequestId != null) { diff --git a/server/AyaNova/models/PurchaseOrderItem.cs b/server/AyaNova/models/PurchaseOrderItem.cs index f65c79e2..7e14796d 100644 --- a/server/AyaNova/models/PurchaseOrderItem.cs +++ b/server/AyaNova/models/PurchaseOrderItem.cs @@ -42,6 +42,8 @@ namespace AyaNova.Models [NotMapped] public string PartNameViz { get; set; } [NotMapped] + public string PartUnitOfMeasureViz { get; set; } + [NotMapped] public string WarehouseViz { get; set; } [NotMapped] public string PartRequestedByViz { get; set; }//DisplayRequestUser