From 8785d992ab07e641c50d5d867fc5f51603178acc Mon Sep 17 00:00:00 2001
From: Hagernesh <hagernesh@example.com>
Date: Mon, 6 Jul 2026 19:00:04 +0000
Subject: [PATCH] export loading

---
 .../modules/warehouses/warehouse-inventory.service.ts |  2 +-
 .../src/pages/warehouses/LoadingQueuePage.tsx         | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
index f8cc32fe8..bf7139d72 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
@@ -1179,7 +1179,7 @@ export class WarehouseInventoryService {
               ct.container_number       AS "containerNumber",
               COALESCE(cgt.cargo_type_name, b.cargo_free_text) AS "cargoType",
               inv.weight                AS "weight",
-              COALESCE(inv.grn_number, substring(inv.notes FROM 'GRN Number: ([^\\n\\r]+)')) AS "grnNumber",
+              substring(inv.notes FROM 'GRN Number: ([^\\n\\r]+)') AS "grnNumber",
               inv.inspection_status     AS "inspectionStatus",
               inv.status                AS "status",
               wl.wagon_id               AS "wagonId",
diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/LoadingQueuePage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/LoadingQueuePage.tsx
index f80db55f4..652a26863 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/LoadingQueuePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/LoadingQueuePage.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Badge, Button, Card, Group, Tabs, Text } from '@mantine/core';
-import { CreditCard, Eye, Truck } from 'lucide-react';
+import { CreditCard, Eye, Truck, TrainFront } from 'lucide-react';
 import { DataTable, type ColumnDef } from '@edr/ui-common';
 
 import { PageContainer, PageHeader } from '@/components/page';
@@ -10,6 +10,7 @@ import {
   VisualEmptyState,
   formatNumber,
 } from '@/components/warehouses';
+import { LoadToTrainPanel } from '@/components/warehouses/LoadToTrainPanel';
 import { useMutation, useQuery } from '@tanstack/react-query';
 
 import { api } from '@/services/api';
@@ -116,6 +117,9 @@ export default function LoadingQueuePage() {
               >
                 Dispatch Queue
               </Tabs.Tab>
+              <Tabs.Tab value="load-train" leftSection={<TrainFront size={14} />}>
+                Load to Train
+              </Tabs.Tab>
             </Tabs.List>
 
             {/* Ready to Load — PAID bookings, can be marked Loaded */}
@@ -169,6 +173,11 @@ export default function LoadingQueuePage() {
                 <InventoryWorkbench items={loadedItems} isLoading={loadedLoading} />
               )}
             </Tabs.Panel>
+
+            {/* Load to Train — per-train arrived containers/cargoes, multiselect → load onto wagons */}
+            <Tabs.Panel value="load-train" pt="md">
+              <LoadToTrainPanel />
+            </Tabs.Panel>
         </Tabs>
       </Card>
     </PageContainer>