Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha

2026-08-27 00:52:50 +00:00 · 2026-06-27 04:28:48 +03:00
parent 8678258157 503dd760ad
commit d86cfa43ea
25 changed files with 1385 additions and 124 deletions
--- a/apps/edr-freight-api/src/contracts/contract-pdf.service.ts
+++ b/apps/edr-freight-api/src/contracts/contract-pdf.service.ts
@@ -80,8 +80,15 @@ export class ContractPdfService {
      this.logger.error(
        `Puppeteer PDF failed (executable=${executablePath ?? 'default'}): ${err}`,
      );
+      const fallback = this.htmlToBasicPdfBuffer(preparedHtml);
+      if (this.isValidPdf(fallback)) {
+        this.logger.warn(
+          `Using basic PDF fallback (${fallback.length} bytes). Install Chromium or set PUPPETEER_EXECUTABLE_PATH for full layout rendering.`,
+        );
+        return fallback;
+      }
      throw new InternalServerErrorException(
-        'Contract PDF could not be generated. Ensure Chromium is installed or set PUPPETEER_EXECUTABLE_PATH.',
+        'PDF could not be generated. Ensure Chromium is installed or set PUPPETEER_EXECUTABLE_PATH.',
      );
    }
  }
@@ -113,4 +120,85 @@ export class ContractPdfService {
      buffer.subarray(0, 5).toString('ascii') === '%PDF-'
    );
  }
+
+  private htmlToBasicPdfBuffer(html: string): Buffer {
+    const text = this.htmlToPlainText(html);
+    const lines = this.wrapLines(text, 92).slice(0, 72);
+    const body = lines
+      .map((line, index) => {
+        const prefix = index === 0 ? '50 790 Td' : '0 -12 Td';
+        return `${prefix} (${this.escapePdfText(line)}) Tj`;
+      })
+      .join('\n');
+    const stream = `BT\n/F1 10 Tf\n12 TL\n${body}\nET`;
+
+    const objects = [
+      '<< /Type /Catalog /Pages 2 0 R >>',
+      '<< /Type /Pages /Kids [3 0 R] /Count 1 >>',
+      '<< /Type /Page /Parent 2 0 R /MediaBox [0 0 595 842] /Resources << /Font << /F1 4 0 R >> >> /Contents 5 0 R >>',
+      '<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>',
+      `<< /Length ${Buffer.byteLength(stream, 'latin1')} >>\nstream\n${stream}\nendstream`,
+    ];
+
+    let pdf = '%PDF-1.4\n';
+    const offsets: number[] = [0];
+    objects.forEach((object, index) => {
+      offsets.push(Buffer.byteLength(pdf, 'latin1'));
+      pdf += `${index + 1} 0 obj\n${object}\nendobj\n`;
+    });
+    while (Buffer.byteLength(pdf, 'latin1') < MIN_VALID_PDF_BYTES) {
+      pdf += '% fallback padding\n';
+    }
+    const xrefOffset = Buffer.byteLength(pdf, 'latin1');
+    pdf += `xref\n0 ${objects.length + 1}\n`;
+    pdf += '0000000000 65535 f \n';
+    for (const offset of offsets.slice(1)) {
+      pdf += `${String(offset).padStart(10, '0')} 00000 n \n`;
+    }
+    pdf += `trailer\n<< /Size ${objects.length + 1} /Root 1 0 R >>\nstartxref\n${xrefOffset}\n%%EOF\n`;
+    return Buffer.from(pdf, 'latin1');
+  }
+
+  private htmlToPlainText(html: string): string {
+    return html
+      .replace(/<script[\s\S]*?<\/script>/gi, '')
+      .replace(/<style[\s\S]*?<\/style>/gi, '')
+      .replace(/<\/(h1|h2|h3|p|div|tr|table|section|header|footer)>/gi, '\n')
+      .replace(/<br\s*\/?>/gi, '\n')
+      .replace(/<[^>]+>/g, ' ')
+      .replace(/&nbsp;/gi, ' ')
+      .replace(/&amp;/gi, '&')
+      .replace(/&lt;/gi, '<')
+      .replace(/&gt;/gi, '>')
+      .replace(/&quot;/gi, '"')
+      .replace(/&#39;/g, "'")
+      .replace(/[^\x09\x0a\x0d\x20-\x7e]/g, '-')
+      .split('\n')
+      .map((line) => line.replace(/\s+/g, ' ').trim())
+      .filter(Boolean)
+      .join('\n');
+  }
+
+  private wrapLines(text: string, width: number): string[] {
+    const wrapped: string[] = [];
+    for (const rawLine of text.split('\n')) {
+      const words = rawLine.split(' ');
+      let line = '';
+      for (const word of words) {
+        const next = line ? `${line} ${word}` : word;
+        if (next.length > width && line) {
+          wrapped.push(line);
+          line = word;
+        } else {
+          line = next;
+        }
+      }
+      if (line) wrapped.push(line);
+    }
+    return wrapped.length ? wrapped : ['Document'];
+  }
+
+  private escapePdfText(value: string): string {
+    return value.replace(/\\/g, '\\\\').replace(/\(/g, '\\(').replace(/\)/g, '\\)');
+  }
 }
