diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
index edacdf3..df72483 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
@@ -1413,7 +1413,7 @@ open fun getCompletedJobOrderPickOrderLotDetails(pickOrderId: Long): List<Map<St
             AND (spl.pickOrderLineId IS NOT NULL OR sol.pickOrderLineId IS NOT NULL)
             ORDER BY 
                 CASE WHEN sol.status = 'rejected' THEN 0 ELSE 1 END,
-                COALESCE(w.order, 999999) ASC, 
+                COALESCE(w.`order`, 999999) ASC, 
                 po.code ASC,
                 i.code ASC,
                 il.expiryDate ASC, 
@@ -1537,10 +1537,10 @@ open fun getCompletedJobOrderPickOrderLotDetailsForCompletedPick(pickOrderId: Lo
                 COALESCE(uc.udfudesc, 'N/A') as stockUnit,   
                 
                 -- Router Information
-                w.id as routerId
-                w.order as routerIndex
-                w.code as routerRoute
-                w.code as routerArea
+                w.id as routerId,
+                w.order as routerIndex,
+                w.code as routerRoute,
+                w.code as routerArea,
                 
                 -- Set quantities to NULL for rejected lots
                 CASE 
@@ -1624,7 +1624,7 @@ open fun getCompletedJobOrderPickOrderLotDetailsForCompletedPick(pickOrderId: Lo
             AND (spl.pickOrderLineId IS NOT NULL OR sol.pickOrderLineId IS NOT NULL)
             ORDER BY 
                 CASE WHEN sol.status = 'rejected' THEN 0 ELSE 1 END,
-                COALESCE(w.order, 999999) ASC, 
+                COALESCE(w.`order`, 999999) ASC, 
                 po.code ASC,
                 i.code ASC,
                 il.expiryDate ASC, 
diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
index a75eb0c..3cf6a4b 100644
--- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
@@ -4047,7 +4047,7 @@ open fun getLotDetailsByPickOrderId(pickOrderId: Long): List<Map<String, Any>> {
         AND (spl.pickOrderLineId IS NOT NULL OR sol.pickOrderLineId IS NOT NULL)
         ORDER BY 
             CASE WHEN sol.status = 'rejected' THEN 0 ELSE 1 END, -- Show rejected lots first
-            COALESCE(w.order, 999999) ASC,
+            COALESCE(w.`order`, 999999) ASC,
             po.code ASC,
             i.code ASC,
             il.expiryDate ASC,