This commit is contained in:
2021-08-26 18:27:22 +00:00
parent 3700509925
commit 7354e63056
5 changed files with 23 additions and 31 deletions

2
.vscode/launch.json vendored
View File

@@ -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\\"

View File

@@ -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;
}
}

View File

@@ -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

View File

@@ -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

View File

@@ -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<string> Tags { get; set; } = new List<string>();