--- a/apps/edr-freight-api/src/migrations/1790000000000-CreateWarehouseModule.ts
+++ b/apps/edr-freight-api/src/migrations/1790000000000-CreateWarehouseModule.ts
@@ -78,6 +78,7 @@ export class CreateWarehouseModule1790000000000 implements MigrationInterface {
        weight NUMERIC(14,3) NOT NULL DEFAULT 0,
        volume NUMERIC(12,3) NULL,
        status VARCHAR(32) NOT NULL DEFAULT 'ARRIVED_AT_WAREHOUSE',
+        inspection_status VARCHAR(20) NULL,
        arrived_at TIMESTAMPTZ NULL,
        inspected_at TIMESTAMPTZ NULL,
        ready_for_loading_at TIMESTAMPTZ NULL,
--- a/apps/edr-freight-api/src/migrations/1821000000001-EnsureWarehouseInventoryInspectionStatus.ts
+++ b/apps/edr-freight-api/src/migrations/1821000000001-EnsureWarehouseInventoryInspectionStatus.ts
@@ -0,0 +1,39 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+/**
+ * Catch-up for environments where AddWarehouseInspection ran before the
+ * warehouse module table existed. Production needs this column for unload and
+ * inspection flows because the WarehouseInventory entity maps inspectionStatus.
+ */
+export class EnsureWarehouseInventoryInspectionStatus1821000000001 implements MigrationInterface {
+  private readonly table = 'freight.warehouse_inventory';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    if (!(await queryRunner.hasColumn(this.table, 'inspection_status'))) {
+      await queryRunner.addColumn(
+        this.table,
+        new TableColumn({
+          name: 'inspection_status',
+          type: 'varchar',
+          length: '20',
+          isNullable: true,
+        }),
+      );
+    }
+
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_warehouse_inventory_inspection_status
+      ON freight.warehouse_inventory(inspection_status)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DROP INDEX IF EXISTS freight.idx_warehouse_inventory_inspection_status
+    `);
+
+    if (await queryRunner.hasColumn(this.table, 'inspection_status')) {
+      await queryRunner.dropColumn(this.table, 'inspection_status');
+    }
+  }
+}
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
@@ -32,6 +32,7 @@ export class LastMileService {
  private readonly logger = new Logger(LastMileService.name);

  constructor(
+   
    private readonly lastMileRepository: LastMileRepository,
    private readonly bookingsRepository: BookingsRepository,
    private readonly vehiclesService: VehiclesService,
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
@@ -724,9 +724,7 @@ export class TrainSchedulingService {
      }
    });

-    const detail = await this.getTrainScheduleById(scheduleId);
-    const warehouseAutomation = await this.runWarehouseArrivalAutomation(scheduleId);
-    return Object.assign(detail, { warehouseAutomation });
+    return this.getTrainScheduleById(scheduleId);
  }

  async finalizeSchedule(scheduleId: string) {
@@ -1136,7 +1134,9 @@ export class TrainSchedulingService {
      }
    });

-    return this.getTrainScheduleById(scheduleId);
+    const detail = await this.getTrainScheduleById(scheduleId);
+    const warehouseAutomation = await this.runWarehouseArrivalAutomation(scheduleId);
+    return Object.assign(detail, { warehouseAutomation });
  }

  async getContainerTrainSchedules() {
--- a/apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts
@@ -21,6 +21,9 @@ export interface ImportTrainRow {
  totalBookings: number;
  totalContainers: number;
  totalCargoes: number;
+  unloadedBookings: number;
+  pendingUnloadBookings: number;
+  fullyUnloaded: boolean;
  status: string;
 }

@@ -34,6 +37,7 @@ export interface ImportTrainItemRow {
  weight: number | null;
  arrivalTime: string | null;
  currentStatus: string | null;
+  inspectionStatus: string | null;
  lastMileRequested: boolean;
  pickupOption: string;
 }
@@ -133,7 +137,7 @@ export class SchedulingReadFacade {
      `SELECT id, wagon_number AS "wagonNumber", status, train_id AS "trainId"
       FROM freight.wagons
       WHERE deleted_at IS NULL
-         AND status NOT IN ('RETIRED', 'MAINTENANCE')
+         AND UPPER(status) NOT IN ('RETIRED', 'MAINTENANCE')
       ORDER BY wagon_number ASC`,
    );
  }
@@ -205,7 +209,24 @@ export class SchedulingReadFacade {
                WHERE tsbc.train_schedule_id = ts.id AND c.deleted_at IS NULL) AS "totalContainers",
              (SELECT count(*) FROM freight.cargoes cg
                 JOIN freight.train_schedule_bookings tsbg ON tsbg.booking_id = cg.booking_id AND tsbg.deleted_at IS NULL
-                WHERE tsbg.train_schedule_id = ts.id AND cg.deleted_at IS NULL) AS "totalCargoes"
+                WHERE tsbg.train_schedule_id = ts.id AND cg.deleted_at IS NULL) AS "totalCargoes",
+              (SELECT count(*) FROM freight.train_schedule_bookings tsbp
+                 JOIN freight.bookings bp ON bp.id = tsbp.booking_id AND bp.deleted_at IS NULL
+                WHERE tsbp.train_schedule_id = ts.id
+                  AND tsbp.deleted_at IS NULL
+                  AND bp.status NOT IN ('DRAFT', 'REJECTED', 'CANCELLED', 'COMPLETED')
+                  AND (
+                    NOT EXISTS (
+                      SELECT 1 FROM freight.warehouse_inventory invp
+                       WHERE invp.booking_id = bp.id AND invp.deleted_at IS NULL
+                    )
+                    OR EXISTS (
+                      SELECT 1 FROM freight.warehouse_inventory invr
+                       WHERE invr.booking_id = bp.id
+                         AND invr.deleted_at IS NULL
+                         AND invr.status = 'RECEIVED'
+                    )
+                  )) AS "pendingUnloadBookings"
         FROM freight.train_schedules ts
         LEFT JOIN freight.yards oy ON oy.id = ts.origin_station_id
         LEFT JOIN freight.yards dy ON dy.id = ts.destination_station_id
@@ -219,13 +240,22 @@ export class SchedulingReadFacade {
        (r) =>
          deriveTradeDirection({ country: r.originCountry }, { country: r.destinationCountry }) === 'IMPORT',
      )
-      .map(({ originCountry: _oc, destinationCountry: _dc, ...rest }) => ({
-        ...rest,
-        totalBookings: Number(rest.totalBookings) || 0,
-        totalContainers: Number(rest.totalContainers) || 0,
-        totalCargoes: Number(rest.totalCargoes) || 0,
-        route: rest.origin || rest.destination ? `${rest.origin ?? '?'} → ${rest.destination ?? '?'}` : null,
-      }));
+      .map(({ originCountry: _oc, destinationCountry: _dc, ...rest }) => {
+        const totalBookings = Number(rest.totalBookings) || 0;
+        const pendingUnloadBookings = Number(rest.pendingUnloadBookings) || 0;
+        const unloadedBookings = Math.max(totalBookings - pendingUnloadBookings, 0);
+
+        return {
+          ...rest,
+          totalBookings,
+          totalContainers: Number(rest.totalContainers) || 0,
+          totalCargoes: Number(rest.totalCargoes) || 0,
+          unloadedBookings,
+          pendingUnloadBookings,
+          fullyUnloaded: totalBookings > 0 && pendingUnloadBookings === 0,
+          route: rest.origin || rest.destination ? `${rest.origin ?? '?'} → ${rest.destination ?? '?'}` : null,
+        };
+      });
  }

  /** Assigned bookings/items for an arrived import train (one row per booking). Read-only. */
@@ -242,6 +272,7 @@ export class SchedulingReadFacade {
              b.cargo_total_weight_vgm AS "weight",
              COALESCE(ts.actual_arrival_at, ts.scheduled_arrival_date) AS "arrivalTime",
              COALESCE(inv.status, b.status) AS "currentStatus",
+              inv.inspection_status AS "inspectionStatus",
              (b.last_mile_delivery_address IS NOT NULL) AS "lastMileRequested",
              CASE WHEN b.last_mile_delivery_address IS NOT NULL
                   THEN 'DOOR_DELIVERY' ELSE 'TERMINAL_PICKUP' END AS "pickupOption"
@@ -281,7 +312,15 @@ export class SchedulingReadFacade {
    ];
    params.push(
      filter.status ? [filter.status] : ['ARRIVED', 'ARRIVED_AT_DJIBOUTI'],
-      ['DISPATCHED', 'IN_TRANSIT', 'ARRIVED_AT_DJIBOUTI', 'ARRIVED_AT_PORT', 'ARRIVED_AT_DESTINATION'],
+      [
+        'LOADED',
+        'DISPATCHED',
+        'IN_TRANSIT',
+        'ARRIVED_AT_DJIBOUTI',
+        'ARRIVED_AT_PORT',
+        'ARRIVED_AT_DESTINATION',
+        'UNLOADED_AT_DJIBOUTI_PORT',
+      ],
    );

    if (filter.scheduleId) {
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
@@ -6,7 +6,6 @@ import { Cargo } from '../cargoes/entities/cargoes.entity';
 import { InterchangeDocumentsService } from '../interchange-documents/interchange-documents.service';
 import type { InterchangeDocument } from '../interchange-documents/entities/interchange-document.entity';
 import { LastMileService } from '../last-mile/last-mile.service';
-import { ContractPdfService } from '../../contracts/contract-pdf.service';
 import { BulkInspectDto } from './dto/bulk-inspect.dto';
 import { BulkReceiveDto } from './dto/bulk-receive.dto';
 import { DeliverInventoryDto } from './dto/deliver-inventory.dto';
@@ -36,10 +35,20 @@ import { SchedulingReadFacade } from './scheduling-read.facade';
 import { WarehouseActivityLogService } from './warehouse-activity-log.service';
 import { WarehouseInventoryRepository } from './warehouse-inventory.repository';
 import { WarehouseLoadingRepository } from './warehouse-loading.repository';
+import { WarehouseReleaseDocumentService } from './warehouse-release-document.service';

 /** Wagon states that may receive a load (besides being part of an existing schedule). */
 const LOADABLE_WAGON_STATUSES = ['AVAILABLE', 'IMPORT_READY', 'EXPORT_READY', 'ASSIGNED'];

+const normalizeWagonStatus = (status: string | null | undefined) =>
+  (status ?? '')
+    .trim()
+    .replace(/[\s-]+/g, '_')
+    .toUpperCase();
+
+const isLoadableWagonStatus = (status: string | null | undefined) =>
+  LOADABLE_WAGON_STATUSES.includes(normalizeWagonStatus(status));
+
 export interface InventoryInquiryResult {
  id: string;
  inventoryId: string | null;
@@ -283,7 +292,7 @@ export class WarehouseInventoryService {
    private readonly allocation: WarehouseAllocationService,
    private readonly invoices: WarehouseInvoiceService,
    private readonly inspectionService: WarehouseInspectionService,
-    private readonly pdfService: ContractPdfService,
+    private readonly releaseDocuments: WarehouseReleaseDocumentService,
    private readonly interchangeDocuments: InterchangeDocumentsService,
    private readonly lastMileService: LastMileService,
  ) {}
@@ -294,18 +303,53 @@ export class WarehouseInventoryService {
   * inspection / storage / loading steps — only the final release.
   */
  async gateClearance(id: string, performedBy?: string): Promise<WarehouseInventory> {
-    const item = await this.findById(id);
+    const [item]: Array<{ id: string; warehouseId: string | null }> = await this.dataSource.query(
+      `SELECT id, warehouse_id AS "warehouseId"
+         FROM freight.warehouse_inventory
+        WHERE id = $1 AND deleted_at IS NULL
+        LIMIT 1`,
+      [id],
+    );
+    if (!item) {
+      throw new NotFoundException(`Inventory item ${id} not found`);
+    }
+
    const blocking = await this.invoices.findBlockingInvoice(id);
    if (blocking) {
      throw new BadRequestException(
        'Warehouse demurrage/storage fee must be paid before terminal release.',
      );
    }
+
    const now = new Date();
-    await this.inventoryRepository.update(id, {
-      gateClearedAt: now,
-      releaseDate: item.releaseDate ?? now,
-    });
+    const [gateColumn]: Array<{ exists: boolean }> = await this.dataSource.query(
+      `SELECT EXISTS (
+         SELECT 1
+           FROM information_schema.columns
+          WHERE table_schema = 'freight'
+            AND table_name = 'warehouse_inventory'
+            AND column_name = 'gate_cleared_at'
+       ) AS "exists"`,
+    );
+    if (gateColumn?.exists) {
+      await this.dataSource.query(
+        `UPDATE freight.warehouse_inventory
+            SET gate_cleared_at = $2,
+                release_date = COALESCE(release_date, $2),
+                updated_at = now()
+          WHERE id = $1 AND deleted_at IS NULL`,
+        [id, now],
+      );
+    } else {
+      await this.dataSource.query(
+        `UPDATE freight.warehouse_inventory
+            SET release_date = COALESCE(release_date, $2),
+                updated_at = now()
+          WHERE id = $1 AND deleted_at IS NULL`,
+        [id, now],
+      );
+    }
+
    await this.activityLog.record({
      activityType: 'INVENTORY_DISPATCHED',
      inventoryId: id,
@@ -892,6 +936,7 @@ export class WarehouseInventoryService {
  /** Booking statuses that must never be unloaded into warehouse inventory. */
  private readonly IMPORT_UNLOAD_BLOCKED_STATUSES = ['DRAFT', 'REJECTED', 'CANCELLED', 'COMPLETED'];
  private readonly EXPORT_DJIBOUTI_UNLOAD_ELIGIBLE_STATUSES = [
+    'LOADED',
    'DISPATCHED',
    'IN_TRANSIT',
    'ARRIVED_AT_DJIBOUTI',
@@ -1263,16 +1308,22 @@ export class WarehouseInventoryService {
    });

    if (result.unloadedCount > 0) {
-      const document = await this.interchangeDocuments.generateFromSchedule({
+      let document = await this.interchangeDocuments.generateFromSchedule({
        scheduleId,
        direction: 'EXPORT',
        handoverLocation: schedule.destinationName ?? 'Djibouti Port',
        handoverFrom: 'EDR',
        handoverTo: 'Djibouti Port Operator',
        portOperatorName: 'Doraleh Multipurpose Port',
-        generatedBy: performedBy,
-        remarks: 'Generated after export unloading at Djibouti Port',
+        generatedBy: performedBy ?? 'EDR Operations',
+        remarks: 'Generated after export unloading at Djibouti Port; signed by EDR and Djibouti Port Operator.',
      });
+      if (document.status !== 'ACKNOWLEDGED') {
+        document = await this.interchangeDocuments.acknowledge(document.id, {
+          acknowledgedBy: 'Djibouti Port Operator',
+          remarks: 'Auto acknowledged after Djibouti export unloading.',
+        });
+      }
      result.interchangeDocument = {
        id: document.id,
        documentNo: document.documentNo,
@@ -1688,15 +1739,10 @@ export class WarehouseInventoryService {
  }

  async releaseDocument(id: string): Promise<{ filename: string; buffer: Buffer }> {
-    const item = await this.findById(id);
-    if (!item.releaseDate) {
-      throw new BadRequestException('A release order must be issued before downloading the exit paper');
-    }
-
    const [row] = await this.dataSource.query(
      `SELECT inv.id,
-              inv.release_order_reference AS "releaseOrderReference",
              inv.release_date AS "releaseDate",
+              inv.release_order_reference AS "releaseOrderReference",
              inv.quantity,
              inv.weight,
              inv.status,
@@ -1706,7 +1752,7 @@ export class WarehouseInventoryService {
              b.freight_type AS "freightType",
              b.trade_direction AS "tradeDirection",
              company.name AS "customerName",
-              container.container_number AS "containerNumber",
+              COALESCE(container.container_number, booking_container.container_number) AS "containerNumber",
              COALESCE(cargo_type.cargo_type_name, b.cargo_free_text, cargo.description) AS "cargoDescription",
              wh.name AS "warehouseName",
              wh.code AS "warehouseCode",
@@ -1720,23 +1766,29 @@ export class WarehouseInventoryService {
         LEFT JOIN freight.warehouses wh ON wh.id = inv.warehouse_id
         LEFT JOIN freight.warehouse_yards yard ON yard.id = inv.yard_id
         LEFT JOIN freight.warehouse_zones zone ON zone.id = inv.zone_id
-         LEFT JOIN freight.containers container ON (
-           (inv.container_id IS NOT NULL AND container.id = inv.container_id)
-           OR (inv.container_id IS NULL AND container.booking_id = b.id)
-         ) AND container.deleted_at IS NULL
-         LEFT JOIN freight.cargoes cargo ON (
-           (inv.cargo_id IS NOT NULL AND cargo.id = inv.cargo_id)
-           OR (inv.cargo_id IS NULL AND cargo.booking_id = b.id)
-         ) AND cargo.deleted_at IS NULL
+         LEFT JOIN freight.containers container ON container.id = inv.container_id AND container.deleted_at IS NULL
+         LEFT JOIN freight.booking_container booking_container ON (
+           booking_container.booking_id = b.id
+           AND booking_container.deleted_at IS NULL
+         )
+         LEFT JOIN freight.cargoes cargo ON cargo.id = inv.cargo_id AND cargo.deleted_at IS NULL
         LEFT JOIN freight.cargo_types cargo_type ON cargo_type.id = COALESCE(cargo.cargo_type_id, b.cargo_type_id)
        WHERE inv.id = $1 AND inv.deleted_at IS NULL
        LIMIT 1`,
      [id],
    );
+    if (!row) {
+      throw new NotFoundException(`Inventory item ${id} not found`);
+    }
+    if (!row.releaseDate) {
+      throw new BadRequestException('A release order must be issued before downloading the exit paper');
+    }

-    const reference = row?.releaseOrderReference || `REL-${id.slice(0, 8).toUpperCase()}`;
-    const bookingReference = row?.bookingReference || item.bookingId || 'N/A';
-    const issuedAt = row?.releaseDate ? new Date(row.releaseDate) : new Date();
+    const bookingReference = row?.bookingReference || 'N/A';
+    const reference =
+      row?.releaseOrderReference ||
+      (row?.bookingReference ? `REL-${String(row.bookingReference).replace(/^BK-?/i, '')}` : 'REL-N/A');
+    const issuedAt = new Date(row.releaseDate);
    const html = this.buildReleaseDocumentHtml({
      reference,
      issuedAt,
@@ -1747,17 +1799,18 @@ export class WarehouseInventoryService {
      tradeDirection: row?.tradeDirection ?? null,
      containerNumber: row?.containerNumber ?? null,
      cargoDescription: row?.cargoDescription ?? null,
-      quantity: Number(row?.quantity ?? item.quantity ?? 0),
-      weight: Number(row?.weight ?? item.weight ?? 0),
+      quantity: Number(row?.quantity ?? 0),
+      weight: Number(row?.weight ?? 0),
      warehouse: [row?.warehouseName, row?.warehouseCode].filter(Boolean).join(' / ') || null,
      yard: [row?.yardName, row?.yardCode].filter(Boolean).join(' / ') || null,
      zone: [row?.zoneName, row?.zoneCode].filter(Boolean).join(' / ') || null,
-      inventoryStatus: row?.status ?? item.status,
+      inventoryStatus: row?.status ?? null,
+      clearanceStatus: 'CLEARED FOR WAREHOUSE EXIT',
    });

    return {
      filename: `release-${String(bookingReference).replace(/[^a-zA-Z0-9_-]+/g, '-')}.pdf`,
-      buffer: await this.pdfService.htmlToPdfBuffer(html),
+      buffer: await this.releaseDocuments.htmlToPdfBuffer(html),
    };
  }

@@ -1842,7 +1895,7 @@ export class WarehouseInventoryService {

    // 4. wagon must be available, or already selected by an existing train schedule.
    const scheduled = await this.scheduling.isWagonScheduled(dto.wagonId);
-    if (!LOADABLE_WAGON_STATUSES.includes(wagon.status) && !scheduled) {
+    if (!isLoadableWagonStatus(wagon.status) && !scheduled) {
      throw new BadRequestException(
        `Wagon ${wagon.wagonNumber} is not available for loading (status: ${wagon.status})`,
      );
@@ -2257,6 +2310,7 @@ export class WarehouseInventoryService {
    yard: string | null;
    zone: string | null;
    inventoryStatus: string | null;
+    clearanceStatus: string;
  }): string {
    const esc = (value: unknown) =>
      String(value ?? '-')
@@ -2273,71 +2327,87 @@ export class WarehouseInventoryService {
      minute: '2-digit',
    });
    const rows = [
-      ['Booking reference', data.bookingReference],
-      ['Customer', data.customerName],
-      ['Booking status', data.bookingStatus],
-      ['Freight type', data.freightType],
-      ['Trade direction', data.tradeDirection],
-      ['Container number', data.containerNumber],
-      ['Cargo / goods', data.cargoDescription],
+      ['Booking Reference', data.bookingReference],
+      ['Customer / Consignee', data.customerName],
+      ['Booking Status', data.bookingStatus],
+      ['Freight Type', data.freightType],
+      ['Trade Direction', data.tradeDirection],
+      ['Container Number', data.containerNumber],
+      ['Cargo / Goods Description', data.cargoDescription],
      ['Quantity', data.quantity],
-      ['Weight', `${data.weight.toLocaleString()} kg`],
+      ['Declared Weight', `${data.weight.toLocaleString()} kg`],
      ['Warehouse', data.warehouse],
      ['Yard', data.yard],
      ['Zone', data.zone],
-      ['Inventory status', data.inventoryStatus],
+      ['Inventory Status', data.inventoryStatus],
+      ['Clearance Status', data.clearanceStatus],
    ];

    return `<!doctype html>
 <html>
 <head>
  <meta charset="utf-8" />
-  <title>Warehouse Release Exit Paper</title>
+  <title>Warehouse Gate Clearance / Release Order</title>
  <style>
-    body { font-family: Arial, sans-serif; color: #0f172a; margin: 0; }
-    .doc { padding: 18px 8px; }
-    .top { display: flex; justify-content: space-between; gap: 24px; border-bottom: 3px solid #0f766e; padding-bottom: 18px; }
-    .brand { font-size: 13px; color: #475569; text-transform: uppercase; letter-spacing: .08em; }
-    h1 { margin: 8px 0 0; font-size: 30px; }
-    .ref { text-align: right; font-size: 13px; color: #475569; }
-    .ref strong { display: block; color: #0f172a; font-size: 18px; margin-top: 6px; }
-    .notice { margin: 22px 0; padding: 14px 16px; background: #ecfdf5; border: 1px solid #99f6e4; border-radius: 8px; font-weight: 700; }
-    table { width: 100%; border-collapse: collapse; margin-top: 16px; }
-    th { width: 32%; text-align: left; color: #475569; background: #f8fafc; }
-    th, td { border: 1px solid #cbd5e1; padding: 10px 12px; font-size: 13px; }
-    .signatures { display: grid; grid-template-columns: 1fr 1fr; gap: 28px; margin-top: 42px; }
-    .line { border-top: 1px solid #334155; padding-top: 8px; font-size: 12px; color: #475569; }
-    .footer { margin-top: 28px; font-size: 11px; color: #64748b; line-height: 1.5; }
+    body { font-family: "Times New Roman", Georgia, serif; color: #111827; margin: 0; }
+    .doc { padding: 10px 8px 0; position: relative; }
+    .top { display: grid; grid-template-columns: 1fr auto; gap: 24px; border-bottom: 2px solid #14532d; padding-bottom: 14px; }
+    .brand { font-size: 13px; color: #14532d; text-transform: uppercase; letter-spacing: .1em; font-weight: 700; }
+    h1 { margin: 7px 0 0; font-size: 27px; line-height: 1.1; text-transform: uppercase; letter-spacing: .03em; }
+    .subtitle { margin-top: 6px; font-size: 12px; color: #475569; text-transform: uppercase; letter-spacing: .08em; }
+    .ref { text-align: right; font-size: 12px; color: #475569; min-width: 210px; }
+    .ref strong { display: block; color: #111827; font-size: 17px; margin: 4px 0 8px; }
+    .seal { position: absolute; right: 8px; top: -42px; width: 112px; height: 112px; border: 4px double #14532d; border-radius: 999px; color: #14532d; display: flex; align-items: center; justify-content: center; text-align: center; font-weight: 800; font-size: 15px; line-height: 1.15; transform: rotate(-13deg); opacity: .86; text-transform: uppercase; }
+    .seal::before { content: ""; position: absolute; inset: 10px; border: 1px solid #14532d; border-radius: inherit; }
+    .notice { margin: 20px 154px 18px 0; padding: 13px 15px; background: #f0fdf4; border: 1px solid #86efac; border-left: 5px solid #14532d; font-size: 13px; line-height: 1.45; }
+    .section-title { margin: 18px 0 8px; font-size: 13px; font-weight: 800; color: #14532d; text-transform: uppercase; letter-spacing: .08em; }
+    table { width: 100%; border-collapse: collapse; }
+    th { width: 31%; text-align: left; color: #334155; background: #f8fafc; font-weight: 700; }
+    th, td { border: 1px solid #cbd5e1; padding: 8px 10px; font-size: 12.5px; vertical-align: top; }
+    .clause { margin-top: 16px; border: 1px solid #cbd5e1; padding: 12px 14px; font-size: 12.5px; line-height: 1.45; }
+    .signatures { display: grid; grid-template-columns: 1fr 1fr; gap: 30px; margin-top: 42px; }
+    .officer-signature { position: relative; min-height: 98px; padding-right: 132px; }
+    .line { border-top: 1px solid #111827; padding-top: 8px; font-size: 12px; color: #334155; }
+    .footer { margin-top: 22px; border-top: 1px solid #cbd5e1; padding-top: 9px; font-size: 10.5px; color: #475569; line-height: 1.45; }
  </style>
 </head>
 <body>
  <div class="doc">
    <div class="top">
      <div>
-        <div class="brand">EDR Warehouse Operations</div>
-        <h1>Warehouse Release / Exit Paper</h1>
+        <div class="brand">Ethio-Djibouti Railway S.C.</div>
+        <h1>Warehouse Gate Clearance / Release Order</h1>
+        <div class="subtitle">Official warehouse release and exit authorization</div>
      </div>
      <div class="ref">
-        Release reference
+        Document / Release No.
        <strong>${esc(data.reference)}</strong>
        Issued: ${esc(issuedAt)}
      </div>
    </div>
    <div class="notice">
-      This document authorizes the listed booking/goods to leave the warehouse after release checks.
+      This clearance document confirms that the listed booking/goods are authorized for warehouse exit, subject to gate identity verification and confirmation that no blocking warehouse fees remain unpaid.
    </div>
+    <div class="section-title">Release Particulars</div>
    <table>
      <tbody>
        ${rows.map(([label, value]) => `<tr><th>${esc(label)}</th><td>${esc(value)}</td></tr>`).join('')}
      </tbody>
    </table>
+    <div class="section-title">Authorization Clause</div>
+    <div class="clause">
+      The warehouse officer and gate staff shall verify this document against the booking reference, customer or driver identity,
+      cargo details, clearance status, and payment records before permitting exit from the warehouse premises.
+    </div>
    <div class="signatures">
-      <div class="line">Warehouse officer name / signature / date</div>
+      <div class="officer-signature">
+        <div class="seal">EDR<br />Warehouse<br />Cleared</div>
+        <div class="line">Officer in charge name / signature / date</div>
+      </div>
      <div class="line">Customer or driver name / signature / date</div>
    </div>
    <div class="footer">
-      Present this release paper at the warehouse gate. Gate staff should verify booking reference,
-      customer/driver identity, cargo details, and any unpaid blocking fees before exit.
+      Present this original release order at the warehouse gate. This document is valid only for the booking/goods stated above and must be retained or recorded by gate operations according to warehouse procedure.
    </div>
  </div>
 </body>
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.controller.ts
@@ -1,5 +1,6 @@
-import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post, Query, Res } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import type { Response } from 'express';

 import { GenerateInvoiceDto, PayInvoiceBodyDto } from './dto/invoice.dto';
 import { WarehouseInvoiceService } from './warehouse-invoice.service';
@@ -54,6 +55,26 @@ export class WarehouseInvoiceController {
    return this.invoiceService.findById(id);
  }

+  @Get('warehouse-fee-invoices/:id/document')
+  @ApiOperation({ summary: 'Download sealed warehouse fee invoice PDF' })
+  async document(@Param('id', ParseUUIDPipe) id: string, @Res() res: Response) {
+    const { filename, buffer } = await this.invoiceService.document(id);
+    res.setHeader('Content-Type', 'application/pdf');
+    res.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
+    res.setHeader('Content-Length', buffer.length);
+    return res.send(buffer);
+  }
+
+  @Get('warehouse-fee-invoices/:id/receipt')
+  @ApiOperation({ summary: 'Download sealed warehouse fee payment receipt PDF' })
+  async receipt(@Param('id', ParseUUIDPipe) id: string, @Res() res: Response) {
+    const { filename, buffer } = await this.invoiceService.receipt(id);
+    res.setHeader('Content-Type', 'application/pdf');
+    res.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
+    res.setHeader('Content-Length', buffer.length);
+    return res.send(buffer);
+  }
+
  @Patch('warehouse-fee-invoices/:id/cancel')
  @ApiOperation({ summary: 'Cancel a warehouse fee invoice' })
  cancel(@Param('id', ParseUUIDPipe) id: string) {
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.service.ts
@@ -10,6 +10,7 @@ import { WarehouseFeeType } from './entities/warehouse-fee-invoice-item.entity';
 import { WarehouseFeeInvoiceItemRepository } from './warehouse-fee-invoice-item.repository';
 import { WarehouseFeeInvoiceRepository } from './warehouse-fee-invoice.repository';
 import { WarehouseFeeService } from './warehouse-fee.service';
+import { WarehouseReleaseDocumentService } from './warehouse-release-document.service';

 interface GenerateOptions {
  confirmZero?: boolean;
@@ -27,6 +28,22 @@ export interface PayInvoiceDto {
 const BLOCKING_STATUSES: WarehouseInvoiceStatus[] = ['ISSUED', 'PARTIALLY_PAID'];
 const ACTIVE_STATUSES: WarehouseInvoiceStatus[] = ['ISSUED', 'PARTIALLY_PAID', 'PAID'];

+export interface InvoiceDocumentDetails {
+  bookingReference: string | null;
+  customerName: string | null;
+  inventoryReference: string | null;
+  inventoryInfo: string | null;
+  inventoryStatus: string | null;
+  containerNumber: string | null;
+  cargoDescription: string | null;
+  clearanceStatus: string;
+  warehouseName: string | null;
+  yardName: string | null;
+  zoneName: string | null;
+}
+
+export type WarehouseFeeInvoiceWithDisplay = WarehouseFeeInvoice & Partial<InvoiceDocumentDetails>;
+
@Injectable()
 export class WarehouseInvoiceService {
  constructor(
@@ -34,6 +51,7 @@ export class WarehouseInvoiceService {
    private readonly invoiceRepository: WarehouseFeeInvoiceRepository,
    private readonly itemRepository: WarehouseFeeInvoiceItemRepository,
    private readonly feeService: WarehouseFeeService,
+    private readonly documents: WarehouseReleaseDocumentService,
  ) {}

  // ── Generation ───────────────────────────────────────────────────────────
@@ -150,11 +168,35 @@ export class WarehouseInvoiceService {
  }

  // ── Reads ────────────────────────────────────────────────────────────────
-  async findById(id: string): Promise<WarehouseFeeInvoice & { items: unknown[] }> {
+  async findById(id: string): Promise<WarehouseFeeInvoiceWithDisplay & { items: unknown[] }> {
    const invoice = await this.invoiceRepository.findById(id);
    if (!invoice) throw new NotFoundException(`Invoice ${id} not found`);
    const items = await this.itemRepository.findAll({ where: { invoiceId: id } });
-    return { ...invoice, items } as WarehouseFeeInvoice & { items: unknown[] };
+    const details = await this.getInvoiceDocumentDetails(invoice);
+    return { ...invoice, ...details, items } as WarehouseFeeInvoiceWithDisplay & { items: unknown[] };
+  }
+
+  async document(id: string): Promise<{ filename: string; buffer: Buffer }> {
+    const invoice = await this.findById(id);
+    const details = await this.getInvoiceDocumentDetails(invoice);
+    const html = this.buildInvoiceDocumentHtml(invoice, 'INVOICE', details);
+    return {
+      filename: `warehouse-invoice-${this.safeFilename(invoice.invoiceNumber)}.pdf`,
+      buffer: await this.documents.htmlToPdfBuffer(html),
+    };
+  }
+
+  async receipt(id: string): Promise<{ filename: string; buffer: Buffer }> {
+    const invoice = await this.findById(id);
+    if (Number(invoice.paidAmount) <= 0) {
+      throw new BadRequestException('A receipt is available only after payment is recorded.');
+    }
+    const details = await this.getInvoiceDocumentDetails(invoice);
+    const html = this.buildInvoiceDocumentHtml(invoice, 'RECEIPT', details);
+    return {
+      filename: `warehouse-receipt-${this.safeFilename(invoice.invoiceNumber)}.pdf`,
+      buffer: await this.documents.htmlToPdfBuffer(html),
+    };
  }

  listForInventory(inventoryId: string): Promise<WarehouseFeeInvoice[]> {
@@ -213,4 +255,207 @@ export class WarehouseInvoiceService {
    const invoices = await this.invoiceRepository.findAll({ where: { inventoryId } });
    return invoices.find((inv) => BLOCKING_STATUSES.includes(inv.status)) ?? null;
  }
+
+  async assertClearanceAllowed(inventoryId: string): Promise<void> {
+    const invoices = await this.invoiceRepository.findAll({ where: { inventoryId } });
+    const blocking = invoices.find((inv) => BLOCKING_STATUSES.includes(inv.status));
+    if (blocking) {
+      throw new BadRequestException(
+        `Warehouse demurrage/storage invoice ${blocking.invoiceNumber} must be fully paid before terminal release.`,
+      );
+    }
+
+    if (invoices.some((inv) => inv.status === 'PAID')) return;
+
+    const previews = await this.feeService.previewForInventory(inventoryId, 'USD');
+    const payableAmount = previews.reduce((sum, fee) => sum + Number(fee.amount || 0), 0);
+    if (payableAmount > 0) {
+      throw new BadRequestException(
+        'Generate and fully pay the warehouse demurrage/storage invoice before terminal release.',
+      );
+    }
+  }
+
+  private async getInvoiceDocumentDetails(invoice: WarehouseFeeInvoice): Promise<InvoiceDocumentDetails> {
+    const [row] = await this.dataSource.query(
+      `SELECT b.reference AS "bookingReference",
+              company.name AS "customerName",
+              COALESCE(inv.release_order_reference, b.reference) AS "inventoryReference",
+              inv.status AS "inventoryStatus",
+              COALESCE(container.container_number, booking_container.container_number) AS "containerNumber",
+              COALESCE(cargo_type.cargo_type_name, b.cargo_free_text, cargo.description) AS "cargoDescription",
+              CONCAT_WS(
+                ' / ',
+                NULLIF(inv.status, ''),
+                NULLIF(COALESCE(container.container_number, booking_container.container_number), ''),
+                NULLIF(COALESCE(cargo_type.cargo_type_name, b.cargo_free_text, cargo.description), '')
+              ) AS "inventoryInfo",
+              wh.name AS "warehouseName",
+              yard.name AS "yardName",
+              zone.name AS "zoneName",
+              CASE
+                WHEN inv.release_date IS NOT NULL THEN 'RELEASE ISSUED'
+                WHEN $2 = 'PAID' THEN 'FEE PAID - READY FOR RELEASE'
+                ELSE 'PENDING PAYMENT'
+              END AS "clearanceStatus"
+         FROM freight.warehouse_fee_invoices fee
+         LEFT JOIN freight.warehouse_inventory inv ON inv.id = fee.inventory_id AND inv.deleted_at IS NULL
+         LEFT JOIN freight.bookings b ON b.id = fee.booking_id AND b.deleted_at IS NULL
+         LEFT JOIN freight.companies company ON company.id = COALESCE(fee.customer_id, b.company_id)
+         LEFT JOIN freight.containers container ON container.id = inv.container_id AND container.deleted_at IS NULL
+         LEFT JOIN freight.booking_container booking_container ON (
+           booking_container.booking_id = b.id
+           AND booking_container.deleted_at IS NULL
+         )
+         LEFT JOIN freight.cargoes cargo ON cargo.id = inv.cargo_id AND cargo.deleted_at IS NULL
+         LEFT JOIN freight.cargo_types cargo_type ON cargo_type.id = COALESCE(cargo.cargo_type_id, b.cargo_type_id)
+         LEFT JOIN freight.warehouses wh ON wh.id = fee.warehouse_id
+         LEFT JOIN freight.warehouse_yards yard ON yard.id = fee.yard_id
+         LEFT JOIN freight.warehouse_zones zone ON zone.id = fee.zone_id
+        WHERE fee.id = $1
+        LIMIT 1`,
+      [invoice.id, invoice.status],
+    );
+
+    return {
+      bookingReference: row?.bookingReference ?? null,
+      customerName: row?.customerName ?? null,
+      inventoryReference: row?.inventoryReference ?? null,
+      inventoryInfo: row?.inventoryInfo ?? null,
+      inventoryStatus: row?.inventoryStatus ?? null,
+      containerNumber: row?.containerNumber ?? null,
+      cargoDescription: row?.cargoDescription ?? null,
+      warehouseName: row?.warehouseName ?? null,
+      yardName: row?.yardName ?? null,
+      zoneName: row?.zoneName ?? null,
+      clearanceStatus: row?.clearanceStatus ?? (invoice.status === 'PAID' ? 'FEE PAID - READY FOR RELEASE' : 'PENDING PAYMENT'),
+    };
+  }
+
+  private buildInvoiceDocumentHtml(
+    invoice: WarehouseFeeInvoiceWithDisplay & { items: unknown[] },
+    kind: 'INVOICE' | 'RECEIPT',
+    details: InvoiceDocumentDetails,
+  ): string {
+    const esc = (value: unknown) =>
+      String(value ?? '-')
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;');
+    const money = (amount: unknown, currency = invoice.currency) =>
+      `${Number(amount ?? 0).toLocaleString()} ${currency === 'ETB' ? 'Birr (ETB)' : currency}`;
+    const date = (value: unknown) => (value ? new Date(value as string | Date).toLocaleDateString('en-GB') : '-');
+    const items = invoice.items as Array<{
+      id?: string;
+      description?: string;
+      feeType?: string;
+      quantity?: number;
+      unitRate?: number;
+      amount?: number;
+      currency?: string;
+      chargeableDays?: number | null;
+    }>;
+    const lastPayment = [...(invoice.payments ?? [])].pop();
+    const sealText = kind === 'RECEIPT' || invoice.status === 'PAID' ? 'EDR PAID' : 'EDR';
+
+    return `<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>Warehouse Fee ${kind === 'RECEIPT' ? 'Receipt' : 'Invoice'}</title>
+  <style>
+    body { font-family: Arial, sans-serif; color: #0f172a; margin: 0; }
+    .doc { padding: 16px 8px; position: relative; }
+    .top { display: flex; justify-content: space-between; gap: 24px; border-bottom: 3px solid #0f766e; padding-bottom: 16px; }
+    .brand { font-size: 13px; color: #475569; text-transform: uppercase; letter-spacing: .08em; }
+    h1 { margin: 8px 0 0; font-size: 30px; }
+    .meta { text-align: right; font-size: 12px; color: #475569; }
+    .meta strong { display: block; color: #0f172a; font-size: 17px; margin-top: 5px; }
+    .seal { position: absolute; right: 28px; top: 118px; width: 116px; height: 116px; border: 4px double #0f766e; border-radius: 999px; color: #0f766e; display: flex; align-items: center; justify-content: center; text-align: center; font-weight: 800; font-size: 18px; transform: rotate(-14deg); opacity: .82; }
+    .summary { display: grid; grid-template-columns: 1fr 1fr; gap: 12px 28px; margin: 24px 150px 16px 0; font-size: 13px; }
+    .summary div { border-bottom: 1px solid #e2e8f0; padding: 7px 0; }
+    .summary span { color: #64748b; display: block; font-size: 11px; margin-bottom: 3px; }
+    table { width: 100%; border-collapse: collapse; margin-top: 18px; }
+    th { text-align: left; background: #f8fafc; color: #475569; }
+    th, td { border: 1px solid #cbd5e1; padding: 9px 10px; font-size: 12px; }
+    td.num, th.num { text-align: right; }
+    .totals { margin-left: auto; width: 330px; margin-top: 18px; }
+    .total-row { display: flex; justify-content: space-between; border-bottom: 1px solid #e2e8f0; padding: 8px 0; font-size: 13px; }
+    .grand { font-size: 16px; font-weight: 800; }
+    .footer { margin-top: 34px; display: grid; grid-template-columns: 1fr 1fr; gap: 28px; }
+    .line { border-top: 1px solid #334155; padding-top: 8px; font-size: 12px; color: #475569; }
+  </style>
+</head>
+<body>
+  <div class="doc">
+    <div class="top">
+      <div>
+        <div class="brand">Ethio-Djibouti Railway S.C.</div>
+        <h1>Warehouse Fee ${kind === 'RECEIPT' ? 'Receipt' : 'Invoice'}</h1>
+      </div>
+      <div class="meta">
+        Document no.
+        <strong>${esc(invoice.invoiceNumber)}</strong>
+        Issued: ${esc(date(invoice.issuedAt ?? invoice.createdAt))}
+      </div>
+    </div>
+    <div class="seal">${esc(sealText)}</div>
+    <div class="summary">
+      <div><span>Status</span>${esc(invoice.status.replace(/_/g, ' '))}</div>
+      <div><span>Invoice type</span>${esc(invoice.invoiceType.replace(/_/g, ' '))}</div>
+      <div><span>Booking reference</span>${esc(details.bookingReference)}</div>
+      <div><span>Customer</span>${esc(details.customerName)}</div>
+      <div><span>Inventory reference</span>${esc(details.inventoryReference)}</div>
+      <div><span>Inventory info</span>${esc(details.inventoryInfo)}</div>
+      <div><span>Clearance</span>${esc(details.clearanceStatus)}</div>
+      <div><span>Warehouse</span>${esc(details.warehouseName)}</div>
+      <div><span>Yard / Zone</span>${esc([details.yardName, details.zoneName].filter(Boolean).join(' / ') || null)}</div>
+      <div><span>Period</span>${esc(date(invoice.periodStart))} - ${esc(date(invoice.periodEnd))}</div>
+      <div><span>Payment</span>${esc(lastPayment ? `${lastPayment.method ?? 'MANUAL'} / ${date(lastPayment.paidAt)}` : '-')}</div>
+    </div>
+    <table>
+      <thead>
+        <tr>
+          <th>Description</th>
+          <th>Fee type</th>
+          <th class="num">Qty</th>
+          <th class="num">Rate</th>
+          <th class="num">Amount</th>
+        </tr>
+      </thead>
+      <tbody>
+        ${items
+          .map(
+            (item) => `<tr>
+              <td>${esc(item.description)}</td>
+              <td>${esc((item.feeType ?? '').replace(/_/g, ' '))}</td>
+              <td class="num">${esc(item.quantity ?? item.chargeableDays ?? 0)}</td>
+              <td class="num">${esc(money(item.unitRate, item.currency ?? invoice.currency))}</td>
+              <td class="num">${esc(money(item.amount, item.currency ?? invoice.currency))}</td>
+            </tr>`,
+          )
+          .join('')}
+      </tbody>
+    </table>
+    <div class="totals">
+      <div class="total-row"><span>Subtotal</span><strong>${esc(money(invoice.subtotalAmount))}</strong></div>
+      <div class="total-row"><span>Tax</span><strong>${esc(money(invoice.taxAmount))}</strong></div>
+      <div class="total-row grand"><span>Total</span><strong>${esc(money(invoice.totalAmount))}</strong></div>
+      <div class="total-row"><span>Paid</span><strong>${esc(money(invoice.paidAmount))}</strong></div>
+      <div class="total-row"><span>Balance</span><strong>${esc(money(invoice.balanceAmount))}</strong></div>
+    </div>
+    <div class="footer">
+      <div class="line">Prepared by EDR warehouse finance</div>
+      <div class="line">Authorized seal / signature</div>
+    </div>
+  </div>
+</body>
+</html>`;
+  }
+
+  private safeFilename(value: string): string {
+    return value.replace(/[^a-zA-Z0-9_-]+/g, '-');
+  }
 }
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-release-document.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-release-document.service.ts
@@ -0,0 +1,240 @@
+import { existsSync } from 'fs';
+
+import { Injectable, InternalServerErrorException, Logger } from '@nestjs/common';
+
+const MIN_VALID_PDF_BYTES = 2_000;
+
+const RELEASE_DOCUMENT_PRINT_STYLES = `
+<style id="warehouse-release-document-print-fix">
+  @media print {
+    html, body {
+      background: #fff !important;
+      -webkit-print-color-adjust: exact;
+      print-color-adjust: exact;
+    }
+  }
+</style>`;
+
+@Injectable()
+export class WarehouseReleaseDocumentService {
+  private readonly logger = new Logger(WarehouseReleaseDocumentService.name);
+
+  async htmlToPdfBuffer(html: string): Promise<Buffer> {
+    const preparedHtml = this.injectPdfPrintStyles(html);
+    const executablePath = this.resolveExecutablePath();
+
+    try {
+      const puppeteer = await import('puppeteer');
+      const launchOptions: import('puppeteer').LaunchOptions = {
+        headless: true,
+        args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
+        ...(executablePath ? { executablePath } : {}),
+      };
+
+      const browser = await puppeteer.default.launch(launchOptions);
+      try {
+        const page = await browser.newPage();
+        await page.setViewport({ width: 794, height: 1123, deviceScaleFactor: 1 });
+        await page.setContent(preparedHtml, { waitUntil: 'load', timeout: 60_000 });
+        await page.emulateMediaType('print');
+        await new Promise((resolve) => setTimeout(resolve, 250));
+
+        const pdf = await page.pdf({
+          format: 'A4',
+          printBackground: true,
+          margin: { top: '16mm', bottom: '18mm', left: '14mm', right: '14mm' },
+        });
+
+        const buffer = Buffer.from(pdf);
+        if (!this.isValidPdf(buffer)) {
+          throw new Error(`Puppeteer produced invalid release PDF (${buffer.length} bytes)`);
+        }
+        this.logger.log(
+          `Warehouse release PDF rendered (${buffer.length} bytes) via ${executablePath ?? 'bundled Chromium'}`,
+        );
+        return buffer;
+      } finally {
+        await browser.close();
+      }
+    } catch (error) {
+      this.logger.error(
+        `Warehouse release PDF failed (executable=${executablePath ?? 'default'}): ${error}`,
+      );
+      const fallback = this.htmlToBasicPdfBuffer(preparedHtml);
+      if (this.isValidPdf(fallback)) {
+        this.logger.warn(
+          `Using basic warehouse release PDF fallback (${fallback.length} bytes). Install Chromium or set PUPPETEER_EXECUTABLE_PATH for full layout rendering.`,
+        );
+        return fallback;
+      }
+      throw new InternalServerErrorException(
+        'Warehouse release PDF could not be generated. Ensure Chromium is installed or set PUPPETEER_EXECUTABLE_PATH.',
+      );
+    }
+  }
+
+  private injectPdfPrintStyles(html: string): string {
+    if (html.includes('warehouse-release-document-print-fix')) return html;
+    if (html.includes('</head>')) {
+      return html.replace('</head>', `${RELEASE_DOCUMENT_PRINT_STYLES}</head>`);
+    }
+    return `${RELEASE_DOCUMENT_PRINT_STYLES}${html}`;
+  }
+
+  private resolveExecutablePath(): string | undefined {
+    const fromEnv = process.env.PUPPETEER_EXECUTABLE_PATH?.trim();
+    if (fromEnv && existsSync(fromEnv)) return fromEnv;
+
+    const candidates = [
+      '/usr/bin/chromium',
+      '/usr/bin/chromium-browser',
+      '/usr/bin/google-chrome-stable',
+      '/usr/bin/google-chrome',
+    ];
+    return candidates.find((path) => existsSync(path));
+  }
+
+  private isValidPdf(buffer: Buffer): boolean {
+    return buffer.length >= MIN_VALID_PDF_BYTES && buffer.subarray(0, 5).toString('ascii') === '%PDF-';
+  }
+
+  private htmlToBasicPdfBuffer(html: string): Buffer {
+    const text = this.htmlToPlainText(html);
+    const lines = this.wrapLines(text, 86).slice(0, 52);
+    const body = lines
+      .map((line, index) => {
+        const y = 770 - index * 12;
+        const isTitle = index < 2 || /clearance|release order/i.test(line);
+        const size = index === 0 ? 13 : isTitle ? 11 : 9.6;
+        const font = isTitle ? 'F2' : 'F1';
+        return this.textOp(line, 48, y, size, font);
+      })
+      .join('\n');
+    const stream = [
+      this.lineOp(48, 752, 548, 752),
+      body,
+      this.circularSealOps(184, 154),
+      this.lineOp(48, 92, 278, 92, '0 0 0'),
+      this.textOp('Officer in charge name / signature / date', 48, 76, 9, 'F1'),
+      this.lineOp(326, 92, 548, 92, '0 0 0'),
+      this.textOp('Customer or driver name / signature / date', 326, 76, 9, 'F1'),
+      this.textOp('OFFICIAL WAREHOUSE GATE CLEARANCE DOCUMENT', 145, 52, 9, 'F2', '0.08 0.32 0.18'),
+    ].join('\n');
+
+    const objects = [
+      '<< /Type /Catalog /Pages 2 0 R >>',
+      '<< /Type /Pages /Kids [3 0 R] /Count 1 >>',
+      '<< /Type /Page /Parent 2 0 R /MediaBox [0 0 595 842] /Resources << /Font << /F1 4 0 R /F2 5 0 R >> >> /Contents 6 0 R >>',
+      '<< /Type /Font /Subtype /Type1 /BaseFont /Times-Roman >>',
+      '<< /Type /Font /Subtype /Type1 /BaseFont /Times-Bold >>',
+      `<< /Length ${Buffer.byteLength(stream, 'latin1')} >>\nstream\n${stream}\nendstream`,
+    ];
+
+    let pdf = '%PDF-1.4\n';
+    const offsets: number[] = [0];
+    objects.forEach((object, index) => {
+      offsets.push(Buffer.byteLength(pdf, 'latin1'));
+      pdf += `${index + 1} 0 obj\n${object}\nendobj\n`;
+    });
+    while (Buffer.byteLength(pdf, 'latin1') < MIN_VALID_PDF_BYTES) {
+      pdf += '% fallback padding\n';
+    }
+    const xrefOffset = Buffer.byteLength(pdf, 'latin1');
+    pdf += `xref\n0 ${objects.length + 1}\n`;
+    pdf += '0000000000 65535 f \n';
+    for (const offset of offsets.slice(1)) {
+      pdf += `${String(offset).padStart(10, '0')} 00000 n \n`;
+    }
+    pdf += `trailer\n<< /Size ${objects.length + 1} /Root 1 0 R >>\nstartxref\n${xrefOffset}\n%%EOF\n`;
+    return Buffer.from(pdf, 'latin1');
+  }
+
+  private htmlToPlainText(html: string): string {
+    return html
+      .replace(/<script[\s\S]*?<\/script>/gi, '')
+      .replace(/<style[\s\S]*?<\/style>/gi, '')
+      .replace(/<\/(h1|h2|h3|p|div|tr|table|section|header|footer)>/gi, '\n')
+      .replace(/<br\s*\/?>/gi, '\n')
+      .replace(/<[^>]+>/g, ' ')
+      .replace(/&nbsp;/gi, ' ')
+      .replace(/&amp;/gi, '&')
+      .replace(/&lt;/gi, '<')
+      .replace(/&gt;/gi, '>')
+      .replace(/&quot;/gi, '"')
+      .replace(/&#39;/g, "'")
+      .replace(/[^\x09\x0a\x0d\x20-\x7e]/g, '-')
+      .split('\n')
+      .map((line) => line.replace(/\s+/g, ' ').trim())
+      .filter(Boolean)
+      .join('\n');
+  }
+
+  private wrapLines(text: string, width: number): string[] {
+    const wrapped: string[] = [];
+    for (const rawLine of text.split('\n')) {
+      const words = rawLine.split(' ');
+      let line = '';
+      for (const word of words) {
+        const next = line ? `${line} ${word}` : word;
+        if (next.length > width && line) {
+          wrapped.push(line);
+          line = word;
+        } else {
+          line = next;
+        }
+      }
+      if (line) wrapped.push(line);
+    }
+    return wrapped.length ? wrapped : ['Warehouse release document'];
+  }
+
+  private escapePdfText(value: string): string {
+    return value.replace(/\\/g, '\\\\').replace(/\(/g, '\\(').replace(/\)/g, '\\)');
+  }
+
+  private textOp(
+    text: string,
+    x: number,
+    y: number,
+    size: number,
+    font: 'F1' | 'F2' = 'F1',
+    color = '0 0 0',
+  ): string {
+    return `BT\n${color} rg\n/${font} ${size} Tf\n${x} ${y} Td\n(${this.escapePdfText(text)}) Tj\nET`;
+  }
+
+  private lineOp(x1: number, y1: number, x2: number, y2: number, color = '0.08 0.32 0.18'): string {
+    return `q\n${color} RG\n0.8 w\n${x1} ${y1} m\n${x2} ${y2} l\nS\nQ`;
+  }
+
+  private circularSealOps(cx: number, cy: number): string {
+    return [
+      'q',
+      '0.08 0.32 0.18 RG',
+      '0.08 0.32 0.18 rg',
+      '2.2 w',
+      this.circlePath(cx, cy, 51),
+      'S',
+      '0.8 w',
+      this.circlePath(cx, cy, 41),
+      'S',
+      this.textOp('EDR', cx - 14, cy + 18, 14, 'F2', '0.08 0.32 0.18'),
+      this.textOp('WAREHOUSE', cx - 31, cy + 2, 9, 'F2', '0.08 0.32 0.18'),
+      this.textOp('CLEARED', cx - 27, cy - 16, 11, 'F2', '0.08 0.32 0.18'),
+      'Q',
+    ].join('\n');
+  }
+
+  private circlePath(cx: number, cy: number, r: number): string {
+    const k = 0.5522847498;
+    const c = r * k;
+    return [
+      `${cx + r} ${cy} m`,
+      `${cx + r} ${cy + c} ${cx + c} ${cy + r} ${cx} ${cy + r} c`,
+      `${cx - c} ${cy + r} ${cx - r} ${cy + c} ${cx - r} ${cy} c`,
+      `${cx - r} ${cy - c} ${cx - c} ${cy - r} ${cx} ${cy - r} c`,
+      `${cx + c} ${cy - r} ${cx + r} ${cy - c} ${cx + r} ${cy} c`,
+      'h',
+    ].join('\n');
+  }
+}
--- a/apps/edr-freight-api/src/modules/warehouses/warehouses.module.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouses.module.ts
@@ -3,7 +3,6 @@ import { ConfigService } from '@nestjs/config';
 import { ExchangeModule, ExchangeOptions } from '@edr/api-common';
 import { TypeOrmModule } from '@nestjs/typeorm';

-import { ContractPdfService } from '../../contracts/contract-pdf.service';
 import { FilesModule } from '../files/files.module';
 import { InterchangeDocumentsModule } from '../interchange-documents/interchange-documents.module';
 import { LastMileModule } from '../last-mile/last-mile.module';
@@ -32,6 +31,7 @@ import { WarehouseInventoryRepository } from './warehouse-inventory.repository';
 import { WarehouseInventoryService } from './warehouse-inventory.service';
 import { WarehouseLoadingRepository } from './warehouse-loading.repository';
 import { WarehouseLoadingsController } from './warehouse-loadings.controller';
+import { WarehouseReleaseDocumentService } from './warehouse-release-document.service';
 import { WarehouseAllocationRuleRepository } from './warehouse-allocation-rule.repository';
 import { WarehouseAllocationService } from './warehouse-allocation.service';
 import { WarehouseFeeRuleRepository } from './warehouse-fee-rule.repository';
@@ -111,8 +111,8 @@ import { WarehousesService } from './warehouses.service';
    WarehouseFeeService,
    WarehouseInvoiceService,
    WarehouseSchedulingAdapterService,
+    WarehouseReleaseDocumentService,
    SchedulingReadFacade,
-    ContractPdfService,
  ],
  exports: [
    WarehousesService,
--- a/apps/edr-freight-web/backoffice/package.json
+++ b/apps/edr-freight-web/backoffice/package.json
@@ -5,6 +5,7 @@
  "type": "module",
  "scripts": {
    "dev": "vite --port 5183",
+    "prebuild": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true});\"",
    "build": "vite build",
    "preview": "vite preview --port 5183",
    "lint": "eslint src",
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
@@ -134,15 +134,23 @@ export function FeePreviewModal({ opened, onClose, inventoryId }: FeePreviewModa
    const pdfWindow = window.open('', '_blank');
    try {
      const releasedItem = await gateClear.mutateAsync(inventoryId) as WarehouseInventoryItem;
-      const documentResponse = await warehouseService.downloadReleaseDocument(inventoryId);
-      const filename = `release-${releasedItem?.booking?.reference ?? releasedItem?.bookingId ?? inventoryId}.pdf`;
-      const opened = openPdfBlob(documentResponse.data, filename, pdfWindow);
-      toast({
-        title: 'Gate clearance recorded',
-        description: opened
-          ? 'The release PDF opened in a browser tab.'
-          : 'The browser blocked the preview tab, so the PDF was downloaded.',
-      });
+      try {
+        const documentResponse = await warehouseService.downloadReleaseDocument(inventoryId);
+        const filename = `release-${releasedItem?.booking?.reference ?? releasedItem?.bookingId ?? inventoryId}.pdf`;
+        const opened = openPdfBlob(documentResponse.data, filename, pdfWindow);
+        toast({
+          title: 'Gate clearance recorded',
+          description: opened
+            ? 'The release PDF opened in a browser tab.'
+            : 'The browser blocked the preview tab, so the PDF was downloaded.',
+        });
+      } catch (documentError) {
+        pdfWindow?.close();
+        toast({
+          title: 'Gate clearance recorded',
+          description: `Release paper could not be opened: ${extractErrorMessage(documentError)}`,
+        });
+      }
      onClose();
    } catch (error) {
      pdfWindow?.close();
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/InterchangeDocumentDetailPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/InterchangeDocumentDetailPanel.tsx
@@ -69,6 +69,8 @@ export function InterchangeDocumentDetailPanel({ id }: { id: string }) {
        />
        <DetailField label="Generated At" value={formatDate(document.generatedAt)} />
        <DetailField label="Acknowledged At" value={formatDate(document.acknowledgedAt)} />
+        <DetailField label="Signed by EDR" value={document.generatedBy} />
+        <DetailField label="Signed by Djibouti Port" value={document.acknowledgedBy} />
        <DetailField label="Customs Ref" value={document.customsReference} />
        <DetailField label="Manifest Ref" value={document.manifestReference} />
      </SimpleGrid>
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/InventoryDetailModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/InventoryDetailModal.tsx
@@ -24,6 +24,15 @@ function DetailRow({ label, value }: { label: string; value: React.ReactNode })
 }

 export function InventoryDetailModal({ opened, onClose, item }: InventoryDetailModalProps) {
+  const bookingReference = item?.booking?.reference ?? '-';
+  const inventorySummary = [
+    item?.status?.replace(/_/g, ' '),
+    item?.releaseOrderReference ? `Release ${item.releaseOrderReference}` : null,
+    item?.warehouse ? `${item.warehouse.name} (${item.warehouse.code})` : null,
+  ]
+    .filter(Boolean)
+    .join(' / ');
+
  return (
    <Modal opened={opened} onClose={onClose} title="Inventory detail" centered size="xl">
      {!item ? (
@@ -33,10 +42,10 @@ export function InventoryDetailModal({ opened, onClose, item }: InventoryDetailM
          <Group justify="space-between" align="flex-start">
            <Stack gap={2}>
              <Text size="lg" fw={800}>
-                {item.booking?.reference ?? item.bookingId ?? item.id}
+                {bookingReference}
              </Text>
              <Text size="sm" c="dimmed">
-                Inventory ID: {item.id}
+                {inventorySummary || 'Inventory information'}
              </Text>
            </Stack>
            <InventoryStatusBadge status={item.status} />
@@ -51,12 +60,12 @@ 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="Booking status" value={item.booking?.status ?? '-'} />
            <DetailRow label="Payment status" value={item.booking?.paymentStatus ?? '-'} />
            <DetailRow label="Trade direction" value={item.booking?.tradeDirection ?? '-'} />
-            <DetailRow label="Container ID" value={item.containerId ?? '-'} />
-            <DetailRow label="Cargo ID" value={item.cargoId ?? '-'} />
-            <DetailRow label="Goods ID" value={item.goodsId ?? '-'} />
+            <DetailRow label="Inventory status" value={item.status.replace(/_/g, ' ')} />
+            <DetailRow label="Release reference" value={item.releaseOrderReference ?? '-'} />
            <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)} />
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
@@ -687,6 +687,7 @@ function ImportTrainDetailTable({ scheduleId }: { scheduleId: string }) {
          <Table.Th>Cargo Type</Table.Th>
          <Table.Th>Weight</Table.Th>
          <Table.Th>Arrival</Table.Th>
+          <Table.Th>Inspection</Table.Th>
          <Table.Th>Current Status</Table.Th>
          <Table.Th>Last Mile</Table.Th>
          <Table.Th>Pickup Option</Table.Th>
@@ -709,6 +710,11 @@ function ImportTrainDetailTable({ scheduleId }: { scheduleId: string }) {
            <Table.Td>{it.cargoType ?? '—'}</Table.Td>
            <Table.Td>{formatNumber(Number(it.weight))}</Table.Td>
            <Table.Td>{formatDate(it.arrivalTime)}</Table.Td>
+            <Table.Td>
+              <Badge size="xs" variant="light" color={it.inspectionStatus === 'PASSED' ? 'green' : 'gray'}>
+                {it.inspectionStatus ?? 'Not inspected'}
+              </Badge>
+            </Table.Td>
            <Table.Td>
              <Badge size="xs" variant="light" color="gray">{it.currentStatus ?? '—'}</Badge>
            </Table.Td>
@@ -726,6 +732,12 @@ function ImportTrainDetailTable({ scheduleId }: { scheduleId: string }) {
 }

 /** Import Arrive Queue: arrived IMPORT trains, with Open (detail) + Auto Unload per train. */
+const getPendingUnloadBookings = (train: ImportTrain) =>
+  train.pendingUnloadBookings ?? train.totalBookings;
+
+const isFullyUnloaded = (train: ImportTrain) =>
+  Boolean(train.fullyUnloaded) || (train.totalBookings > 0 && getPendingUnloadBookings(train) === 0);
+
 function ImportArriveQueueTab({
  enabled,
  onChanged,
@@ -744,9 +756,19 @@ function ImportArriveQueueTab({
  const [busyId, setBusyId] = useState<string | null>(null);

  const autoUnload = async (train: ImportTrain) => {
+    if (isFullyUnloaded(train)) {
+      toast({
+        title: 'Already unloaded',
+        description: `${train.trainNumber ?? 'This train'} has no remaining bookings to auto unload.`,
+      });
+      return;
+    }
+
    setBusyId(train.scheduleId);
    try {
      const r = await autoUnloadMutation.mutateAsync(train.scheduleId);
+      const alreadyUnloaded = r.unloadedCount === 0 && r.skippedCount > 0 && r.failedCount === 0;
+      const firstReason = r.results.find((item) => item.reason)?.reason;
      const extra = [
        r.skippedCount ? `${r.skippedCount} skipped` : '',
        r.failedCount ? `${r.failedCount} failed` : '',
@@ -754,8 +776,8 @@ function ImportArriveQueueTab({
        .filter(Boolean)
        .join(', ');
      toast({
-        title: `${r.unloadedCount} unloaded`,
-        description: extra || undefined,
+        title: alreadyUnloaded ? 'Already unloaded' : `${r.unloadedCount} unloaded`,
+        description: alreadyUnloaded ? firstReason ?? 'This train is already in warehouse inventory.' : extra || undefined,
      });
      onChanged?.();
    } catch (error) {
@@ -800,6 +822,8 @@ function ImportArriveQueueTab({
            <Table.Tbody>
              {trains.map((t: ImportTrain) => {
                const isOpen = openId === t.scheduleId;
+                const fullyUnloaded = isFullyUnloaded(t);
+                const unloadedBookings = t.unloadedBookings ?? t.totalBookings - getPendingUnloadBookings(t);
                return (
                  <Fragment key={t.scheduleId}>
                    <Table.Tr>
@@ -817,7 +841,14 @@ function ImportArriveQueueTab({
                      <Table.Td ta="center">{t.totalContainers}</Table.Td>
                      <Table.Td ta="center">{t.totalCargoes}</Table.Td>
                      <Table.Td>
-                        <Badge color="indigo" variant="light" size="sm">{t.status}</Badge>
+                        <Stack gap={2}>
+                          <Badge color={fullyUnloaded ? 'green' : 'indigo'} variant="light" size="sm">
+                            {fullyUnloaded ? 'UNLOADED' : t.status}
+                          </Badge>
+                          <Text size="xs" c="dimmed">
+                            {Math.max(unloadedBookings, 0)}/{t.totalBookings} unloaded
+                          </Text>
+                        </Stack>
                      </Table.Td>
                      <Table.Td ta="right">
                        <Group gap="xs" justify="flex-end" wrap="nowrap">
@@ -831,12 +862,13 @@ function ImportArriveQueueTab({
                          </Button>
                          <Button
                            size="compact-xs"
-                            color="indigo"
+                            color={fullyUnloaded ? 'gray' : 'indigo'}
                            leftSection={<Truck size={14} />}
                            loading={busyId === t.scheduleId}
+                            disabled={fullyUnloaded || t.totalBookings === 0}
                            onClick={() => autoUnload(t)}
                          >
-                            Auto Unload Arrived Bookings
+                            {fullyUnloaded ? 'Already Unloaded' : 'Auto Unload Arrived Bookings'}
                          </Button>
                        </Group>
                      </Table.Td>
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/warehousePdf.ts
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/warehousePdf.ts
@@ -0,0 +1,273 @@
+import type { WarehouseFeeInvoice, WarehouseInventoryItem } from '@/types/warehouse';
+import type { BookingDetail } from '@/types/booking';
+
+type PdfLine = {
+  text: string;
+  size?: number;
+  bold?: boolean;
+  x?: number;
+  yGap?: number;
+  color?: 'black' | 'green';
+  align?: 'left' | 'center' | 'right';
+};
+
+export interface WarehouseExitPaperContext {
+  invoice: WarehouseFeeInvoice;
+  releasedItem?: WarehouseInventoryItem;
+  inventory?: WarehouseInventoryItem;
+  booking?: BookingDetail | null;
+  releasedAt?: Date;
+}
+
+const escapePdfText = (value: string) =>
+  value.replace(/\\/g, '\\\\').replace(/\(/g, '\\(').replace(/\)/g, '\\)');
+
+const money = (amount: unknown, currency = 'USD') =>
+  `${Number(amount ?? 0).toLocaleString()} ${currency === 'ETB' ? 'Birr (ETB)' : currency}`;
+
+const fmtDate = (value: unknown) => {
+  if (!value) return '-';
+  const date = new Date(value as string | Date);
+  return Number.isNaN(date.getTime()) ? '-' : date.toLocaleString();
+};
+
+const GREEN = '0 0.55 0.32';
+
+const circlePath = (cx: number, cy: number, r: number) => {
+  const k = 0.5522847498;
+  const c = r * k;
+  return [
+    `${cx + r} ${cy} m`,
+    `${cx + r} ${cy + c} ${cx + c} ${cy + r} ${cx} ${cy + r} c`,
+    `${cx - c} ${cy + r} ${cx - r} ${cy + c} ${cx - r} ${cy} c`,
+    `${cx - r} ${cy - c} ${cx - c} ${cy - r} ${cx} ${cy - r} c`,
+    `${cx + c} ${cy - r} ${cx + r} ${cy - c} ${cx + r} ${cy} c`,
+    'h',
+  ].join('\n');
+};
+
+const stampText = (text: string, x: number, y: number, size: number, bold = false) =>
+  `BT\n${GREEN} rg\n/${bold ? 'F2' : 'F1'} ${size} Tf\n${x} ${y} Td\n(${escapePdfText(text)}) Tj\nET`;
+
+const buildCircularSeal = (cx: number, cy: number, label: 'PAID' | 'CLEARED') =>
+  [
+    'q',
+    `${GREEN} RG`,
+    `${GREEN} rg`,
+    '2.2 w',
+    circlePath(cx, cy, 52),
+    'S',
+    '0.9 w',
+    circlePath(cx, cy, 42),
+    'S',
+    stampText('EDR FREIGHT', cx - 33, cy + 24, 9, true),
+    stampText(label, cx - (label === 'CLEARED' ? 36 : 21), cy - 4, label === 'CLEARED' ? 17 : 20, true),
+    stampText(label === 'CLEARED' ? 'GATE RELEASE' : 'WAREHOUSE', cx - (label === 'CLEARED' ? 34 : 32), cy - 25, 8),
+    'Q',
+  ].join('\n');
+
+const estimateTextWidth = (text: string, size: number) => text.length * size * 0.52;
+
+const textX = (text: string, size: number, align: PdfLine['align'] = 'left', x?: number) => {
+  if (typeof x === 'number') return x;
+  if (align === 'center') return Math.max(36, (595 - estimateTextWidth(text, size)) / 2);
+  if (align === 'right') return Math.max(36, 535 - estimateTextWidth(text, size));
+  return 60;
+};
+
+const lineOp = (x1: number, y1: number, x2: number, y2: number, color = '0.65 0.7 0.76') =>
+  `q\n${color} RG\n0.8 w\n${x1} ${y1} m\n${x2} ${y2} l\nS\nQ`;
+
+const textOp = (
+  text: string,
+  x: number,
+  y: number,
+  size = 10,
+  bold = false,
+  color = '0 0 0',
+) => `BT\n${color} rg\n/${bold ? 'F2' : 'F1'} ${size} Tf\n${x} ${y} Td\n(${escapePdfText(text)}) Tj\nET`;
+
+const buildAuthorizationBand = (label: 'PAID' | 'CLEARED') => [
+  lineOp(60, 242, 535, 242),
+  textOp('AUTHORIZED SEAL', 382, 218, 9, true, GREEN),
+  buildCircularSeal(452, 155, label),
+];
+
+const buildWarehouseOfficerSealBand = () => [
+  lineOp(60, 218, 535, 218),
+  textOp('WAREHOUSE OFFICER SEAL', 92, 194, 9, true, GREEN),
+  buildCircularSeal(170, 128, 'CLEARED'),
+  textOp('Officer in charge name / signature / date:', 292, 154, 10),
+  lineOp(292, 132, 535, 132, '0 0 0'),
+  textOp('Customer or driver name / signature / date:', 292, 94, 10),
+  lineOp(292, 72, 535, 72, '0 0 0'),
+];
+
+function buildSimplePdf(lines: PdfLine[], rawOps: string[] = []): Blob {
+  let y = 800;
+  const streamLines = lines.map((line) => {
+    y -= line.yGap ?? 16;
+    const size = line.size ?? 10;
+    const font = line.bold ? '/F2' : '/F1';
+    const color = line.color === 'green' ? `${GREEN} rg` : '0 0 0 rg';
+    return `BT\n${color}\n${font} ${size} Tf\n${textX(line.text, size, line.align, line.x)} ${y} Td\n(${escapePdfText(line.text)}) Tj\nET`;
+  });
+  const stream = [...rawOps, ...streamLines].join('\n');
+  const objects = [
+    '<< /Type /Catalog /Pages 2 0 R >>',
+    '<< /Type /Pages /Kids [3 0 R] /Count 1 >>',
+    '<< /Type /Page /Parent 2 0 R /MediaBox [0 0 595 842] /Resources << /Font << /F1 4 0 R /F2 5 0 R >> >> /Contents 6 0 R >>',
+    '<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>',
+    '<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica-Bold >>',
+    `<< /Length ${stream.length} >>\nstream\n${stream}\nendstream`,
+  ];
+
+  let pdf = '%PDF-1.4\n';
+  const offsets = [0];
+  objects.forEach((object, index) => {
+    offsets.push(pdf.length);
+    pdf += `${index + 1} 0 obj\n${object}\nendobj\n`;
+  });
+  const xref = pdf.length;
+  pdf += `xref\n0 ${objects.length + 1}\n0000000000 65535 f \n`;
+  offsets.slice(1).forEach((offset) => {
+    pdf += `${String(offset).padStart(10, '0')} 00000 n \n`;
+  });
+  pdf += `trailer\n<< /Size ${objects.length + 1} /Root 1 0 R >>\nstartxref\n${xref}\n%%EOF\n`;
+  return new Blob([pdf], { type: 'application/pdf' });
+}
+
+export function buildWarehouseInvoicePdf(invoice: WarehouseFeeInvoice, kind: 'INVOICE' | 'RECEIPT') {
+  const paid = kind === 'RECEIPT' || invoice.status === 'PAID';
+  const title = `Warehouse Fee ${kind === 'RECEIPT' ? 'Receipt' : 'Invoice'}`;
+  const bookingReference = firstText(invoice.bookingReference);
+  const customerName = firstText(invoice.customerName);
+  const inventoryReference = firstText(invoice.inventoryReference);
+  const inventoryInfo = firstText(invoice.inventoryInfo, invoice.containerNumber, invoice.cargoDescription);
+  const clearanceStatus = firstText(
+    invoice.clearanceStatus,
+    paid ? 'FEE PAID - READY FOR RELEASE' : 'PENDING PAYMENT',
+  );
+  const lines: PdfLine[] = [
+    { text: 'Ethio-Djibouti Railway S.C.', size: 12, bold: true, yGap: 0, align: 'center' },
+    { text: title, size: 23, bold: true, yGap: 28, align: 'center' },
+    { text: `Document No: ${invoice.invoiceNumber}`, size: 12, bold: true, yGap: 32, align: 'center' },
+    { text: `Status: ${invoice.status.replace(/_/g, ' ')}     Type: ${invoice.invoiceType.replace(/_/g, ' ')}`, align: 'center' },
+    { text: `Booking Reference: ${bookingReference}     Customer: ${customerName}`, align: 'center' },
+    { text: `Inventory Reference: ${inventoryReference}     Inventory Info: ${inventoryInfo}`, align: 'center' },
+    { text: `Clearance: ${clearanceStatus}`, align: 'center' },
+    { text: `Issued: ${fmtDate(invoice.issuedAt)}     Paid At: ${fmtDate(invoice.paidAt)}`, align: 'center' },
+    { text: 'ITEMS', size: 13, bold: true, yGap: 30, align: 'center' },
+    ...(invoice.items ?? []).flatMap((item) => [
+      { text: item.description, bold: true, align: 'center' as const },
+      {
+        text: `${item.feeType.replace(/_/g, ' ')} | Qty ${Number(item.quantity ?? 0).toLocaleString()} | Rate ${money(item.unitRate, item.currency)} | Amount ${money(item.amount, item.currency)}`,
+        yGap: 13,
+        align: 'center' as const,
+      },
+    ]),
+    { text: 'TOTALS', size: 13, bold: true, yGap: 30, align: 'center' },
+    { text: `Subtotal: ${money(invoice.subtotalAmount, invoice.currency)}`, align: 'center' },
+    { text: `Tax: ${money(invoice.taxAmount, invoice.currency)}`, align: 'center' },
+    { text: `Total: ${money(invoice.totalAmount, invoice.currency)}`, bold: true, align: 'center' },
+    { text: `Paid: ${money(invoice.paidAmount, invoice.currency)}`, align: 'center' },
+    { text: `Balance: ${money(invoice.balanceAmount, invoice.currency)}`, bold: true, align: 'center' },
+  ];
+  const authorizationOps = [
+    ...buildAuthorizationBand('PAID'),
+    textOp('Prepared by EDR warehouse finance', 72, 196, 10),
+    textOp('Finance officer name / signature / date:', 72, 164, 10),
+    lineOp(245, 162, 360, 162, '0 0 0'),
+  ];
+  const invoiceOps = [
+    lineOp(60, 242, 535, 242),
+    textOp('Prepared by EDR warehouse finance', 72, 196, 10),
+    textOp('Finance officer name / signature / date:', 72, 164, 10),
+    lineOp(245, 162, 360, 162, '0 0 0'),
+  ];
+  return buildSimplePdf(lines, paid ? authorizationOps : invoiceOps);
+}
+
+const firstText = (...values: Array<unknown>) => {
+  for (const value of values) {
+    if (value !== null && value !== undefined && String(value).trim()) return String(value);
+  }
+  return '-';
+};
+
+const tons = (value: unknown) => {
+  const num = Number(value ?? 0);
+  if (!Number.isFinite(num) || num <= 0) return null;
+  return `${num.toLocaleString(undefined, { maximumFractionDigits: 3 })} ton`;
+};
+
+const containerSummary = (booking?: BookingDetail | null, inventory?: WarehouseInventoryItem) => {
+  const explicitNumber = (inventory as unknown as { containerNumber?: string | null })?.containerNumber;
+  if (explicitNumber) return explicitNumber;
+  const containers = booking?.bookingContainers ?? [];
+  if (!containers.length) return '-';
+  return containers
+    .map((item) => {
+      const type = item.containerType?.code ?? item.containerType?.label ?? item.containerTypeId;
+      return `${item.quantity} x ${type}`;
+    })
+    .join(', ');
+};
+
+export function buildWarehouseExitPaperPdf(input: WarehouseFeeInvoice | WarehouseExitPaperContext, releasedItemArg?: WarehouseInventoryItem) {
+  const context: WarehouseExitPaperContext =
+    'invoice' in input ? input : { invoice: input, releasedItem: releasedItemArg };
+  const { invoice, booking } = context;
+  const releasedItem = context.releasedItem;
+  const inventory = context.inventory ?? releasedItem;
+  const releasedAt = context.releasedAt ?? new Date();
+  const releaseReference = firstText(
+    inventory?.releaseOrderReference,
+    releasedItem?.releaseOrderReference,
+    invoice.inventoryReference,
+    booking?.reference ? `REL-${booking.reference.replace(/^BK-?/i, '')}` : null,
+  );
+  const customerName = firstText(
+    booking?.company?.name,
+    booking?.company?.companyName,
+    booking?.company?.label,
+    booking?.company?.contactPersonName,
+    invoice.customerName,
+  );
+  const weightTons = firstText(tons(booking?.cargoTotalWeightVgm), tons(inventory?.weight));
+  const inventoryInfo = firstText(
+    invoice.inventoryInfo,
+    invoice.containerNumber,
+    invoice.cargoDescription,
+    inventory?.status,
+    releasedItem?.status,
+  );
+  const bookingReference = firstText(
+    booking?.reference,
+    (inventory as unknown as { bookingReference?: string })?.bookingReference,
+    invoice.bookingReference,
+    releasedItem?.booking?.reference,
+  );
+
+  return buildSimplePdf([
+    { text: 'Ethio-Djibouti Railway S.C.', size: 12, bold: true, yGap: 0, align: 'center' },
+    { text: 'Warehouse Release / Exit Paper', size: 23, bold: true, yGap: 28, align: 'center' },
+    { text: '[ GATE CLEARANCE ]', size: 14, bold: true, color: 'green', yGap: 24, align: 'center' },
+    { text: `Release Reference: ${releaseReference}`, bold: true, yGap: 30, align: 'center' },
+    { text: `Invoice No: ${invoice.invoiceNumber}`, align: 'center' },
+    { text: `Booking Reference: ${bookingReference}`, align: 'center' },
+    { text: `Customer: ${customerName}`, align: 'center' },
+    { text: `Inventory Info: ${inventoryInfo}`, align: 'center' },
+    { text: `Warehouse: ${firstText(inventory?.warehouse?.name, inventory?.warehouse?.code)}`, align: 'center' },
+    { text: `Yard: ${firstText(inventory?.yard?.name, inventory?.yard?.code)}`, align: 'center' },
+    { text: `Zone: ${firstText(inventory?.zone?.name, inventory?.zone?.code)}`, align: 'center' },
+    { text: `Booking Container: ${containerSummary(booking, inventory)}`, align: 'center' },
+    { text: `Weight: ${weightTons}`, align: 'center' },
+    { text: `Inventory Status: ${releasedItem?.status ?? inventory?.status ?? 'RELEASED'}`, align: 'center' },
+    { text: `Clearance: ${invoice.clearanceStatus ?? 'CLEARED FOR WAREHOUSE EXIT'}`, bold: true, color: 'green', align: 'center' },
+    { text: `Release Date & Time: ${fmtDate(releasedAt)}`, align: 'center' },
+    { text: 'This sealed document authorizes the listed booking/goods to leave the warehouse gate.', yGap: 30, align: 'center' },
+  ], [
+    ...buildWarehouseOfficerSealBand(),
+  ]);
+}
--- a/apps/edr-freight-web/backoffice/src/constants/URLS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
@@ -358,6 +358,8 @@ export const URL_CONSTANTS = {
  WAREHOUSE_INVOICES: {
    BASE: '/warehouse-fee-invoices',
    BY_ID: (id: string) => `/warehouse-fee-invoices/${id}`,
+    DOCUMENT: (id: string) => `/warehouse-fee-invoices/${id}/document`,
+    RECEIPT: (id: string) => `/warehouse-fee-invoices/${id}/receipt`,
    CANCEL: (id: string) => `/warehouse-fee-invoices/${id}/cancel`,
    PAY: (id: string) => `/warehouse-fee-invoices/${id}/pay`,
    GENERATE: (inventoryId: string) => `/warehouse-inventory/${inventoryId}/generate-fee-invoice`,
--- a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts
@@ -1,3 +1,6 @@
-export const API_BASE_URL = 'https://edrfreightapi.triaplc.com';
+export const API_BASE_URL =
+  import.meta.env.VITE_BASE_API_URL ||
+  import.meta.env.VITE_API_URL ||
+  'https://edrfreightapi.triaplc.com';

-//export const API_BASE_URL = 'http://localhost:3001';
+//export const API_BASE_URL = 'http://localhost:3001';
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/ArrivalQueuePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/ArrivalQueuePage.tsx
@@ -37,6 +37,12 @@ const getErrorMessage = (error: unknown) => {
  return error instanceof Error ? error.message : undefined;
 };

+const getPendingUnloadBookings = (train: ImportTrain) =>
+  train.pendingUnloadBookings ?? train.totalBookings;
+
+const isFullyUnloaded = (train: ImportTrain) =>
+  Boolean(train.fullyUnloaded) || (train.totalBookings > 0 && getPendingUnloadBookings(train) === 0);
+
 function ImportTrainDetailRows({ scheduleId }: { scheduleId: string }) {
  const { data: items = [], isLoading } = useImportTrainItems(scheduleId);

@@ -67,6 +73,7 @@ function ImportTrainDetailRows({ scheduleId }: { scheduleId: string }) {
          <Table.Th>Weight</Table.Th>
          <Table.Th>Arrival</Table.Th>
          <Table.Th>Status</Table.Th>
+          <Table.Th>Inspection</Table.Th>
          <Table.Th>Pickup</Table.Th>
        </Table.Tr>
      </Table.Thead>
@@ -88,6 +95,11 @@ function ImportTrainDetailRows({ scheduleId }: { scheduleId: string }) {
                {item.currentStatus ?? 'PENDING'}
              </Badge>
            </Table.Td>
+            <Table.Td>
+              <Badge variant="light" color={item.inspectionStatus === 'PASSED' ? 'green' : 'gray'} size="sm">
+                {item.inspectionStatus ?? 'Not inspected'}
+              </Badge>
+            </Table.Td>
            <Table.Td>{item.pickupOption.replace(/_/g, ' ')}</Table.Td>
          </Table.Tr>
        ))}
@@ -105,10 +117,20 @@ export default function ArrivalQueuePage() {
  const [busyScheduleId, setBusyScheduleId] = useState<string | null>(null);

  const unloadTrain = async (train: ImportTrain) => {
+    if (isFullyUnloaded(train)) {
+      toast({
+        title: 'Already unloaded',
+        description: `${train.trainNumber ?? 'This train'} has no remaining bookings to auto unload.`,
+      });
+      return;
+    }
+
    setBusyScheduleId(train.scheduleId);
    try {
      const res = (await autoUnload.mutateAsync(train.scheduleId)) as { data: AutoUnloadArrivedResult };
      const result = res.data;
+      const alreadyUnloaded = result.unloadedCount === 0 && result.skippedCount > 0 && result.failedCount === 0;
+      const firstReason = result.results.find((item) => item.reason)?.reason;
      const details = [
        result.skippedCount ? `${result.skippedCount} skipped` : '',
        result.failedCount ? `${result.failedCount} failed` : '',
@@ -117,8 +139,10 @@ export default function ArrivalQueuePage() {
        .join(', ');

      toast({
-        title: `${result.unloadedCount} booking(s) unloaded`,
-        description: details || `${train.trainNumber ?? 'Train'} moved into warehouse inventory.`,
+        title: alreadyUnloaded ? 'Already unloaded' : `${result.unloadedCount} booking(s) unloaded`,
+        description: alreadyUnloaded
+          ? firstReason ?? `${train.trainNumber ?? 'Train'} is already in warehouse inventory.`
+          : details || `${train.trainNumber ?? 'Train'} moved into warehouse inventory.`,
      });
    } catch (error) {
      toast({
@@ -181,6 +205,8 @@ export default function ArrivalQueuePage() {
                <Table.Tbody>
                  {trains.map((train: ImportTrain) => {
                    const isOpen = openScheduleId === train.scheduleId;
+                    const fullyUnloaded = isFullyUnloaded(train);
+                    const unloadedBookings = train.unloadedBookings ?? train.totalBookings - getPendingUnloadBookings(train);
                    return (
                      <Fragment key={train.scheduleId}>
                        <Table.Tr>
@@ -204,9 +230,14 @@ export default function ArrivalQueuePage() {
                          <Table.Td ta="center">{train.totalContainers}</Table.Td>
                          <Table.Td ta="center">{train.totalCargoes}</Table.Td>
                          <Table.Td>
-                            <Badge variant="light" color="teal" size="sm">
-                              {train.status}
-                            </Badge>
+                            <Stack gap={2}>
+                              <Badge variant="light" color={fullyUnloaded ? 'green' : 'teal'} size="sm">
+                                {fullyUnloaded ? 'UNLOADED' : train.status}
+                              </Badge>
+                              <Text size="xs" c="dimmed">
+                                {Math.max(unloadedBookings, 0)}/{train.totalBookings} unloaded
+                              </Text>
+                            </Stack>
                          </Table.Td>
                          <Table.Td>
                            <Group gap="xs" justify="flex-end" wrap="nowrap">
@@ -220,12 +251,13 @@ export default function ArrivalQueuePage() {
                              </Button>
                              <Button
                                size="compact-xs"
-                                color="orange"
+                                color={fullyUnloaded ? 'gray' : 'orange'}
                                leftSection={busyScheduleId === train.scheduleId ? <PackageOpen size={14} /> : <Truck size={14} />}
                                loading={busyScheduleId === train.scheduleId}
+                                disabled={fullyUnloaded || train.totalBookings === 0}
                                onClick={() => unloadTrain(train)}
                              >
-                                Auto Unload
+                                {fullyUnloaded ? 'Already Unloaded' : 'Auto Unload'}
                              </Button>
                            </Group>
                          </Table.Td>
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/ExportDjiboutiUnloadingQueuePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/ExportDjiboutiUnloadingQueuePage.tsx
@@ -193,14 +193,14 @@ export default function ExportDjiboutiUnloadingQueuePage() {
        result.skippedCount ? `${result.skippedCount} skipped` : '',
        result.failedCount ? `${result.failedCount} failed` : '',
        result.interchangeDocument
-          ? `Interchange document ${result.interchangeDocument.documentNo} generated`
+          ? `Signed interchange document ${result.interchangeDocument.documentNo} generated`
          : '',
      ]
        .filter(Boolean)
        .join(', ');

      toast({
-        title: `${result.unloadedCount} export item(s) unloaded`,
+        title: `${result.unloadedCount} export item(s) auto unloaded`,
        description: details || `${train.trainNumber ?? 'Train'} unloaded at Djibouti Port.`,
      });
    } catch (error) {
@@ -224,7 +224,8 @@ export default function ExportDjiboutiUnloadingQueuePage() {
        handoverFrom: 'EDR',
        handoverTo: 'Djibouti Port Operator',
        portOperatorName: 'Doraleh Multipurpose Port',
-        remarks: 'Generated after export unloading at Djibouti Port',
+        generatedBy: 'EDR Operations',
+        remarks: 'Generated after export unloading at Djibouti Port; signed by EDR and Djibouti Port Operator.',
      });
      toast({
        title: 'Interchange document generated',
@@ -249,21 +250,21 @@ export default function ExportDjiboutiUnloadingQueuePage() {
      <Stack gap="lg" mt="sm">
        <PageHeader
          title="Djibouti Arrival / Unloading Queue"
-          subtitle="Arrived export trains at Djibouti-side destinations ready for unloading."
+          subtitle="Arrived export trains at Djibouti-side destinations, auto unloading, and signed interchange handover."
        />

        <WarehouseHero
          variant="train"
          secondaryVariant="container"
          title="Export Unloading at Djibouti Port"
-          subtitle="Review arrived export trains and unload eligible assigned export items."
+          subtitle="Review arrived trains, auto unload eligible export items, then generate the EDR and Djibouti Port signed interchange document."
        />

        <Card withBorder radius="md" padding="lg">
          <Group justify="space-between" mb="md">
            <Text fw={600}>{trains.length} arrived export train(s)</Text>
            <Text size="sm" c="dimmed">
-              Open a train to review assigned export items, then auto unload it.
+              Open a train, auto unload it, then view the signed interchange document.
            </Text>
          </Group>

@@ -368,7 +369,7 @@ export default function ExportDjiboutiUnloadingQueuePage() {
                                  loading={busyScheduleId === train.scheduleId && generateInterchange.isPending}
                                  onClick={() => generateInterchangeDocument(train)}
                                >
-                                  Generate Interchange Document
+                                  Generate Signed Document
                                </Button>
                              )}
                            </Group>
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
@@ -93,6 +93,8 @@ function InterchangeDocumentDetail({ id }: { id: string }) {
        />
        <DetailField label="Generated At" value={formatDate(document.generatedAt)} />
        <DetailField label="Acknowledged At" value={formatDate(document.acknowledgedAt)} />
+        <DetailField label="Signed by EDR" value={document.generatedBy} />
+        <DetailField label="Signed by Djibouti Port" value={document.acknowledgedBy} />
        <DetailField label="Customs Ref" value={document.customsReference} />
        <DetailField label="Manifest Ref" value={document.manifestReference} />
      </SimpleGrid>
@@ -221,6 +223,7 @@ export default function InterchangeDocumentsPage() {
                  <Table.Th>Handover From</Table.Th>
                  <Table.Th>Handover To</Table.Th>
                  <Table.Th>Status</Table.Th>
+                  <Table.Th>Signed By</Table.Th>
                  <Table.Th>Generated At</Table.Th>
                  <Table.Th ta="right">Actions</Table.Th>
                </Table.Tr>
@@ -251,6 +254,14 @@ export default function InterchangeDocumentsPage() {
                        {document.status}
                      </Badge>
                    </Table.Td>
+                    <Table.Td>
+                      <Stack gap={0}>
+                        <Text size="sm">{document.generatedBy ?? '-'}</Text>
+                        <Text size="xs" c="dimmed">
+                          {document.acknowledgedBy ?? 'Awaiting Djibouti Port'}
+                        </Text>
+                      </Stack>
+                    </Table.Td>
                    <Table.Td>{formatDate(document.generatedAt)}</Table.Td>
                    <Table.Td>
                      <Group gap="xs" justify="flex-end" wrap="nowrap">
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/WarehouseInvoicesPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/WarehouseInvoicesPage.tsx
@@ -15,19 +15,24 @@ import {
  Text,
  TextInput,
 } from '@mantine/core';
-import { Ban, CreditCard, Eye, Search } from 'lucide-react';
+import { Ban, CreditCard, DoorOpen, Download, Eye, Receipt, Search } from 'lucide-react';
 import { DataTable, type ColumnDef } from '@edr/ui-common';

 import { PageContainer, PageHeader } from '@/components/page';
 import { useMutation, useQuery } from '@tanstack/react-query';

 import { api } from '@/services/api';
+import { bookingsService } from '@/services/bookings.service';
+import { warehouseService } from '@/services/warehouse.service';
 import { useToast } from '@/hooks/use-toast';
 import {
  WAREHOUSE_INVOICE_STATUSES,
  type WarehouseFeeInvoice,
  type WarehouseInvoiceStatus,
 } from '@/types/warehouse';
+import { openPdfBlob } from '@/components/warehouses/pdf';
+import { buildWarehouseExitPaperPdf, buildWarehouseInvoicePdf } from '@/components/warehouses/warehousePdf';
+import { extractErrorMessage } from '@/components/warehouses/options';

 const STATUS_COLOR: Record<WarehouseInvoiceStatus, string> = {
  DRAFT: 'gray',
@@ -158,18 +163,108 @@ function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () =>
  );
  const pay = useMutation(api.warehouses.payInvoice.mutationOptions());
  const cancel = useMutation(api.warehouses.cancelInvoice.mutationOptions());
+  const gateClear = useMutation(api.warehouses.gateClearance.mutationOptions());
  const [payAmount, setPayAmount] = useState<number | ''>('');

  const canPay = inv && (inv.status === 'ISSUED' || inv.status === 'PARTIALLY_PAID');
+  const canGateClear = inv?.status === 'PAID' && Boolean(inv.inventoryId);
+
+  const downloadInvoicePdf = async (invoice: WarehouseFeeInvoice) => {
+    const blob = buildWarehouseInvoicePdf(invoice, 'INVOICE');
+    openPdfBlob(blob, `warehouse-invoice-${invoice.invoiceNumber}.pdf`);
+  };
+
+  const downloadReceiptPdf = async (invoice: WarehouseFeeInvoice) => {
+    const blob = buildWarehouseInvoicePdf(invoice, 'RECEIPT');
+    openPdfBlob(blob, `warehouse-receipt-${invoice.invoiceNumber}.pdf`);
+  };
+
+  const getExitPaperContext = async (invoice: WarehouseFeeInvoice) => {
+    const [booking, inventoryRows] = await Promise.all([
+      invoice.bookingId
+        ? bookingsService.getById(invoice.bookingId).catch(() => null)
+        : Promise.resolve(null),
+      invoice.bookingId
+        ? warehouseService.listInventory({ bookingId: invoice.bookingId }).then((response) => response.data).catch(() => [])
+        : Promise.resolve([]),
+    ]);
+    const inventory = inventoryRows.find((item) => item.id === invoice.inventoryId) ?? inventoryRows[0] ?? undefined;
+    return { booking, inventory };
+  };
+
+  const handleGateClearance = async (invoice: WarehouseFeeInvoice) => {
+    if (!invoice.inventoryId) {
+      toast({
+        variant: 'destructive',
+        title: 'Gate clearance failed',
+        description: 'This invoice is not linked to an inventory item.',
+      });
+      return;
+    }
+
+    const pdfWindow = window.open('', '_blank');
+    try {
+      const releasedAt = new Date();
+      const releasedItem = await gateClear.mutateAsync(invoice.inventoryId);
+      let documentResponse: Awaited<ReturnType<typeof warehouseService.downloadReleaseDocument>>;
+      try {
+        documentResponse = await warehouseService.downloadReleaseDocument(invoice.inventoryId);
+      } catch (documentError) {
+        const context = await getExitPaperContext(invoice);
+        const fallbackBlob = buildWarehouseExitPaperPdf({
+          invoice,
+          releasedItem,
+          inventory: context.inventory,
+          booking: context.booking,
+          releasedAt,
+        });
+        const opened = openPdfBlob(
+          fallbackBlob,
+          `release-${releasedItem?.booking?.reference ?? releasedItem?.bookingId ?? invoice.inventoryId}.pdf`,
+          pdfWindow,
+        );
+        toast({
+          title: 'Gate clearance recorded',
+          description: opened
+            ? 'The API exit paper failed, so a sealed fallback PDF opened instead.'
+            : `The API exit paper failed (${extractErrorMessage(documentError)}), so a sealed fallback PDF was downloaded.`,
+        });
+        onClose();
+        return;
+      }
+      const filename = `release-${releasedItem?.booking?.reference ?? releasedItem?.bookingId ?? invoice.inventoryId}.pdf`;
+      const opened = openPdfBlob(documentResponse.data, filename, pdfWindow);
+      toast({
+        title: 'Gate clearance recorded',
+        description: opened
+          ? 'The exit paper opened in a browser tab.'
+          : 'The browser blocked the preview tab, so the exit paper was downloaded.',
+      });
+      onClose();
+    } catch (e) {
+      pdfWindow?.close();
+      toast({
+        variant: 'destructive',
+        title: 'Gate clearance failed',
+        description: extractErrorMessage(e),
+      });
+    }
+  };

  const handlePay = async () => {
    if (!inv || !payAmount) return;
    try {
-      await pay.mutateAsync({ id: inv.id, payload: { amount: Number(payAmount), method: 'MANUAL' } });
-      toast({ title: 'Payment recorded' });
+      const paidInvoice = await pay.mutateAsync({ id: inv.id, payload: { amount: Number(payAmount), method: 'MANUAL' } });
      setPayAmount('');
+      if (paidInvoice.status === 'PAID') {
+        toast({ title: 'Payment recorded', description: 'Downloading receipt, then generating gate clearance and exit paper.' });
+        await downloadReceiptPdf(paidInvoice);
+        await handleGateClearance(paidInvoice);
+      } else {
+        toast({ title: 'Payment recorded' });
+      }
    } catch (e) {
-      toast({ variant: 'destructive', title: 'Payment failed', description: (e as Error)?.message });
+      toast({ variant: 'destructive', title: 'Payment failed', description: extractErrorMessage(e) });
    }
  };

@@ -180,7 +275,7 @@ function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () =>
      toast({ title: 'Invoice cancelled' });
      onClose();
    } catch (e) {
-      toast({ variant: 'destructive', title: 'Cancel failed', description: (e as Error)?.message });
+      toast({ variant: 'destructive', title: 'Cancel failed', description: extractErrorMessage(e) });
    }
  };

@@ -247,6 +342,34 @@ function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () =>
          )}

          <Group justify="flex-end" mt="sm">
+            <Button
+              variant="light"
+              color="gray"
+              leftSection={<Download size={16} />}
+              onClick={() => downloadInvoicePdf(inv)}
+            >
+              Invoice PDF
+            </Button>
+            {Number(inv.paidAmount) > 0 && (
+              <Button
+                variant="light"
+                color="teal"
+                leftSection={<Receipt size={16} />}
+                onClick={() => downloadReceiptPdf(inv)}
+              >
+                Receipt PDF
+              </Button>
+            )}
+            {canGateClear && (
+              <Button
+                color="edr-green"
+                leftSection={<DoorOpen size={16} />}
+                loading={gateClear.isPending}
+                onClick={() => handleGateClearance(inv)}
+              >
+                Gate clearance & exit paper
+              </Button>
+            )}
            {inv.status !== 'PAID' && inv.status !== 'CANCELLED' && (
              <Button variant="light" color="red" leftSection={<Ban size={16} />} loading={cancel.isPending} onClick={handleCancel}>
                Cancel invoice
--- a/apps/edr-freight-web/backoffice/src/services/warehouse.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/warehouse.service.ts
@@ -263,6 +263,14 @@ export const warehouseService = {
    }),
  getInvoice: (id: string) =>
    apiClient.get<WarehouseFeeInvoice>(URL_CONSTANTS.WAREHOUSE_INVOICES.BY_ID(id)),
+  downloadInvoiceDocument: (id: string) =>
+    apiClient.get<Blob>(URL_CONSTANTS.WAREHOUSE_INVOICES.DOCUMENT(id), {
+      responseType: 'blob',
+    }),
+  downloadInvoiceReceipt: (id: string) =>
+    apiClient.get<Blob>(URL_CONSTANTS.WAREHOUSE_INVOICES.RECEIPT(id), {
+      responseType: 'blob',
+    }),
  invoicesForInventory: (inventoryId: string) =>
    apiClient.get<WarehouseFeeInvoice[]>(URL_CONSTANTS.WAREHOUSE_INVOICES.FOR_INVENTORY(inventoryId)),
  invoicesForBooking: (bookingId: string) =>
--- a/apps/edr-freight-web/backoffice/src/types/warehouse.ts
+++ b/apps/edr-freight-web/backoffice/src/types/warehouse.ts
@@ -430,6 +430,9 @@ export interface ImportTrain {
  totalBookings: number;
  totalContainers: number;
  totalCargoes: number;
+  unloadedBookings?: number;
+  pendingUnloadBookings?: number;
+  fullyUnloaded?: boolean;
  status: string;
 }

@@ -510,6 +513,7 @@ export interface ImportTrainItem {
  weight: number | null;
  arrivalTime: string | null;
  currentStatus: string | null;
+  inspectionStatus: string | null;
  lastMileRequested: boolean;
  pickupOption: string;
 }
@@ -733,8 +737,16 @@ export interface WarehouseFeeInvoice {
  id: string;
  invoiceNumber: string;
  bookingId?: string | null;
+  bookingReference?: string | null;
  customerId?: string | null;
+  customerName?: string | null;
  inventoryId: string;
+  inventoryReference?: string | null;
+  inventoryInfo?: string | null;
+  inventoryStatus?: string | null;
+  containerNumber?: string | null;
+  cargoDescription?: string | null;
+  clearanceStatus?: string | null;
  facilityId?: string | null;
  warehouseId?: string | null;
  yardId?: string | null;