diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index f230cdb1..61f66f71 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -535,6 +535,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "PurchaseOrderItemVendorPartNumber", FieldKey = "Items.VendorPartNumber" }); l.Add(new FormField { TKey = "PurchaseOrderItemSerialNumbers", FieldKey = "Items.Serials" }); l.Add(new FormField { TKey = "PartDescription", FieldKey = "Items.PartDescription" }); + l.Add(new FormField { TKey = "PartUPC", FieldKey = "Items.PartUPC" }); l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "Items.PartUnitOfMeasureViz" }); l.Add(new FormField { TKey = "PurchaseOrderCustom1", FieldKey = "PurchaseOrderCustom1", IsCustomField = true }); @@ -961,7 +962,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartID", FieldKey = "WorkOrderItemPartRequestPartID", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartWarehouseID", FieldKey = "WorkOrderItemPartRequestPartWarehouseID", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestQuantity", FieldKey = "WorkOrderItemPartRequestQuantity", TKeySection = "WorkOrderItemPartRequests" }); - l.Add(new FormField { TKey = "PartDescription", FieldKey = "PartRequestPartDescription", TKeySection = "WorkOrderItemPartRequests" }); + l.Add(new FormField { TKey = "PartDescription", FieldKey = "PartRequestPartDescription", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartRequestPartUPC", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests" }); @@ -1496,7 +1497,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "PurchaseOrderItemSerialNumbers", FieldKey = "WorkOrderItemPartSerials", TKeySection = "WorkOrderItemParts" }); l.Add(new FormField { TKey = "WorkOrderItemPartPartID", FieldKey = "WorkOrderItemPartPartID", TKeySection = "WorkOrderItemParts" }); l.Add(new FormField { TKey = "WorkOrderItemPartPartWarehouseID", FieldKey = "WorkOrderItemPartPartWarehouseID", TKeySection = "WorkOrderItemParts" }); - l.Add(new FormField { TKey = "WorkOrderItemPartQuantity", FieldKey = "WorkOrderItemPartQuantity", TKeySection = "WorkOrderItemParts" }); + l.Add(new FormField { TKey = "WorkOrderItemPartQuantity", FieldKey = "WorkOrderItemPartQuantity", TKeySection = "WorkOrderItemParts" }); l.Add(new FormField { TKey = "WorkOrderItemPartSuggestedQuantity", FieldKey = "WorkOrderItemPartSuggestedQuantity", TKeySection = "WorkOrderItemParts" }); l.Add(new FormField { TKey = "WorkOrderItemPartTaxPartSaleID", FieldKey = "WorkOrderItemPartTaxPartSaleID", TKeySection = "WorkOrderItemParts" }); l.Add(new FormField { TKey = "PartDescription", FieldKey = "PartDescription", TKeySection = "WorkOrderItemParts" }); diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index a6abe49a..a29d550f 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -180,9 +180,10 @@ namespace AyaNova.Biz { - var partInfo = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => new { partViz = x.Description, partNameViz = x.Name, partunitofmeasureviz = x.UnitOfMeasure, partmanufacturernumber = x.ManufacturerNumber }).FirstOrDefaultAsync(); + var partInfo = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => new { partViz = x.Description, partNameViz = x.Name, partUPCViz=x.UPC, partunitofmeasureviz = x.UnitOfMeasure, partmanufacturernumber = x.ManufacturerNumber }).FirstOrDefaultAsync(); item.PartDescriptionViz = partInfo.partViz; item.PartNameViz = partInfo.partNameViz; + item.UpcViz=partInfo.partUPCViz; item.PartUnitOfMeasureViz = partInfo.partunitofmeasureviz; item.PartManufacturerNumberViz = partInfo.partmanufacturernumber; item.WarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == item.PartWarehouseId).Select(x => x.Name).FirstOrDefaultAsync(); diff --git a/server/AyaNova/models/PurchaseOrderItem.cs b/server/AyaNova/models/PurchaseOrderItem.cs index ff1fcb1b..d35e015a 100644 --- a/server/AyaNova/models/PurchaseOrderItem.cs +++ b/server/AyaNova/models/PurchaseOrderItem.cs @@ -42,6 +42,8 @@ namespace AyaNova.Models public string PartNameViz { get; set; } [NotMapped] public string PartDescriptionViz { get; set; } + [NotMapped] + public string UpcViz { get; set; } [NotMapped] public string PartManufacturerNumberViz { get; set; }