Goods recieved notes and Booking delivery

apps/edr-freight-web/backoffice/src/components/warehouses/InventoryDetailModal.tsx

@@ -23,11 +23,20 @@ function DetailRow({ label, value }: { label: string; value: React.ReactNode })
   );
 }
 
+const noteLineValue = (notes: string | null | undefined, label: string) => {
+  const match = notes?.match(new RegExp(`^${label}:\\s*(.+)$`, 'im'));
+  return match?.[1]?.trim() ?? '';
+};
+
 export function InventoryDetailModal({ opened, onClose, item }: InventoryDetailModalProps) {
   const bookingReference = item?.booking?.reference ?? '-';
+  const handoverReference = item?.handoverDocumentReference ?? noteLineValue(item?.notes, 'Handover Reference');
+  const handoverDate = item?.handoverDocumentDate ?? noteLineValue(item?.notes, 'Generated At');
   const inventorySummary = [
     item?.status?.replace(/_/g, ' '),
+    item?.grnNumber ? `GRN ${item.grnNumber}` : null,
     item?.releaseOrderReference ? `Release ${item.releaseOrderReference}` : null,
+    handoverReference ? `Handover ${handoverReference}` : null,
     item?.warehouse ? `${item.warehouse.name} (${item.warehouse.code})` : null,
   ]
     .filter(Boolean)
@@ -61,11 +70,13 @@ export function InventoryDetailModal({ opened, onClose, item }: InventoryDetailM
           <Divider label="Booking & item" labelPosition="left" />
           <SimpleGrid cols={{ base: 1, sm: 3 }}>
             <DetailRow label="Booking reference" value={bookingReference} />
+            <DetailRow label="GRN" value={item.grnNumber ?? '-'} />
             <DetailRow label="Booking status" value={item.booking?.status ?? '-'} />
             <DetailRow label="Payment status" value={item.booking?.paymentStatus ?? '-'} />
             <DetailRow label="Trade direction" value={item.booking?.tradeDirection ?? '-'} />
             <DetailRow label="Inventory status" value={item.status.replace(/_/g, ' ')} />
             <DetailRow label="Release reference" value={item.releaseOrderReference ?? '-'} />
+            <DetailRow label="Handover reference" value={handoverReference || '-'} />
             <DetailRow label="Quantity" value={formatNumber(item.quantity)} />
             <DetailRow label="Weight" value={`${formatNumber(item.weight)} kg`} />
             <DetailRow label="Volume" value={item.volume == null ? '-' : formatNumber(item.volume)} />
@@ -83,6 +94,7 @@ export function InventoryDetailModal({ opened, onClose, item }: InventoryDetailM
             <DetailRow label="Dispatched" value={formatDate(item.dispatchedAt)} />
             <DetailRow label="Ready for pickup" value={formatDate(item.readyForPickupAt)} />
             <DetailRow label="Released" value={formatDate(item.releaseDate)} />
+            <DetailRow label="Handover generated" value={formatDate(handoverDate)} />
             <DetailRow label="Delivered" value={formatDate(item.deliveredAt)} />
             <DetailRow label="Release reference" value={item.releaseOrderReference ?? '-'} />
           </SimpleGrid>

apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx

@@ -1,4 +1,4 @@
-import { Fragment, useEffect, useMemo, useState } from 'react';
+import { Fragment, useEffect, useMemo, useState, type MouseEvent } from 'react';
 import {
   ActionIcon,
   Alert,
@@ -79,6 +79,45 @@ interface ReceiveInventoryModalProps {
   onReceived?: () => void;
 }
 
+function GrnDocumentButton({ inventoryId, grnNumber }: { inventoryId: string; grnNumber?: string | null }) {
+  const { toast } = useToast();
+  const [loading, setLoading] = useState(false);
+
+  const openDocument = async (event: MouseEvent<HTMLButtonElement>) => {
+    event.stopPropagation();
+    if (!grnNumber) {
+      toast({ variant: 'destructive', title: 'GRN document unavailable', description: 'This item has no GRN number yet.' });
+      return;
+    }
+    setLoading(true);
+    const pdfWindow = window.open('', '_blank');
+    try {
+      const response = await warehouseService.downloadGrnDocument(inventoryId);
+      const opened = openPdfBlob(response.data, `grn-${grnNumber}.pdf`, pdfWindow);
+      toast({ title: opened ? 'GRN document opened' : 'GRN document downloaded' });
+    } catch (error) {
+      pdfWindow?.close();
+      toast({ variant: 'destructive', title: 'GRN document failed', description: extractErrorMessage(error) });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Button
+      size="compact-xs"
+      variant="subtle"
+      color="teal"
+      leftSection={<FileText size={12} />}
+      disabled={!grnNumber}
+      loading={loading}
+      onClick={openDocument}
+    >
+      {grnNumber ?? 'No GRN'}
+    </Button>
+  );
+}
+
 interface Location {
   warehouseId: string;
   yardId: string;
@@ -620,11 +659,13 @@ function EligibleTab({
   const { toast } = useToast();
   const qc = useQueryClient();
   const { data: allRows = [], isLoading } = useQuery(
-    api.warehouses.eligibleBookings.queryOptions({ enabled }),
+    api.warehouses.eligibleBookings.queryOptions({
+      input: { direction },
+      enabled,
+    }),
   );
   const rows = useMemo(() => allRows.filter((r) => r.direction === direction), [allRows, direction]);
   const bulkReceive = useMutation(api.warehouses.bulkReceive.mutationOptions());
-  const loadPassed = useMutation(api.warehouses.loadPassedExport.mutationOptions());
   const requestFirstMile = useMutation({
     mutationFn: (reference: string) => firstMileService.accept(reference),
     onSuccess: () => {
@@ -782,10 +823,24 @@ function EligibleTab({
       return;
     }
     const { form, lockedFields, packagingFreightType: nextPackagingFreightType } = truckEntranceFromBookings(selectedRows);
+    const totalContainerQuantity = selectedRows.reduce(
+      (sum, row) => sum + Number(row.containerQuantity ?? 0),
+      0,
+    );
+    const normalizedForm =
+      nextPackagingFreightType === 'CONTAINER' && totalContainerQuantity > 0
+        ? {
+            ...form,
+            unitCount: totalContainerQuantity,
+          }
+        : form;
     setPendingReceiveIds(filteredIds);
     setReceivedAt(new Date().toISOString());
-    setTruckForm(form);
-    setLockedTruckFields(lockedFields);
+    setTruckForm(normalizedForm);
+    setLockedTruckFields({
+      ...lockedFields,
+      unitCount: nextPackagingFreightType === 'CONTAINER' && totalContainerQuantity > 0,
+    });
     setPackagingFreightType(nextPackagingFreightType);
     setTruckOpen(true);
   };
@@ -798,18 +853,6 @@ function EligibleTab({
     await receiveBookings(pendingReceiveIds, toTruckEntrancePayload(truckForm));
   };
 
-  const loadPassedExport = async () => {
-    try {
-      const r = await loadPassed.mutateAsync(undefined);
-      toast({
-        title: `${r.loadedCount} loaded`,
-        description: r.skippedCount ? `${r.skippedCount} skipped — inspection not passed` : undefined,
-      });
-      onChanged?.();
-    } catch (error) {
-      toast({ variant: 'destructive', title: 'Load failed', description: extractErrorMessage(error) });
-    }
-  };
 
   return (
     <Stack gap="sm" mt="sm">
@@ -828,18 +871,6 @@ function EligibleTab({
           Selected: <b>{selected.size}</b> / {statusFilteredRows.length} eligible
         </Text>
         <Group gap="xs">
-          {direction === 'EXPORT' && (
-            <Button
-              size="compact-sm"
-              variant="light"
-              color="teal"
-              leftSection={<Truck size={14} />}
-              loading={loadPassed.isPending}
-              onClick={loadPassedExport}
-            >
-              Load Passed Export Items
-            </Button>
-          )}
           <Button
             size="compact-sm"
             color={direction === 'EXPORT' ? 'edr-green' : undefined}
@@ -849,7 +880,7 @@ function EligibleTab({
             loading={bulkReceive.isPending}
             onClick={() => openTruckReceive(selected.size > 0 ? [...selected] : selectableRows.map((r) => r.id))}
           >
-            {direction === 'EXPORT' ? 'Receive to Warehouse' : 'Receive All to Warehouse'}
+            {direction === 'EXPORT' ? 'Receive All for Loading' : 'Receive All to Warehouse'}
           </Button>
           <Button
             size="compact-sm"
@@ -858,7 +889,7 @@ function EligibleTab({
             loading={bulkReceive.isPending}
             onClick={() => openTruckReceive([...selected])}
           >
-            Receive Selected
+            {direction === 'EXPORT' ? 'Receive Selected for Loading' : 'Receive Selected'}
           </Button>
         </Group>
       </Group>
@@ -1000,7 +1031,7 @@ function EligibleTab({
                         loading={bulkReceive.isPending}
                         onClick={() => openTruckReceive([r.id])}
                       >
-                        {canReceive ? 'Receive to Warehouse' : 'Await First Mile'}
+                        {canReceive ? (direction === 'EXPORT' ? 'Receive for Loading' : 'Receive to Warehouse') : 'Await First Mile'}
                       </Button>
                     )}
                   </Table.Td>
@@ -1015,7 +1046,7 @@ function EligibleTab({
       <Modal
         opened={truckOpen}
         onClose={() => setTruckOpen(false)}
-        title="Receive to Warehouse"
+        title={direction === 'EXPORT' ? 'Receive for Loading' : 'Receive to Warehouse'}
         centered
         size="lg"
       >
@@ -1175,6 +1206,7 @@ function ExportReceivedTab({ enabled, onChanged }: { enabled: boolean; onChanged
                   />
                 </Table.Th>
                 <Table.Th>Booking Ref</Table.Th>
+                <Table.Th>GRN</Table.Th>
                 <Table.Th>Booking ID</Table.Th>
                 <Table.Th>Customer ID</Table.Th>
                 <Table.Th>Customer Name</Table.Th>
@@ -1201,7 +1233,13 @@ function ExportReceivedTab({ enabled, onChanged }: { enabled: boolean; onChanged
                       />
                     </Table.Td>
                     <Table.Td>
-                      <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                      <Stack gap={2}>
+                        <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                        <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
+                      </Stack>
+                    </Table.Td>
+                    <Table.Td>
+                      <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
                     </Table.Td>
                     <Table.Td>
                       <Text size="xs" c="dimmed">{r.bookingId ? `${r.bookingId.slice(0, 8)}…` : '—'}</Text>
@@ -1322,6 +1360,7 @@ function ReadyToLoadTab({ enabled, onChanged }: { enabled: boolean; onChanged?:
                   />
                 </Table.Th>
                 <Table.Th>Booking Ref</Table.Th>
+                <Table.Th>GRN</Table.Th>
                 <Table.Th>Booking ID</Table.Th>
                 <Table.Th>Customer ID</Table.Th>
                 <Table.Th>Customer Name</Table.Th>
@@ -1344,7 +1383,13 @@ function ReadyToLoadTab({ enabled, onChanged }: { enabled: boolean; onChanged?:
                     />
                   </Table.Td>
                   <Table.Td>
-                    <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                    <Stack gap={2}>
+                      <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                      <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
+                    </Stack>
+                  </Table.Td>
+                  <Table.Td>
+                    <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
                   </Table.Td>
                   <Table.Td>
                     <Text size="xs" c="dimmed">{r.bookingId ? `${r.bookingId.slice(0, 8)}…` : '—'}</Text>
@@ -1492,6 +1537,7 @@ function LoadedExportTab({
                   </Table.Th>
                 )}
                 <Table.Th>Booking Ref</Table.Th>
+                <Table.Th>GRN</Table.Th>
                 <Table.Th>Booking ID</Table.Th>
                 <Table.Th>Customer ID</Table.Th>
                 <Table.Th>Customer Name</Table.Th>
@@ -1516,7 +1562,13 @@ function LoadedExportTab({
                     </Table.Td>
                   )}
                   <Table.Td>
-                    <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                    <Stack gap={2}>
+                      <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                      <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
+                    </Stack>
+                  </Table.Td>
+                  <Table.Td>
+                    <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
                   </Table.Td>
                   <Table.Td>
                     <Text size="xs" c="dimmed">{r.bookingId ? `${r.bookingId.slice(0, 8)}…` : '—'}</Text>
@@ -1866,12 +1918,15 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
       bookingId: row.bookingId,
       quantity: 1,
       weight: Number(row.weight) || 0,
+      grnNumber: row.grnNumber,
       status: row.currentStatus,
       arrivedAt: row.arrivalTime,
       unloadedAt: row.arrivalTime,
       inspectionStatus: row.inspectionStatus,
       releaseDate: row.releaseDate,
       releaseOrderReference: row.releaseOrderReference,
+      handoverDocumentReference: row.handoverDocumentReference,
+      handoverDocumentDate: row.handoverDocumentDate,
       deliveredAt: row.deliveredAt,
       booking: row.bookingId
         ? {
@@ -1902,6 +1957,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
     try {
       const response = await warehouseService.downloadHandoverDocument(row.id);
       openPdfBlob(response.data, `handover-${row.bookingReference ?? row.id}.pdf`, pdfWindow);
+      void qc.invalidateQueries({ queryKey: ['warehouse-inventory'] });
     } catch (error) {
       pdfWindow?.close();
       toast({ variant: 'destructive', title: 'Handover document failed', description: extractErrorMessage(error) });
@@ -1910,6 +1966,20 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
     }
   };
 
+  const openReleaseDocument = async (row: ImportUnloadedItem) => {
+    setBusyId(row.id);
+    const pdfWindow = window.open('', '_blank');
+    try {
+      const response = await warehouseService.downloadReleaseDocument(row.id);
+      openPdfBlob(response.data, `release-${row.bookingReference ?? row.id}.pdf`, pdfWindow);
+    } catch (error) {
+      pdfWindow?.close();
+      toast({ variant: 'destructive', title: 'Exit paper failed', description: extractErrorMessage(error) });
+    } finally {
+      setBusyId(null);
+    }
+  };
+
   return (
     <Stack gap="sm" mt="sm">
       <Group justify="space-between">
@@ -1959,6 +2029,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
                 </Table.Th>
                 <Table.Th>Booking ID</Table.Th>
                 <Table.Th>Booking Ref</Table.Th>
+                <Table.Th>GRN</Table.Th>
                 <Table.Th>Customer ID</Table.Th>
                 <Table.Th>Customer Name</Table.Th>
                 <Table.Th>Arrival Time</Table.Th>
@@ -1987,7 +2058,13 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
                     <Text size="xs" c="dimmed">{r.bookingId ? `${r.bookingId.slice(0, 8)}…` : '—'}</Text>
                   </Table.Td>
                   <Table.Td>
-                    <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                    <Stack gap={2}>
+                      <Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
+                      <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
+                    </Stack>
+                  </Table.Td>
+                  <Table.Td>
+                    <GrnDocumentButton inventoryId={r.id} grnNumber={r.grnNumber} />
                   </Table.Td>
                   <Table.Td>
                     <Text size="xs" c="dimmed">{r.customerId ? `${r.customerId.slice(0, 8)}…` : '—'}</Text>
@@ -2049,7 +2126,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
                             color="yellow"
                             onClick={() => setReleaseItem(toInventoryItem(r))}
                           >
-                            Truck Arrival
+                            {r.releaseOrderReference ? 'Truck Leaving' : 'Truck Arrival'}
                           </Button>
                         </>
                       )}
@@ -2064,6 +2141,18 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
                           Dispatch
                         </Button>
                       )}
+                      {r.currentStatus === 'READY_FOR_PICKUP' && r.releaseDate && (
+                        <Button
+                          size="compact-xs"
+                          variant="light"
+                          color="orange"
+                          leftSection={<FileText size={14} />}
+                          loading={busyId === r.id}
+                          onClick={() => openReleaseDocument(r)}
+                        >
+                          Exit Paper
+                        </Button>
+                      )}
                       {r.currentStatus === 'READY_FOR_PICKUP' && r.releaseDate && (
                         <Button
                           size="compact-xs"
@@ -2082,7 +2171,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
                           leftSection={<FileText size={14} />}
                           onClick={() => openHandoverDocument(r)}
                         >
-                          Handover
+                          {r.handoverDocumentReference ? 'View Handover' : 'Handover'}
                         </Button>
                       )}
                       <Button size="compact-xs" variant="light" color="orange" onClick={() => setInspectId(r.id)}>
@@ -2398,7 +2487,12 @@ function ExportWarehouseTabs({
   onChanged?: () => void;
 }) {
   const [activeTab, setActiveTab] = useState<ExportWarehouseTab>('receive-queue');
-  const { data: eligibleRows = [] } = useQuery(api.warehouses.eligibleBookings.queryOptions({ enabled }));
+  const { data: eligibleRows = [] } = useQuery(
+    api.warehouses.eligibleBookings.queryOptions({
+      input: { direction: 'EXPORT' },
+      enabled,
+    }),
+  );
   const { data: receivedRows = [] } = useQuery(api.warehouses.receivedExport.queryOptions({ enabled }));
   const { data: readyRows = [] } = useQuery(api.warehouses.readyToLoadExport.queryOptions({ enabled }));
   const { data: loadedRows = [] } = useQuery(api.warehouses.loadedExport.queryOptions({ enabled }));

apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Alert, Button, Group, Modal, NumberInput, Select, Stack, Text, TextInput } from '@mantine/core';
+import { Alert, Button, Group, Modal, NumberInput, Select, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
 import { Info, Scale } from 'lucide-react';
 
 import { useMutation } from '@tanstack/react-query';
@@ -46,6 +46,77 @@ const toIsoDateTime = (value: string) => {
   return Number.isNaN(date.getTime()) ? undefined : date.toISOString();
 };
 
+const toLocalDateTimeInput = (value?: string | null) => {
+  if (!value) return '';
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return '';
+  const offsetMs = date.getTimezoneOffset() * 60_000;
+  return new Date(date.getTime() - offsetMs).toISOString().slice(0, 16);
+};
+
+const generateReleaseReference = (item: WarehouseInventoryItem | null) => {
+  const bookingReference = item?.booking?.reference;
+  if (bookingReference) return `REL-${bookingReference.replace(/^BK-?/i, '')}`;
+  if (item?.bookingId) return `REL-${item.bookingId.replace(/-/g, '').slice(0, 8).toUpperCase()}`;
+  return '';
+};
+
+const lineValue = (notes: string | null | undefined, label: string) => {
+  const match = notes?.match(new RegExp(`^${label}:\\s*(.+)$`, 'im'));
+  return match?.[1]?.trim() ?? '';
+};
+
+const lineNumber = (notes: string | null | undefined, label: string): number | '' => {
+  const value = lineValue(notes, label).replace(/\s*kg$/i, '');
+  if (!value) return '';
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : '';
+};
+
+const splitContainerNumbers = (value: string | null | undefined) =>
+  (value ?? '')
+    .split(/[,;\n]+/)
+    .map((number) => number.trim())
+    .filter(Boolean);
+
+const getItemContainerNumber = (item: WarehouseInventoryItem | null) =>
+  (item as (WarehouseInventoryItem & { containerNumber?: string | null }) | null)?.containerNumber ?? '';
+
+const isContainerInventory = (item: WarehouseInventoryItem | null, containerCount: number) => {
+  const freightType = (item as (WarehouseInventoryItem & { booking?: { freightType?: string | null } | null }) | null)
+    ?.booking?.freightType;
+  return Boolean(item?.containerId || containerCount > 0 || freightType === 'CONTAINER');
+};
+
+const initialContainerNumbers = (item: WarehouseInventoryItem | null, savedContainerNumber: string) => {
+  const savedNumbers = splitContainerNumbers(savedContainerNumber);
+  const itemNumbers = splitContainerNumbers(getItemContainerNumber(item));
+  const sourceNumbers = savedNumbers.length ? savedNumbers : itemNumbers;
+  const quantityCount = isContainerInventory(item, sourceNumbers.length) ? Number(item?.quantity ?? 0) : 0;
+  const expectedCount = Math.max(1, sourceNumbers.length, quantityCount);
+  return Array.from({ length: expectedCount }, (_, index) => sourceNumbers[index] ?? '');
+};
+
+const parseInspectionNote = (notes: string | null | undefined) => {
+  const marker = '[Exit Inspection]';
+  const index = notes?.lastIndexOf(marker) ?? -1;
+  const note = index >= 0 ? notes?.slice(index + marker.length) : notes;
+  return {
+    truckPlateNumber: lineValue(note, 'Truck Plate'),
+    trailerPlateNumber: lineValue(note, 'Trailer Plate'),
+    driverName: lineValue(note, 'Driver'),
+    driverLicense: lineValue(note, 'Driver License'),
+    driverPhone: lineValue(note, 'Driver Phone'),
+    truckType: lineValue(note, 'Truck Type'),
+    containerNumber: lineValue(note, 'Container Number'),
+    gateInTime: toLocalDateTimeInput(lineValue(note, 'Gate In Time')),
+    tareWeight: lineNumber(note, 'Tare Weight'),
+    grossWeight: lineNumber(note, 'Gross Weight'),
+    netWeight: lineNumber(note, 'Net Weight'),
+    gateOutTime: toLocalDateTimeInput(lineValue(note, 'Gate Out Time')),
+  };
+};
+
 export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalProps) {
   const { toast } = useToast();
   const releaseMutation = useMutation(api.warehouses.release.mutationOptions());
@@ -56,7 +127,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
   const [driverLicense, setDriverLicense] = useState('');
   const [driverPhone, setDriverPhone] = useState('');
   const [truckType, setTruckType] = useState('');
-  const [containerNumber, setContainerNumber] = useState('');
+  const [containerNumbers, setContainerNumbers] = useState<string[]>(['']);
   const [gateInTime, setGateInTime] = useState('');
   const [tareWeight, setTareWeight] = useState<number | ''>('');
   const [grossWeight, setGrossWeight] = useState<number | ''>('');
@@ -66,26 +137,32 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
 
   useEffect(() => {
     if (opened) {
-      setReference(item?.releaseOrderReference ?? '');
-      setTruckPlateNumber('');
-      setTrailerPlateNumber('');
-      setDriverName('');
-      setDriverLicense('');
-      setDriverPhone('');
-      setTruckType('');
-      setContainerNumber('');
-      setGateInTime('');
-      setTareWeight('');
-      setGrossWeight('');
-      setNetWeight(item?.weight != null ? Number(item.weight) : '');
-      setGateOutTime('');
+      const inspection = parseInspectionNote(item?.notes);
+      setReference(item?.releaseOrderReference ?? generateReleaseReference(item));
+      setTruckPlateNumber(inspection.truckPlateNumber);
+      setTrailerPlateNumber(inspection.trailerPlateNumber);
+      setDriverName(inspection.driverName);
+      setDriverLicense(inspection.driverLicense);
+      setDriverPhone(inspection.driverPhone);
+      setTruckType(inspection.truckType);
+      setContainerNumbers(initialContainerNumbers(item, inspection.containerNumber));
+      setGateInTime(inspection.gateInTime);
+      setTareWeight(inspection.tareWeight);
+      setGrossWeight(inspection.grossWeight);
+      setNetWeight(item?.weight == null ? inspection.netWeight : Number(item.weight));
+      setGateOutTime(inspection.gateOutTime);
     }
   }, [opened, item]);
 
+  const savedInspection = parseInspectionNote(item?.notes);
+  const isExitStep = savedInspection.tareWeight !== '';
+  const isEntranceLocked = isExitStep;
+  const systemNetWeight = item?.weight == null ? netWeight : Number(item.weight);
   const computedNetWeight =
     tareWeight !== '' && grossWeight !== '' ? Number((Number(grossWeight) - Number(tareWeight)).toFixed(3)) : null;
   const weightMismatch =
-    computedNetWeight != null && netWeight !== '' && Math.abs(Number(netWeight) - computedNetWeight) > 0.001;
+    computedNetWeight != null && systemNetWeight !== '' && Math.abs(Number(systemNetWeight) - computedNetWeight) > 0.001;
+  const title = isExitStep ? 'Customer truck leaving and exit weighing' : 'Customer truck arrival weighing';
 
   const handleSubmit = async () => {
     if (!item) return;
@@ -93,11 +170,19 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
       toast({ variant: 'destructive', title: 'Truck plate and driver name are required' });
       return;
     }
-    if (tareWeight === '' || grossWeight === '') {
-      toast({ variant: 'destructive', title: 'Tare and gross weight are required' });
+    if (!gateInTime || tareWeight === '') {
+      toast({ variant: 'destructive', title: 'Gate in time and tare weight are required' });
       return;
     }
-    if (weightMismatch) {
+    if (isExitStep && (!gateOutTime || grossWeight === '')) {
+      toast({ variant: 'destructive', title: 'Gate out time and gross weight are required' });
+      return;
+    }
+    if (isExitStep && systemNetWeight === '') {
+      toast({ variant: 'destructive', title: 'System recorded net weight is missing' });
+      return;
+    }
+    if (isExitStep && weightMismatch) {
       toast({
         variant: 'destructive',
         title: 'Weight mismatch',
@@ -105,7 +190,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
       });
       return;
     }
-    const pdfWindow = window.open('', '_blank');
+    const pdfWindow = isExitStep ? window.open('', '_blank') : null;
     try {
       const released = await releaseMutation.mutateAsync({
         id: item.id,
@@ -119,14 +204,22 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
           driverLicense: driverLicense.trim() || undefined,
           driverPhone: driverPhone.trim() || undefined,
           truckType: truckType.trim() || undefined,
-          containerNumber: containerNumber.trim() || undefined,
+          containerNumber: containerNumbers.map((number) => number.trim()).filter(Boolean).join(', ') || undefined,
           gateInTime: toIsoDateTime(gateInTime),
           tareWeight: Number(tareWeight),
-          grossWeight: Number(grossWeight),
-          netWeight: netWeight === '' ? computedNetWeight ?? undefined : Number(netWeight),
-          gateOutTime: toIsoDateTime(gateOutTime),
+          grossWeight: grossWeight === '' ? undefined : Number(grossWeight),
+          netWeight: isExitStep && systemNetWeight !== '' ? Number(systemNetWeight) : undefined,
+          gateOutTime: isExitStep ? toIsoDateTime(gateOutTime) : undefined,
         },
       });
+      if (!isExitStep) {
+        toast({
+          title: 'Truck arrival saved',
+          description: `${released.releaseOrderReference ?? reference} is ready for exit weighing.`,
+        });
+        onClose();
+        return;
+      }
       setDownloading(true);
       const response = await warehouseService.downloadReleaseDocument(item.id);
       const blob = response.data;
@@ -148,20 +241,27 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
   };
 
   return (
-    <Modal opened={opened} onClose={onClose} title="Customer truck arrival and exit weighing" centered size="lg">
+    <Modal opened={opened} onClose={onClose} title={title} centered size="lg">
       <Stack gap="md">
         <Alert icon={<Info size={16} />} color="orange" variant="light">
-          <Text size="sm">
-            Register the customer truck and driver at arrival, record tare weight, then record gross
-            weight at exit after loading. Gate clearance is blocked when recorded net weight does not
-            equal gross weight minus tare weight.
-          </Text>
+          {isExitStep ? (
+            <Text size="sm">
+              Record the truck leaving time and gross weight. The system recorded net weight is locked,
+              and the exit paper is generated only when it equals gross weight minus tare weight.
+            </Text>
+          ) : (
+            <Text size="sm">
+              Register the customer truck and driver at arrival, then save gate in time and tare weight.
+              Reopen this form when the truck is leaving to complete the exit weighing.
+            </Text>
+          )}
         </Alert>
         <TextInput
           label="Release document reference"
           placeholder="e.g. REL-2026-001"
           value={reference}
           onChange={(e) => setReference(e.currentTarget.value)}
+          readOnly={isEntranceLocked}
         />
         <Select
           label="Registered first / last-mile truck"
@@ -169,6 +269,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
           searchable
           clearable
           data={REGISTERED_FIRST_LAST_MILE_TRUCKS}
+          disabled={isEntranceLocked}
           value={REGISTERED_FIRST_LAST_MILE_TRUCKS.some((truck) => truck.value === truckPlateNumber) ? truckPlateNumber : null}
           onChange={(value) => {
             const truck = REGISTERED_FIRST_LAST_MILE_TRUCKS.find((row) => row.value === value);
@@ -182,35 +283,53 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
             required
             value={truckPlateNumber}
             onChange={(e) => setTruckPlateNumber(e.currentTarget.value)}
+            readOnly={isEntranceLocked}
           />
           <TextInput
             label="Trailer plate number"
             value={trailerPlateNumber}
             onChange={(e) => setTrailerPlateNumber(e.currentTarget.value)}
+            readOnly={isEntranceLocked}
           />
         </Group>
         <Group grow>
-          <TextInput label="Driver name" required value={driverName} onChange={(e) => setDriverName(e.currentTarget.value)} />
-          <TextInput label="Driver license" value={driverLicense} onChange={(e) => setDriverLicense(e.currentTarget.value)} />
+          <TextInput label="Driver name" required value={driverName} onChange={(e) => setDriverName(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Driver license" value={driverLicense} onChange={(e) => setDriverLicense(e.currentTarget.value)} readOnly={isEntranceLocked} />
         </Group>
         <Group grow>
-          <TextInput label="Driver phone" value={driverPhone} onChange={(e) => setDriverPhone(e.currentTarget.value)} />
-          <TextInput label="Truck type" value={truckType} onChange={(e) => setTruckType(e.currentTarget.value)} />
+          <TextInput label="Driver phone" value={driverPhone} onChange={(e) => setDriverPhone(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Truck type" value={truckType} onChange={(e) => setTruckType(e.currentTarget.value)} readOnly={isEntranceLocked} />
         </Group>
         <Group grow>
-          <TextInput label="Container number" value={containerNumber} onChange={(e) => setContainerNumber(e.currentTarget.value)} />
-          <TextInput label="Gate in time" type="datetime-local" value={gateInTime} onChange={(e) => setGateInTime(e.currentTarget.value)} />
+          <Stack gap={6}>
+            <SimpleGrid cols={containerNumbers.length > 1 ? 2 : 1} spacing="sm">
+              {containerNumbers.map((containerNumber, index) => (
+                <TextInput
+                  key={index}
+                  label={containerNumbers.length > 1 ? `Container number ${index + 1}` : 'Container number'}
+                  value={containerNumber}
+                  onChange={(e) =>
+                    setContainerNumbers((numbers) =>
+                      numbers.map((number, numberIndex) => (numberIndex === index ? e.currentTarget.value : number)),
+                    )
+                  }
+                  readOnly={isEntranceLocked}
+                />
+              ))}
+            </SimpleGrid>
+          </Stack>
+          <TextInput label="Gate in time" type="datetime-local" value={gateInTime} onChange={(e) => setGateInTime(e.currentTarget.value)} readOnly={isEntranceLocked} />
         </Group>
         <Group grow>
-          <NumberInput label="Tare weight (kg)" required min={0} value={tareWeight} onChange={(v) => setTareWeight(v === '' ? '' : Number(v))} />
-          <NumberInput label="Gross weight (kg)" required min={0} value={grossWeight} onChange={(v) => setGrossWeight(v === '' ? '' : Number(v))} />
-          <NumberInput label="Recorded net weight (kg)" min={0} value={netWeight} onChange={(v) => setNetWeight(v === '' ? '' : Number(v))} />
+          <NumberInput label="Tare weight (kg)" required min={0} value={tareWeight} onChange={(v) => setTareWeight(v === '' ? '' : Number(v))} readOnly={isEntranceLocked} />
+          <NumberInput label="Gross weight (kg)" required={isExitStep} min={0} value={grossWeight} onChange={(v) => setGrossWeight(v === '' ? '' : Number(v))} disabled={!isExitStep} />
+          <NumberInput label="Recorded net weight (system kg)" min={0} value={systemNetWeight} readOnly />
         </Group>
         <Group justify="space-between">
           <Text size="sm" c={weightMismatch ? 'red' : 'dimmed'}>
             Computed net: <b>{computedNetWeight == null ? '-' : `${computedNetWeight.toLocaleString()} kg`}</b>
           </Text>
-          <TextInput label="Gate out time" type="datetime-local" value={gateOutTime} onChange={(e) => setGateOutTime(e.currentTarget.value)} />
+          <TextInput label="Gate out time" type="datetime-local" value={gateOutTime} onChange={(e) => setGateOutTime(e.currentTarget.value)} disabled={!isExitStep} />
         </Group>
         {weightMismatch && (
           <Alert icon={<Scale size={16} />} color="red" variant="light">
@@ -225,7 +344,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
             Cancel
           </Button>
           <Button color="orange" onClick={handleSubmit} loading={releaseMutation.isPending || downloading}>
-            Save Truck Arrival & View Exit Paper
+            {isExitStep ? 'Save Truck Leaving & View Exit Paper' : 'Save Truck Arrival'}
           </Button>
         </Group>
       </Stack>

apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseInventoryTable.tsx

@@ -1,13 +1,17 @@
+import { useState, type MouseEvent } from 'react';
 import { ActionIcon, Badge, Button, Checkbox, Group, Table, Text, Tooltip } from '@mantine/core';
 import { ArrowRightLeft, ClipboardList, Coins, Eye, FileText, History, MapPin } from 'lucide-react';
 
+import { useToast } from '@/hooks/use-toast';
+import { warehouseService } from '@/services/warehouse.service';
 import {
   getNextInventoryAction,
   type InventoryAction,
   type WarehouseInventoryItem,
 } from '@/types/warehouse';
 import { InventoryStatusBadge } from './badges';
-import { formatDate, formatNumber, humanizeEnum } from './options';
+import { extractErrorMessage, formatDate, formatNumber, humanizeEnum } from './options';
+import { openPdfBlob } from './pdf';
 
 interface WarehouseInventoryTableProps {
   items: WarehouseInventoryItem[];
@@ -46,6 +50,56 @@ const actionColor: Record<InventoryAction, string> = {
   deliver: 'green',
 };
 
+const releaseActionLabel = (item: WarehouseInventoryItem) =>
+  item.releaseOrderReference ? 'Truck Leaving' : 'Truck Arrival';
+
+const noteLineValue = (notes: string | null | undefined, label: string) => {
+  const match = notes?.match(new RegExp(`^${label}:\\s*(.+)$`, 'im'));
+  return match?.[1]?.trim() ?? '';
+};
+
+const handoverDocumentReference = (item: WarehouseInventoryItem) =>
+  item.handoverDocumentReference ?? noteLineValue(item.notes, 'Handover Reference');
+
+function GrnDocumentButton({ item }: { item: WarehouseInventoryItem }) {
+  const { toast } = useToast();
+  const [loading, setLoading] = useState(false);
+
+  const openDocument = async (event: MouseEvent<HTMLButtonElement>) => {
+    event.stopPropagation();
+    if (!item.grnNumber) {
+      toast({ variant: 'destructive', title: 'GRN document unavailable', description: 'This item has no GRN number yet.' });
+      return;
+    }
+    setLoading(true);
+    const pdfWindow = window.open('', '_blank');
+    try {
+      const response = await warehouseService.downloadGrnDocument(item.id);
+      const opened = openPdfBlob(response.data, `grn-${item.grnNumber}.pdf`, pdfWindow);
+      toast({ title: opened ? 'GRN document opened' : 'GRN document downloaded' });
+    } catch (error) {
+      pdfWindow?.close();
+      toast({ variant: 'destructive', title: 'GRN document failed', description: extractErrorMessage(error) });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Button
+      size="compact-xs"
+      variant="subtle"
+      color="teal"
+      leftSection={<FileText size={12} />}
+      disabled={!item.grnNumber}
+      loading={loading}
+      onClick={openDocument}
+    >
+      {item.grnNumber ?? 'No GRN'}
+    </Button>
+  );
+}
+
 export function WarehouseInventoryTable({
   items,
   busyId,
@@ -90,6 +144,7 @@ export function WarehouseInventoryTable({
               </Table.Th>
             )}
             <Table.Th>Booking</Table.Th>
+            <Table.Th>GRN</Table.Th>
             <Table.Th>Facility</Table.Th>
             <Table.Th>Warehouse</Table.Th>
             <Table.Th>Yard</Table.Th>
@@ -111,6 +166,7 @@ export function WarehouseInventoryTable({
               item.inspectionStatus === 'PASSED' &&
               Boolean(item.bookingId) &&
               (!item.booking?.tradeDirection || item.booking.tradeDirection === 'IMPORT');
+            const handoverReference = handoverDocumentReference(item);
 
             return (
               <Table.Tr key={item.id}>
@@ -136,6 +192,9 @@ export function WarehouseInventoryTable({
                     </Text>
                   )}
                 </Table.Td>
+                <Table.Td>
+                  <GrnDocumentButton item={item} />
+                </Table.Td>
                 <Table.Td>{item.warehouse?.facility?.name ?? '-'}</Table.Td>
                 <Table.Td>{item.warehouse?.code ?? '-'}</Table.Td>
                 <Table.Td>{item.yard?.code ?? '-'}</Table.Td>
@@ -170,7 +229,7 @@ export function WarehouseInventoryTable({
                         loading={busy}
                         onClick={() => onAdvance(item, nextAction)}
                       >
-                        {nextAction === 'release' ? 'Truck Arrival' : humanizeEnum(nextAction.replace(/-/g, '_'))}
+                        {nextAction === 'release' ? releaseActionLabel(item) : humanizeEnum(nextAction.replace(/-/g, '_'))}
                       </Button>
                     )}
                     {item.status === 'READY_FOR_PICKUP' && (
@@ -224,7 +283,10 @@ export function WarehouseInventoryTable({
                       </Tooltip>
                     )}
                     {onHandoverDocument && canGenerateHandover && (
-                      <Tooltip label="Generate customer handover document" withArrow>
+                      <Tooltip
+                        label={handoverReference ? `View handover document ${handoverReference}` : 'Generate customer handover document'}
+                        withArrow
+                      >
                         <ActionIcon variant="subtle" color="teal" onClick={() => onHandoverDocument(item)}>
                           <FileText size={16} />
                         </ActionIcon>