diff --git a/.vscode/launch.json b/.vscode/launch.json index 976f60e9..f92c39ec 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -52,7 +52,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index dba4fdec..b5a7aa80 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -177,10 +177,11 @@ namespace AyaNova.Biz { - 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(); + var partInfo = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => new { partViz = x.PartNumber, partNameViz = x.Name, partunitofmeasureviz = x.UnitOfMeasure, partmanufacturernumber = x.ManufacturerNumber }).FirstOrDefaultAsync(); item.PartViz = partInfo.partViz; item.PartNameViz = partInfo.partNameViz; 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(); if (item.WorkOrderItemPartRequestId != null) { diff --git a/server/AyaNova/models/PurchaseOrderItem.cs b/server/AyaNova/models/PurchaseOrderItem.cs index 7e14796d..79eb4fe1 100644 --- a/server/AyaNova/models/PurchaseOrderItem.cs +++ b/server/AyaNova/models/PurchaseOrderItem.cs @@ -27,7 +27,7 @@ namespace AyaNova.Models public DateTime? ReceivedDate { get; set; } public long? PartRequestedById { get; set; } public long? WorkOrderItemPartRequestId { get; set; } - + public long? PurchaseTaxCodeId { get; set; } public string VendorPartNumber { get; set; } public string Serials { get; set; } @@ -41,6 +41,10 @@ namespace AyaNova.Models public string PartViz { get; set; } [NotMapped] public string PartNameViz { get; set; } + [NotMapped] + public string PartManufacturerNumberViz { get; set; } + + [NotMapped] public string PartUnitOfMeasureViz { get; set; } [NotMapped]