From fa701f790bce3a53dd3fe5e34c2f55377ba5c8e8 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 17 May 2020 18:56:20 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 71 +++++++++++------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index f5625a8d..0e9f85c7 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2343,64 +2343,64 @@ namespace AyaNova.Biz #region Utility - public ICoreBizObjectModel GetWorkOrderGraphItem(AyaType ayaType, long id) + public async Task GetWorkOrderGraphItem(AyaType ayaType, long id) { switch (ayaType) { case AyaType.WorkOrder: - return (ICoreBizObjectModel)WorkOrderGetAsync(id, false); + return await WorkOrderGetAsync(id, false) as ICoreBizObjectModel; case AyaType.WorkOrderItem: - return (ICoreBizObjectModel)ItemGetAsync(id, false); + return await ItemGetAsync(id, false); case AyaType.WorkOrderItemExpense: - return (ICoreBizObjectModel)ExpenseGetAsync(id, false); + return await ExpenseGetAsync(id, false); case AyaType.WorkOrderItemLabor: - return (ICoreBizObjectModel)LaborGetAsync(id, false); + return await LaborGetAsync(id, false); case AyaType.WorkOrderItemLoan: - return (ICoreBizObjectModel)LoanGetAsync(id, false); + return await LoanGetAsync(id, false); case AyaType.WorkOrderItemPart: - return (ICoreBizObjectModel)PartGetAsync(id, false); + return await PartGetAsync(id, false); case AyaType.WorkOrderItemPartRequest: - return (ICoreBizObjectModel)PartRequestGetAsync(id, false); + return await PartRequestGetAsync(id, false); case AyaType.WorkOrderItemScheduledUser: - return (ICoreBizObjectModel)ScheduledUserGetAsync(id, false); + return await ScheduledUserGetAsync(id, false); case AyaType.WorkOrderItemTask: - return (ICoreBizObjectModel)TaskGetAsync(id, false); + return await TaskGetAsync(id, false); case AyaType.WorkOrderItemTravel: - return (ICoreBizObjectModel)TravelGetAsync(id, false); + return await TravelGetAsync(id, false); case AyaType.WorkOrderItemUnit: - return (ICoreBizObjectModel)UnitGetAsync(id, false); + return await UnitGetAsync(id, false); default: throw new System.ArgumentOutOfRangeException($"WorkOrder::GetWorkOrderGraphItem -> Invalid ayaType{ayaType}"); } } - public ICoreBizObjectModel PutWorkOrderGraphItem(AyaType ayaType, ICoreBizObjectModel o) + public async Task PutWorkOrderGraphItem(AyaType ayaType, ICoreBizObjectModel o) { ClearErrors(); switch (ayaType) { case AyaType.WorkOrder: - return (ICoreBizObjectModel)WorkOrderPutAsync((dtWorkOrder)o); + return await WorkOrderPutAsync((dtWorkOrder)o) as ICoreBizObjectModel; case AyaType.WorkOrderItem: - return (ICoreBizObjectModel)ItemPutAsync((dtWorkOrderItem)o); + return await ItemPutAsync((dtWorkOrderItem)o); case AyaType.WorkOrderItemExpense: - return (ICoreBizObjectModel)ExpensePutAsync((WorkOrderItemExpense)o); + return await ExpensePutAsync((WorkOrderItemExpense)o); case AyaType.WorkOrderItemLabor: - return (ICoreBizObjectModel)LaborPutAsync((WorkOrderItemLabor)o); + return await LaborPutAsync((WorkOrderItemLabor)o); case AyaType.WorkOrderItemLoan: - return (ICoreBizObjectModel)LoanPutAsync((WorkOrderItemLoan)o); + return await LoanPutAsync((WorkOrderItemLoan)o); case AyaType.WorkOrderItemPart: - return (ICoreBizObjectModel)PartPutAsync((WorkOrderItemPart)o); + return await PartPutAsync((WorkOrderItemPart)o); case AyaType.WorkOrderItemPartRequest: - return (ICoreBizObjectModel)PartRequestPutAsync((WorkOrderItemPartRequest)o); + return await PartRequestPutAsync((WorkOrderItemPartRequest)o); case AyaType.WorkOrderItemScheduledUser: - return (ICoreBizObjectModel)ScheduledUserPutAsync((WorkOrderItemScheduledUser)o); + return await ScheduledUserPutAsync((WorkOrderItemScheduledUser)o); case AyaType.WorkOrderItemTask: - return (ICoreBizObjectModel)TaskPutAsync((WorkOrderItemTask)o); + return await TaskPutAsync((WorkOrderItemTask)o); case AyaType.WorkOrderItemTravel: - return (ICoreBizObjectModel)TravelPutAsync((WorkOrderItemTravel)o); + return await TravelPutAsync((WorkOrderItemTravel)o); case AyaType.WorkOrderItemUnit: - return (ICoreBizObjectModel)UnitPutAsync((WorkOrderItemUnit)o); + return await UnitPutAsync((WorkOrderItemUnit)o); default: throw new System.ArgumentOutOfRangeException($"WorkOrder::PutWorkOrderGraphItem -> Invalid ayaType{ayaType}"); } @@ -2444,26 +2444,7 @@ namespace AyaNova.Biz { SaveIt = false; ClearErrors(); - ICoreBizObjectModel o = null; - switch (job.ObjectType) - { - case AyaType.WorkOrder: - o = (ICoreBizObjectModel)WorkOrderGetAsync(id, false); - break; - case AyaType.WorkOrderItem: - case AyaType.WorkOrderItemExpense: - case AyaType.WorkOrderItemLabor: - case AyaType.WorkOrderItemLoan: - case AyaType.WorkOrderItemPart: - case AyaType.WorkOrderItemPartRequest: - case AyaType.WorkOrderItemScheduledUser: - case AyaType.WorkOrderItemTask: - case AyaType.WorkOrderItemTravel: - case AyaType.WorkOrderItemUnit: - - } - - // var o = await GetAsync(id, false); + ICoreBizObjectModel o = await GetWorkOrderGraphItem(job.ObjectType, id); switch (job.SubType) { case JobSubType.TagAddAny: @@ -2479,7 +2460,7 @@ namespace AyaNova.Biz } if (SaveIt) { - // o = await PutAsync(o); + o = await PutWorkOrderGraphItem(job.ObjectType, o); if (o == null) await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}", ct); else