From 7354e63056980d4e2ae26a4893d693a276335b52 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 26 Aug 2021 18:27:22 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/PurchaseOrderBiz.cs | 5 ++- server/AyaNova/models/PurchaseOrderItem.cs | 3 +- server/AyaNova/models/ViewPartRequestList.cs | 8 ++--- .../models/WorkOrderItemPartRequest.cs | 36 +++++++------------ 5 files changed, 23 insertions(+), 31 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index fcc80a75..b77f3b95 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,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 61414f2b..2bed0348 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -62,6 +62,7 @@ namespace AyaNova.Biz return null; } await ct.SaveChangesAsync(); + await PostSaveBizActionsAsync(AyaEvent.Created, newObject, null, transaction); await transaction.CommitAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct); await SearchIndexAsync(newObject, true); @@ -259,6 +260,7 @@ namespace AyaNova.Biz try { await ct.SaveChangesAsync(); + await PostSaveBizActionsAsync(AyaEvent.Modified, putObject, dbObject, transaction); await transaction.CommitAsync(); } catch (DbUpdateConcurrencyException) @@ -302,6 +304,7 @@ namespace AyaNova.Biz return false; } await ct.SaveChangesAsync(); + await PostSaveBizActionsAsync(AyaEvent.Deleted, null, dbObject, transaction); await transaction.CommitAsync(); await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObject.Id, dbObject.Serial.ToString(), ct); await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, BizType, ct); @@ -589,7 +592,7 @@ namespace AyaNova.Biz var w = await ct.WorkOrderItemPartRequest.FirstOrDefaultAsync(x => x.Id == newItem.WorkOrderItemPartRequestId); if (w != null) { - w.PurchaseOrderItemId = newItem.Id; + w.PurchaseOrderItemId = newItem.Id;//nope, no id here fuck..... w.Received = newItem.QuantityReceived; } } diff --git a/server/AyaNova/models/PurchaseOrderItem.cs b/server/AyaNova/models/PurchaseOrderItem.cs index 3d346e99..f65c79e2 100644 --- a/server/AyaNova/models/PurchaseOrderItem.cs +++ b/server/AyaNova/models/PurchaseOrderItem.cs @@ -27,6 +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; } @@ -57,7 +58,7 @@ namespace AyaNova.Models public decimal TaxBViz { get; set; }//DisplayTaxB [NotMapped] public decimal LineTotalViz { get; set; }//DisplayLineTotal - + diff --git a/server/AyaNova/models/ViewPartRequestList.cs b/server/AyaNova/models/ViewPartRequestList.cs index 5d95fe03..c1d889c4 100644 --- a/server/AyaNova/models/ViewPartRequestList.cs +++ b/server/AyaNova/models/ViewPartRequestList.cs @@ -7,18 +7,18 @@ namespace AyaNova.Models { public long RequestId { get; set; } public long PartId { get; set; } - public long PartWarehouseId { get; set; } + public long? PartWarehouseId { get; set; } public decimal Quantity { get; set; } public long Serial { get; set; } public string PartNumber { get; set; } public string PartName { get; set; } public string PartWarehouseName { get; set; } - public long WholesalerId { get; set; } + public long? WholesalerId { get; set; } public string WholesalerName { get; set; } - public long AltWholesalerId { get; set; } + public long? AltWholesalerId { get; set; } public string AltWholesalerName { get; set; } public string RequestedByUserName { get; set; } - public long RequestedByUserId { get; set; } + public long? RequestedByUserId { get; set; } }//eoc }//eons diff --git a/server/AyaNova/models/WorkOrderItemPartRequest.cs b/server/AyaNova/models/WorkOrderItemPartRequest.cs index f1adb6c9..f15e43f7 100644 --- a/server/AyaNova/models/WorkOrderItemPartRequest.cs +++ b/server/AyaNova/models/WorkOrderItemPartRequest.cs @@ -12,24 +12,23 @@ namespace AyaNova.Models public long Id { get; set; } public uint Concurrency { get; set; } - + [Required] + public long WorkOrderItemId { get; set; } [Required] public long PartId { get; set; } - [NotMapped] - public string PartViz { get; set; } - [NotMapped] - public string UpcViz { get; set; } [Required] public long PartWarehouseId { get; set; } - [NotMapped] - public string PartWarehouseViz { get; set; } [Required] public decimal Quantity { get; set; } - - public long? RequestedByUserId { get; set; } - [NotMapped] - public string RequestedByUserViz { get; set; } public long? PurchaseOrderItemId { get; set; } + public long? RequestedByUserId { get; set; } + [Required] + public decimal Received { get; set; } + + + + [NotMapped] + public string RequestedByUserViz { get; set; } [NotMapped] public string PurchaseOrderViz { get; set; } [NotMapped] @@ -38,23 +37,12 @@ namespace AyaNova.Models public DateTime? PurchaseOrderDateViz { get; set; } [NotMapped] public DateTime? PurchaseOrderExpectedDateViz { get; set; } - - //redundant; the poid suffices - // [NotMapped] - // public bool PurchaseOrderOnOrderViz { get; set; } - - [Required] - public decimal Received { get; set; } - - - [Required] - public long WorkOrderItemId { get; set; } + [NotMapped] + public string PartWarehouseViz { get; set; } [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemPartRequest; } - //workaround for notification [NotMapped, JsonIgnore] public List Tags { get; set; } = new List();