This commit is contained in:
2020-05-11 18:32:22 +00:00
parent 7c60ab7473
commit 1e879c6dbc
3 changed files with 134 additions and 95 deletions

View File

@@ -75,28 +75,30 @@ namespace AyaNova.Biz
UnitModel = 32, UnitModel = 32,
[CoreBizObject] [CoreBizObject]
Vendor = 33, Vendor = 33,
//--- WorkOrder
[CoreBizObject] [CoreBizObject]
WorkOrder = 34, WorkOrder = 34,
[CoreBizObject] [CoreBizObject]
WorkOrderItem = 35, WorkOrderItem = 35,
[CoreBizObject] [CoreBizObject]
WorkOrderItemLabor = 36, WorkOrderItemExpense = 36,
[CoreBizObject] [CoreBizObject]
WorkOrderItemPart = 37, WorkOrderItemLabor = 37,
[CoreBizObject] [CoreBizObject]
WorkOrderItemPartRequest = 38, WorkOrderItemLoan = 38,
[CoreBizObject] [CoreBizObject]
WorkOrderItemScheduledUser = 39, WorkOrderItemPart = 39,
[CoreBizObject] [CoreBizObject]
WorkOrderItemExpense = 40, WorkOrderItemPartRequest = 40,
[CoreBizObject] [CoreBizObject]
WorkOrderItemTravel = 41, WorkOrderItemScheduledUser = 41,
[CoreBizObject] [CoreBizObject]
WorkOrderItemTask = 42, WorkOrderItemTask = 42,
[CoreBizObject] [CoreBizObject]
WorkOrderItemLoan = 43, WorkOrderItemTravel = 43,
[CoreBizObject] [CoreBizObject]
WorkOrderItemUnit = 44, WorkOrderItemUnit = 44,
//---
[CoreBizObject] [CoreBizObject]
WorkOrderTemplate = 45, WorkOrderTemplate = 45,
[CoreBizObject] [CoreBizObject]

View File

@@ -113,11 +113,27 @@ namespace AyaNova.Biz
//docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
var ret = var ret =
await ct.WorkOrder await ct.WorkOrder
.Include(w => w.Items)
.ThenInclude(wi => wi.Expenses)
.Include(w => w.Items) .Include(w => w.Items)
.ThenInclude(wi => wi.Labors) .ThenInclude(wi => wi.Labors)
.Include(w => w.Items)
.ThenInclude(wi => wi.Loans)
.Include(w => w.Items) .Include(w => w.Items)
.ThenInclude(wi => wi.Parts) .ThenInclude(wi => wi.Parts)
.Include(w => w.Items)
.ThenInclude(wi => wi.PartRequests)
.Include(w => w.Items)
.ThenInclude(wi => wi.ScheduledUsers)
.Include(w => w.Items)
.ThenInclude(wi => wi.Tasks)
.Include(w => w.Items)
.ThenInclude(wi => wi.Travels)
.Include(w => w.Items)
.ThenInclude(wi => wi.Units)
.SingleOrDefaultAsync(m => m.Id == id); .SingleOrDefaultAsync(m => m.Id == id);
if (logTheGetEvent && ret != null) if (logTheGetEvent && ret != null)
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
return ret; return ret;
@@ -359,8 +375,15 @@ namespace AyaNova.Biz
//docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
var ret = var ret =
await ct.WorkOrderItem await ct.WorkOrderItem
.Include(wi => wi.Expenses)
.Include(wi => wi.Labors) .Include(wi => wi.Labors)
.Include(wi => wi.Loans)
.Include(wi => wi.Parts) .Include(wi => wi.Parts)
.Include(wi => wi.PartRequests)
.Include(wi => wi.ScheduledUsers)
.Include(wi => wi.Tasks)
.Include(wi => wi.Travels)
.Include(wi => wi.Units)
.SingleOrDefaultAsync(m => m.Id == id); .SingleOrDefaultAsync(m => m.Id == id);
if (logTheGetEvent && ret != null) if (logTheGetEvent && ret != null)
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItem, AyaEvent.Retrieved), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItem, AyaEvent.Retrieved), ct);

View File

@@ -29,8 +29,15 @@ namespace AyaNova.Models
{ {
Tags = new List<string>(); Tags = new List<string>();
//dependents //dependents
Expenses = new List<WorkOrderItemExpense>();
Labors = new List<WorkOrderItemLabor>(); Labors = new List<WorkOrderItemLabor>();
Loans = new List<WorkOrderItemLoan>();
Parts = new List<WorkOrderItemPart>(); Parts = new List<WorkOrderItemPart>();
PartRequests = new List<WorkOrderItemPartRequest>();
ScheduledUsers = new List<WorkOrderItemScheduledUser>();
Tasks = new List<WorkOrderItemTask>();
Travels = new List<WorkOrderItemTravel>();
Units = new List<WorkOrderItemUnit>();
} }
public long Id { get; set; } public long Id { get; set; }
public uint ConcurrencyToken { get; set; } public uint ConcurrencyToken { get; set; }
@@ -46,8 +53,15 @@ namespace AyaNova.Models
public WorkOrder WorkOrder { get; set; } public WorkOrder WorkOrder { get; set; }
//dependents //dependents
public List<WorkOrderItemExpense> Expenses { get; set; }
public List<WorkOrderItemLabor> Labors { get; set; } public List<WorkOrderItemLabor> Labors { get; set; }
public List<WorkOrderItemLoan> Loans { get; set; }
public List<WorkOrderItemPart> Parts { get; set; } public List<WorkOrderItemPart> Parts { get; set; }
public List<WorkOrderItemPartRequest> PartRequests { get; set; }
public List<WorkOrderItemScheduledUser> ScheduledUsers { get; set; }
public List<WorkOrderItemTask> Tasks { get; set; }
public List<WorkOrderItemTravel> Travels { get; set; }
public List<WorkOrderItemUnit> Units { get; set; }
}//eoc }//eoc
}//eons }//eons