From b9313439f634bde9f8cb4fb304bba9dd7a163e3e Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 29 Apr 2021 15:57:09 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/WorkOrderBiz.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index c1f60bbf..57099d6c 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -153,7 +153,7 @@ namespace AyaNova.Biz
             var ret =
             await ct.WorkOrder.AsNoTracking()
             .Include(s => s.States)
-            .Include(w => w.Items)
+            .Include(w => w.Items.OrderBy(item=>item.Sequence))
                 .ThenInclude(wi => wi.Expenses)
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.Labors)
@@ -506,7 +506,7 @@ namespace AyaNova.Biz
                 idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray();
                 List<WorkOrder> batchResults = new List<WorkOrder>();
                 foreach (long batchId in batch)
-                    batchResults.Add(await WorkOrderGetAsync(batchId, false));
+                    batchResults.Add(await WorkOrderGetAsync(batchId, true, false));
 
                 //order the results back into original
                 var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
@@ -514,7 +514,8 @@ namespace AyaNova.Biz
                 foreach (WorkOrder w in orderedList)
                 {
                     //populate entire workorder graph
-                    await WorkOrderPopulateVizFields(w);
+                   //await WorkOrderPopulateVizFields(w);
+                   //this is done by the initial fetch now
 
 
                     var jo = JObject.FromObject(w);