From 9bcbb1b4b95d8f629a45a4a8cdadca5187578b85 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 17 Aug 2021 22:23:18 +0000 Subject: [PATCH] --- source/Plugins/AyaNova.Plugin.V8/V8.cs | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs index 867437c..5ae81d8 100644 --- a/source/Plugins/AyaNova.Plugin.V8/V8.cs +++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs @@ -35,7 +35,7 @@ namespace AyaNova.PlugIn.V8 public string PluginVersion { - get { return "7.6.1-alpha.120"; } + get { return "7.6.1-alpha.121"; } } public string About @@ -367,9 +367,10 @@ namespace AyaNova.PlugIn.V8 await ExportTaskGroups(progress); await ExportWorkorderStatus(progress);//item and workorder both as split in v8 await ExportWorkOrderItemPriorities(progress); - await ExportServiceWorkorders(progress); await ExportQuotes(progress); - // await ExportPMs(progress); + await ExportPMs(progress); + await ExportServiceWorkorders(progress); + //todo: fixup pm,quote links on service wo, should I export them first?? //Must be after all root objects due to followups await ExportScheduleMarkers(progress); @@ -2959,8 +2960,8 @@ namespace AyaNova.PlugIn.V8 dwi.notes = "Item " + nSequence.ToString(); dwi.techNotes = wi.TechNotes; dwi.requestDate = util.DateToV8(wi.RequestDate);//allow empty dates if empty source - dwi.workorderItemStatusId = Getv7v8WorkOrderItemStatusIdNullOk(wi.WorkorderStatusID); - dwi.workorderItemPriorityId = Getv7v8IdMapNullOk(wi.PriorityID); + dwi.workOrderItemStatusId = Getv7v8WorkOrderItemStatusIdNullOk(wi.WorkorderStatusID); + dwi.workOrderItemPriorityId = Getv7v8IdMapNullOk(wi.PriorityID); dwi.warrantyService = wi.WarrantyService; @@ -2987,7 +2988,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemUnit " + wi.UnitID.ToString()); dynamic dwiu = new JObject(); dwiu.workOrderId = RavenId; - dwiu.workorderItemId = ravenwoitemid; + dwiu.workOrderItemId = ravenwoitemid; dwiu.unitId = ravUnitId; List wiutags = new List(); TagFromv7Guid(wi.WorkorderItemUnitServiceTypeID, wiutags); @@ -3003,7 +3004,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemScheduledUser " + wisu.ID.ToString()); dynamic dwisu = new JObject(); dwisu.workOrderId = RavenId; - dwisu.workorderItemId = ravenwoitemid; + dwisu.workOrderItemId = ravenwoitemid; //null is ok here for a sched user dwisu.userId = Getv7v8IdMapNullOk(wisu.UserID); dwisu.startDate = util.DateToV8(wisu.StartDate); @@ -3019,7 +3020,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemPart " + wip.ID.ToString()); dynamic dwip = new JObject(); dwip.workOrderId = RavenId; - dwip.workorderItemId = ravenwoitemid; + dwip.workOrderItemId = ravenwoitemid; dwip.quantity = wip.Quantity; var tryPartId = Getv7v8IdMapNullOk(wip.PartID); if (tryPartId == null) @@ -3054,7 +3055,7 @@ namespace AyaNova.PlugIn.V8 JObject v8poitemtoupdate = null; dynamic dwipr = new JObject(); dwipr.workOrderId = RavenId; - dwipr.workorderItemId = ravenwoitemid; + dwipr.workOrderItemId = ravenwoitemid; dwipr.quantity = wipr.Quantity; var tryPartId = Getv7v8IdMapNullOk(wipr.PartID); if (tryPartId == null) @@ -3113,7 +3114,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemLoan " + wil.ID.ToString()); dynamic dwil = new JObject(); dwil.workOrderId = RavenId; - dwil.workorderItemId = ravenwoitemid; + dwil.workOrderItemId = ravenwoitemid; dwil.loanUnitId = Getv7v8IdMap(wil.LoanItemID, "loan unit for workorder"); dwil.outDate = util.DateToV8(wil.OutDate); @@ -3156,7 +3157,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemLabor " + wl.ID.ToString()); dynamic dwl = new JObject(); dwl.workOrderId = RavenId; - dwl.workorderItemId = ravenwoitemid; + dwl.workOrderItemId = ravenwoitemid; //null is ok here for user dwl.userId = Getv7v8IdMapNullOk(wl.UserID); dwl.serviceStartDate = util.DateToV8(wl.ServiceStartDate); @@ -3176,7 +3177,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemTravel " + wt.ID.ToString()); dynamic dwt = new JObject(); dwt.workOrderId = RavenId; - dwt.workorderItemId = ravenwoitemid; + dwt.workOrderItemId = ravenwoitemid; //null is ok here for user dwt.userId = Getv7v8IdMapNullOk(wt.UserID); dwt.travelStartDate = util.DateToV8(wt.TravelStartDate); @@ -3198,7 +3199,7 @@ namespace AyaNova.PlugIn.V8 //var tg = TaskGroup.GetItem(wt.TaskGroupID); dynamic dwt = new JObject(); dwt.workOrderId = RavenId; - dwt.workorderItemId = ravenwoitemid; + dwt.workOrderItemId = ravenwoitemid; dwt.sequence = ++nTaskSequence; var task = AllTasks[wt.TaskID]; dwt.task = task.Name; @@ -3216,7 +3217,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemExpense " + we.ID.ToString()); dynamic dwe = new JObject(); dwe.workOrderId = RavenId; - dwe.workorderItemId = ravenwoitemid; + dwe.workOrderItemId = ravenwoitemid; dwe.description = we.Description; dwe.name = we.Name; dwe.totalCost = we.TotalCost; @@ -3241,7 +3242,7 @@ namespace AyaNova.PlugIn.V8 progress.SubOp("WorkorderItemOutsideService"); dynamic dwio = new JObject(); dwio.workOrderId = RavenId; - dwio.workorderItemId = ravenwoitemid; + dwio.workOrderItemId = ravenwoitemid; dwio.unitId = ravUnitId; dwio.notes = wi.OutsideService.Notes; dwio.vendorSentToId = Getv7v8IdMapNullOk(wi.OutsideService.VendorSentToID); @@ -3492,8 +3493,8 @@ namespace AyaNova.PlugIn.V8 dwi.notes = "Item " + nSequence.ToString(); dwi.techNotes = wi.TechNotes; dwi.requestDate = util.DateToV8(wi.RequestDate);//allow empty dates if empty source - dwi.workorderItemStatusId = Getv7v8WorkOrderItemStatusIdNullOk(wi.WorkorderStatusID); - dwi.workorderItemPriorityId = Getv7v8IdMapNullOk(wi.PriorityID); + dwi.workOrderItemStatusId = Getv7v8WorkOrderItemStatusIdNullOk(wi.WorkorderStatusID); + dwi.workOrderItemPriorityId = Getv7v8IdMapNullOk(wi.PriorityID); dwi.warrantyService = wi.WarrantyService; @@ -3815,8 +3816,8 @@ namespace AyaNova.PlugIn.V8 dwi.notes = "Item " + nSequence.ToString(); dwi.techNotes = wi.TechNotes; dwi.requestDate = util.DateToV8(wi.RequestDate);//allow empty dates if empty source - dwi.workorderItemStatusId = Getv7v8WorkOrderItemStatusIdNullOk(wi.WorkorderStatusID); - dwi.workorderItemPriorityId = Getv7v8IdMapNullOk(wi.PriorityID); + dwi.workOrderItemStatusId = Getv7v8WorkOrderItemStatusIdNullOk(wi.WorkorderStatusID); + dwi.workOrderItemPriorityId = Getv7v8IdMapNullOk(wi.PriorityID); dwi.warrantyService = wi.WarrantyService; @@ -4226,7 +4227,7 @@ namespace AyaNova.PlugIn.V8 d.dateRequested = util.DateToV8(c.Created, true); d.customerId = Getv7v8IdMap(c.ClientID, "Client for CSR"); d.unitId = Getv7v8IdMapNullOk(c.UnitID); - d.workorderItemId = Getv7v8IdMapNullOk(c.WorkorderItemID); + d.workOrderItemId = Getv7v8IdMapNullOk(c.WorkorderItemID); d.requestedByUserId = SafeGetUserMap(c.Creator);//creator should always be a 'outside' user account d.customerReferenceNumber = c.ClientRef; d.priority = (int)c.Priority;//same int value