Merge pull request #525 from Tria-plc/Truckdetantion

Container truck assignment on customer portal for import

apps/edr-freight-api/src/migrations/2020000000000-WarehouseCapacityKgToTons.ts

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Weights are tonnes everywhere. Warehouse / yard / zone capacity was stored in
+ * kg (e.g. 25000, 5000, 2500) — convert existing rows to tonnes (÷1000). Cargo
+ * weight (warehouse_inventory.weight ← cargo_total_weight_vgm) is already tonnes
+ * and is NOT touched; truck gross weight has no data yet. Runs exactly once
+ * (tracked by TypeORM) — re-running would divide again.
+ */
+export class WarehouseCapacityKgToTons2020000000000 implements MigrationInterface {
+  name = 'WarehouseCapacityKgToTons2020000000000';
+
+  private readonly tables = ['warehouses', 'warehouse_yards', 'warehouse_zones'];
+  private readonly columns = ['capacity_weight', 'current_weight', 'max_weight'];
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    for (const table of this.tables) {
+      for (const column of this.columns) {
+        await queryRunner.query(
+          `UPDATE freight.${table} SET ${column} = ${column} / 1000.0 WHERE ${column} IS NOT NULL`,
+        );
+      }
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    for (const table of this.tables) {
+      for (const column of this.columns) {
+        await queryRunner.query(
+          `UPDATE freight.${table} SET ${column} = ${column} * 1000.0 WHERE ${column} IS NOT NULL`,
+        );
+      }
+    }
+  }
+}

apps/edr-freight-api/src/modules/bookings/customer-truck.service.ts

@@ -42,16 +42,16 @@ export class CustomerTruckService {
     const booking = await this.loadBookingGuard(bookingId);
     this.assertSelfHaulPaid(booking);
 
-    const isExport = booking.tradeDirection === 'EXPORT';
     const requested = (dto.containerNumbers ?? []).map((n) => n.trim().toUpperCase());
 
-    // EXPORT: the truck delivers 1–2 known containers. IMPORT: containers are
+    // Both import and export specify the containers each truck carries. Capacity
-    // not pre-specified — they are registered + weighed when the truck leaves.
+    // is size-based: a 40ft container fills the truck (max 1); two 20ft containers
-    if (isExport) {
+    // fit (max 2), no size mixing. #trucks <= #containers follows naturally since
-      if (requested.length < 1 || requested.length > 2) {
+    // each container is assigned to exactly one truck.
-        throw new BadRequestException('An export truck must carry 1 or 2 of the booking containers');
+    if (requested.length < 1) {
-      }
+      throw new BadRequestException('Select at least one container for this truck');
-    } else if (requested.length > 2) {
+    }
+    if (requested.length > 2) {
       throw new BadRequestException('A truck carries at most 2 containers');
     }
 
@@ -68,6 +68,13 @@ export class CustomerTruckService {
           throw new ConflictException(`Container ${n} is already loaded onto another truck`);
         }
       }
+      // Size cap: a 40ft container fills the truck.
+      const sizes = await this.containerSizes(bookingId, requested);
+      if (sizes.some((s) => s.includes('40')) && requested.length > 1) {
+        throw new BadRequestException(
+          'A 40ft container fills the truck — assign only 1 container to this truck',
+        );
+      }
     }
 
     await this.dataSource.transaction(async (manager) => {
@@ -244,7 +251,7 @@ export class CustomerTruckService {
       }
     }
 
-    const grossKg = await this.vgmKgForContainers(bookingId, requested);
+    const grossTons = await this.vgmTonsForContainers(bookingId, requested);
     await this.dataSource.transaction(async (manager) => {
       await manager.getRepository(CustomerTruckContainer).softDelete({ assignmentId });
       await manager.getRepository(CustomerTruckContainer).save(
@@ -256,18 +263,19 @@ export class CustomerTruckService {
           }),
         ),
       );
-      // Provisional gross from the loaded containers' VGM — overridden by the
+      // Provisional gross (tonnes) from the loaded containers' VGM — overridden
-      // weighed gross on departure.
+      // by the weighed gross on departure. (Column is *_kg but holds tonnes.)
       await manager.getRepository(CustomerTruckAssignment).update(assignmentId, {
-        grossWeightKg: grossKg,
+        grossWeightKg: grossTons,
       });
     });
     return this.listTrucks(bookingId);
   }
 
-  private async vgmKgForContainers(bookingId: string, numbers: string[]): Promise<number> {
+  /** Summed VGM (tonnes) of the given containers — provisional truck gross. */
-    const [row]: Array<{ kg: string }> = await this.dataSource.query(
+  private async vgmTonsForContainers(bookingId: string, numbers: string[]): Promise<number> {
-      `SELECT COALESCE(SUM(bcu.vgm_tons), 0) * 1000 AS kg
+    const [row]: Array<{ tons: string }> = await this.dataSource.query(
+      `SELECT COALESCE(SUM(bcu.vgm_tons), 0) AS tons
          FROM freight.booking_container_units bcu
          JOIN freight.booking_container bc
            ON bc.id = bcu.booking_container_id AND bc.deleted_at IS NULL
@@ -276,7 +284,7 @@ export class CustomerTruckService {
           AND bcu.deleted_at IS NULL`,
       [bookingId, numbers],
     );
-    return Number(row?.kg ?? 0);
+    return Number(row?.tons ?? 0);
   }
 
   /**
@@ -399,4 +407,20 @@ export class CustomerTruckService {
     );
     return rows.map((r) => r.containerNumber.trim().toUpperCase());
   }
+
+  /** Contract container sizes (e.g. "20ft" / "40ft") for the given container numbers. */
+  private async containerSizes(bookingId: string, numbers: string[]): Promise<string[]> {
+    if (!numbers.length) return [];
+    const rows: Array<{ size: string | null }> = await this.dataSource.query(
+      `SELECT bc.container_size AS "size"
+         FROM freight.booking_container_units bcu
+         JOIN freight.booking_container bc
+           ON bc.id = bcu.booking_container_id AND bc.deleted_at IS NULL
+        WHERE bc.booking_id = $1
+          AND UPPER(bcu.container_number) = ANY($2)
+          AND bcu.deleted_at IS NULL`,
+      [bookingId, numbers],
+    );
+    return rows.map((r) => (r.size ?? '').trim());
+  }
 }

apps/edr-freight-api/src/modules/warehouses/dto/create-warehouse-yard.dto.ts

@@ -35,7 +35,7 @@ export class CreateWarehouseYardDto {
   @Min(0)
   capacityContainers?: number;
 
-  @ApiPropertyOptional({ description: 'Max weight capacity (kg). Defaults to capacityWeight.' })
+  @ApiPropertyOptional({ description: 'Max weight capacity (t). Defaults to capacityWeight.' })
   @IsOptional()
   @IsNumber()
   @Min(0)

apps/edr-freight-api/src/modules/warehouses/dto/create-warehouse-zone.dto.ts

@@ -35,7 +35,7 @@ export class CreateWarehouseZoneDto {
   @Min(0)
   capacityContainers?: number;
 
-  @ApiPropertyOptional({ description: 'Max weight capacity (kg). Defaults to capacityWeight.' })
+  @ApiPropertyOptional({ description: 'Max weight capacity (t). Defaults to capacityWeight.' })
   @IsOptional()
   @IsNumber()
   @Min(0)

apps/edr-freight-api/src/modules/warehouses/dto/create-warehouse.dto.ts

@@ -47,7 +47,7 @@ export class CreateWarehouseDto {
   @Min(0)
   capacityContainers?: number;
 
-  @ApiPropertyOptional({ description: 'Max weight capacity (kg). Defaults to capacityWeight.' })
+  @ApiPropertyOptional({ description: 'Max weight capacity (t). Defaults to capacityWeight.' })
   @IsOptional()
   @IsNumber()
   @Min(0)

apps/edr-freight-api/src/modules/warehouses/dto/load-inventory.dto.ts

@@ -6,7 +6,7 @@ export class LoadInventoryDto {
   @IsUUID()
   wagonId!: string;
 
-  @ApiPropertyOptional({ description: 'Weight loaded onto the wagon (kg)' })
+  @ApiPropertyOptional({ description: 'Weight loaded onto the wagon (t)' })
   @IsOptional()
   @IsNumber()
   @Min(0)

apps/edr-freight-api/src/modules/warehouses/warehouse-inspection.service.ts

@@ -44,7 +44,7 @@ export class WarehouseInspectionService {
       expectedWeight: expected,
       actualWeight: actual,
       weightLoss,
-      weightLossUnit: weightLoss !== null ? 'kg' : null,
+      weightLossUnit: weightLoss !== null ? 't' : null,
       hasMissingItems: dto.hasMissingItems ?? false,
       missingItemsDescription: dto.missingItemsDescription ?? null,
       remarks: dto.remarks ?? null,

apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts

@@ -2020,7 +2020,7 @@ export class WarehouseInventoryService {
             activityType: 'INVENTORY_RECEIVED',
             inventoryId: saved.id,
             warehouseId: dto.warehouseId,
-            description: `GRN ${grnNumber}: received ${weight}kg via truck ${truckEntrance.truckPlateNumber}`,
+            description: `GRN ${grnNumber}: received ${weight}t via truck ${truckEntrance.truckPlateNumber}`,
             performedBy: dto.performedBy,
           },
           manager,
@@ -2677,7 +2677,7 @@ export class WarehouseInventoryService {
       ['Pickup Truck Plate', data.plateNumber],
       ['Driver', data.driverName],
       ['Truck Type', data.truckType],
-      ['Gross Weight (Loaded on Truck)', `${data.grossWeightKg.toLocaleString()} kg`],
+      ['Gross Weight (Loaded on Truck)', `${data.grossWeightKg.toLocaleString()} t`],
       ['Gate-Out Time', gateOut],
       ['Clearance Status', 'CLEARED FOR WAREHOUSE EXIT'],
     ];
@@ -3608,8 +3608,8 @@ export class WarehouseInventoryService {
       ['Booking Containers', data.bookingContainerSummary],
       ['Cargo / Goods Description', data.cargoDescription],
       ['Quantity', data.quantity],
-      ['Received Weight', `${data.weight.toLocaleString()} kg`],
+      ['Received Weight', `${data.weight.toLocaleString()} t`],
-      ['Booking Declared Weight', data.bookingDeclaredWeight ? `${data.bookingDeclaredWeight.toLocaleString()} kg` : null],
+      ['Booking Declared Weight', data.bookingDeclaredWeight ? `${data.bookingDeclaredWeight.toLocaleString()} t` : null],
       ['Volume', data.volume == null ? null : data.volume.toLocaleString()],
       ['Warehouse', data.warehouse],
       ['Yard', data.yard],
@@ -3731,7 +3731,7 @@ export class WarehouseInventoryService {
         `${(data.truckPlateNumber && data.truckWeightKg
           ? data.truckWeightKg
           : data.weight
-        ).toLocaleString()} kg`,
+        ).toLocaleString()} t`,
       ],
       ['Warehouse', data.warehouse],
       ['Yard', data.yard],
@@ -3894,8 +3894,8 @@ export class WarehouseInventoryService {
       ['Booking Containers', data.bookingContainerSummary],
       ['Cargo / Goods Description', data.cargoDescription],
       ['Quantity', data.quantity],
-      ['Inventory Weight', `${data.weight.toLocaleString()} kg`],
+      ['Inventory Weight', `${data.weight.toLocaleString()} t`],
-      ['Booking Declared Weight', data.bookingDeclaredWeight ? `${data.bookingDeclaredWeight.toLocaleString()} kg` : null],
+      ['Booking Declared Weight', data.bookingDeclaredWeight ? `${data.bookingDeclaredWeight.toLocaleString()} t` : null],
       ['Warehouse', data.warehouse],
       ['Yard', data.yard],
       ['Zone', data.zone],
@@ -3968,8 +3968,8 @@ export class WarehouseInventoryService {
       <tr><th>1. Goods</th><td>${esc(data.cargoDescription || data.containerNumber || data.bookingReference)}</td></tr>
       <tr><th>Container</th><td>${esc(data.containerNumber)}</td></tr>
       <tr><th>Booking Containers</th><td>${esc(data.bookingContainerSummary)}</td></tr>
-      <tr><th>Inventory Weight</th><td>${esc(`${data.weight.toLocaleString()} kg`)}</td></tr>
+      <tr><th>Inventory Weight</th><td>${esc(`${data.weight.toLocaleString()} t`)}</td></tr>
-      <tr><th>Booking Declared Weight</th><td>${esc(data.bookingDeclaredWeight ? `${data.bookingDeclaredWeight.toLocaleString()} kg` : null)}</td></tr>
+      <tr><th>Booking Declared Weight</th><td>${esc(data.bookingDeclaredWeight ? `${data.bookingDeclaredWeight.toLocaleString()} t` : null)}</td></tr>
     </tbody>
   </table>
   <div class="section-title">Handover Clause</div>
@@ -4303,9 +4303,9 @@ export class WarehouseInventoryService {
       dto.truckType?.trim() ? `Truck Type: ${dto.truckType.trim()}` : null,
       dto.containerNumber?.trim() ? `Container Number: ${dto.containerNumber.trim()}` : null,
       dto.gateInTime ? `Gate In Time: ${dto.gateInTime}` : null,
-      `Tare Weight: ${tareWeight} kg`,
+      `Tare Weight: ${tareWeight} t`,
-      grossWeight == null ? null : `Gross Weight: ${grossWeight} kg`,
+      grossWeight == null ? null : `Gross Weight: ${grossWeight} t`,
-      computedNetWeight == null ? null : `Net Weight: ${computedNetWeight} kg`,
+      computedNetWeight == null ? null : `Net Weight: ${computedNetWeight} t`,
       dto.gateOutTime ? `Gate Out Time: ${dto.gateOutTime}` : null,
     ];
 
@@ -4357,7 +4357,7 @@ export class WarehouseInventoryService {
   }
 
   private extractExitInspectionNumber(note: string | null | undefined, label: string): number | undefined {
-    const value = this.extractExitInspectionLine(note, label)?.replace(/\s*kg$/i, '');
+    const value = this.extractExitInspectionLine(note, label)?.replace(/\s*(kg|t)$/i, '');
     if (!value) return undefined;
     const parsed = Number(value);
     return Number.isFinite(parsed) ? parsed : undefined;
@@ -4420,9 +4420,9 @@ export class WarehouseInventoryService {
       truck?.driverName ? `Driver: ${truck.driverName}` : null,
       truck?.driverPhone ? `Driver Phone: ${truck.driverPhone}` : null,
       truck?.driverLicenseNumber ? `Driver License: ${truck.driverLicenseNumber}` : null,
-      truck?.entranceTareWeightKg !== undefined ? `Entrance Tare Weight: ${Number(truck.entranceTareWeightKg)} kg` : null,
+      truck?.entranceTareWeightKg !== undefined ? `Entrance Tare Weight: ${Number(truck.entranceTareWeightKg)} t` : null,
       truck?.weighingRequired !== undefined ? `Weighing Required: ${truck.weighingRequired ? 'Yes' : 'No'}` : null,
-      truck?.exitTareWeightKg !== undefined ? `Exit Tare Weight: ${Number(truck.exitTareWeightKg)} kg` : null,
+      truck?.exitTareWeightKg !== undefined ? `Exit Tare Weight: ${Number(truck.exitTareWeightKg)} t` : null,
       truck?.declarationNumber ? `Declaration / Bill of Entry: ${truck.declarationNumber}` : null,
       truck?.incoterms ? `Incoterms: ${truck.incoterms}` : null,
       truck?.hsCodes ? `HS Codes: ${truck.hsCodes}` : null,
@@ -4430,8 +4430,8 @@ export class WarehouseInventoryService {
       truck?.itemDescription ? `Item Description: ${truck.itemDescription}` : null,
       truck?.packagingType ? `Packaging Type: ${truck.packagingType}` : null,
       truck?.unitCount !== undefined ? `Unit Count: ${Number(truck.unitCount)}` : null,
-      truck?.grossWeightKg !== undefined ? `Gross Weight: ${Number(truck.grossWeightKg)} kg` : null,
+      truck?.grossWeightKg !== undefined ? `Gross Weight: ${Number(truck.grossWeightKg)} t` : null,
-      truck?.netWeightKg !== undefined ? `Net Weight: ${Number(truck.netWeightKg)} kg` : null,
+      truck?.netWeightKg !== undefined ? `Net Weight: ${Number(truck.netWeightKg)} t` : null,
       truck?.volumeDimensions ? `Volume / Dimensions: ${truck.volumeDimensions}` : null,
       truck?.conditionAtReceipt ? `Condition at Receipt: ${truck.conditionAtReceipt}` : null,
       truck?.damagedRejectedQuantity !== undefined ? `Damaged / Rejected Quantity: ${Number(truck.damagedRejectedQuantity)}` : null,

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

@@ -169,7 +169,7 @@ export function CreateWarehouseModal({ opened, onClose, warehouse }: CreateWareh
 
         <Group grow>
           <NumberInput
-            label="Capacity weight (kg)"
+            label="Capacity weight (t)"
             placeholder="Optional"
             min={0}
             value={form.capacityWeight}

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

@@ -132,7 +132,7 @@ export function CreateYardModal({ opened, onClose, warehouseId, yard }: CreateYa
 
         <Group grow>
           <NumberInput
-            label="Capacity weight (kg)"
+            label="Capacity weight (t)"
             placeholder="Optional"
             min={0}
             value={form.capacityWeight}

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

@@ -132,7 +132,7 @@ export function CreateZoneModal({ opened, onClose, yardId, zone }: CreateZoneMod
 
         <Group grow>
           <NumberInput
-            label="Capacity weight (kg)"
+            label="Capacity weight (t)"
             placeholder="Optional"
             min={0}
             value={form.capacityWeight}

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

@@ -174,13 +174,13 @@ export function InspectionReportModal({ opened, onClose, inventoryId }: Inspecti
       {hasWeightLoss && (
         <Group grow mt="xs">
           <NumberInput
-            label="Expected weight (kg)"
+            label="Expected weight (t)"
             min={0}
             value={expectedWeight}
             onChange={(v) => setExpectedWeight(v === '' ? '' : Number(v))}
           />
           <NumberInput
-            label="Actual weight (kg)"
+            label="Actual weight (t)"
             min={0}
             value={actualWeight}
             onChange={(v) => setActualWeight(v === '' ? '' : Number(v))}

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

@@ -78,7 +78,7 @@ export function InventoryDetailModal({ opened, onClose, item }: InventoryDetailM
             <DetailRow label="Release reference" value={item.releaseOrderReference ?? '-'} />
             <DetailRow label="Handover reference" value={handoverReference || '-'} />
             <DetailRow label="Quantity" value={formatNumber(item.quantity)} />
-            <DetailRow label="Weight" value={`${formatNumber(item.weight)} kg`} />
+            <DetailRow label="Weight" value={`${formatNumber(item.weight)} t`} />
             <DetailRow label="Volume" value={item.volume == null ? '-' : formatNumber(item.volume)} />
           </SimpleGrid>
 

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

@@ -67,7 +67,7 @@ export function InventoryInquiryDetailModal({ opened, onClose, result }: Invento
           <SimpleGrid cols={{ base: 1, sm: 3 }}>
             <DetailRow label="Item" value={itemLabel(result)} />
             <DetailRow label="Quantity" value={formatNumber(result.quantity)} />
-            <DetailRow label="Weight" value={`${formatNumber(result.weight)} kg`} />
+            <DetailRow label="Weight" value={`${formatNumber(result.weight)} t`} />
           </SimpleGrid>
 
           <Divider label="Location" labelPosition="left" />

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

@@ -67,7 +67,7 @@ export function LoadInventoryModal({ opened, onClose, item }: LoadInventoryModal
         <WagonSelect label="Wagon" required value={wagonId} onChange={setWagonId} />
 
         <NumberInput
-          label="Loaded weight (kg)"
+          label="Loaded weight (t)"
           placeholder="Defaults to item weight"
           min={0}
           value={loadedWeight}

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

@@ -31,7 +31,7 @@ const STAGE_COLOR: Record<string, string> = {
   LOADED: 'green',
 };
 
-const weight = (w: number | null) => (w == null ? '—' : `${Number(w).toLocaleString()} kg`);
+const weight = (w: number | null) => (w == null ? '—' : `${Number(w).toLocaleString()} t`);
 
 interface BookingGroup {
   bookingId: string | null;

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

@@ -520,14 +520,14 @@ function TruckEntranceFields({
           {value.weighingRequired && (
             <Group grow>
               <NumberInput
-                label="Gross weight (kg)"
+                label="Gross weight (t)"
                 required
                 min={0}
                 value={value.grossWeightKg}
                 onChange={(v) => onChange({ ...value, grossWeightKg: v === '' ? '' : Number(v) })}
               />
               <NumberInput
-                label="Exit tare weight (kg)"
+                label="Exit tare weight (t)"
                 required
                 min={0}
                 value={value.exitTareWeightKg}
@@ -596,7 +596,7 @@ function TruckEntranceFields({
         />
       </Group>
       <NumberInput
-        label="Net weight (kg)"
+        label="Net weight (t)"
         min={0}
         value={value.netWeightKg}
         onChange={(v) => onChange({ ...value, netWeightKg: v === '' ? '' : Number(v) })}

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

@@ -78,7 +78,7 @@ const lineValue = (notes: string | null | undefined, label: string) => {
 };
 
 const lineNumber = (notes: string | null | undefined, label: string): number | '' => {
-  const value = lineValue(notes, label).replace(/\s*kg$/i, '');
+  const value = lineValue(notes, label).replace(/\s*(kg|t)$/i, '');
   if (!value) return '';
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : '';
@@ -397,13 +397,13 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
           <TextInput label="Gate in time" type="datetime-local" value={gateInTime} onChange={(e) => setGateInTime(e.currentTarget.value)} readOnly={isEntranceLocked} />
         </Group>
         <Group grow>
-          <NumberInput label="Tare weight (kg)" required min={0} value={tareWeight} onChange={(v) => setTareWeight(v === '' ? '' : Number(v))} readOnly={isEntranceLocked} />
+          <NumberInput label="Tare weight (t)" required min={0} value={tareWeight} onChange={(v) => setTareWeight(v === '' ? '' : Number(v))} readOnly={isEntranceLocked} />
-          <NumberInput label="Gross weight (kg)" required={isExitStep} min={0} value={grossWeight} onChange={(v) => setGrossWeight(v === '' ? '' : Number(v))} disabled={!isExitStep} />
+          <NumberInput label="Gross weight (t)" required={isExitStep} min={0} value={grossWeight} onChange={(v) => setGrossWeight(v === '' ? '' : Number(v))} disabled={!isExitStep} />
-          <NumberInput label="Recorded net weight (system kg)" min={0} value={systemNetWeight} readOnly />
+          <NumberInput label="Recorded net weight (system t)" min={0} value={systemNetWeight} readOnly />
         </Group>
         <Group justify="space-between">
           <Text size="sm" c={weightMismatch ? 'red' : 'dimmed'}>
-            Computed net: <b>{computedNetWeight == null ? '-' : `${computedNetWeight.toLocaleString()} kg`}</b>
+            Computed net: <b>{computedNetWeight == null ? '-' : `${computedNetWeight.toLocaleString()} t`}</b>
           </Text>
           <TextInput label="Gate out time" type="datetime-local" value={gateOutTime} onChange={(e) => setGateOutTime(e.currentTarget.value)} disabled={!isExitStep} />
         </Group>

apps/edr-freight-web/backoffice/src/pages/warehouses/LoadedInventoryPage.tsx

@@ -38,7 +38,7 @@ const columns: ColumnDef<Loading>[] = [
   },
   {
     id: 'weight',
-    header: 'Loaded Weight (kg)',
+    header: 'Loaded Weight (t)',
     cell: ({ row }) => formatNumber(row.original.loadedWeight),
   },
   {

apps/edr-freight-web/backoffice/src/pages/warehouses/LoadingQueuePage.tsx

@@ -203,7 +203,7 @@ function PendingPaymentTable({ items, onNavigate }: PendingPaymentTableProps) {
     },
     { id: 'warehouse', header: 'Warehouse', cell: ({ row }) => row.original.warehouse?.code ?? '—' },
     { id: 'zone', header: 'Zone', cell: ({ row }) => row.original.zone?.code ?? '—' },
-    { id: 'weight', header: 'Weight (kg)', cell: ({ row }) => formatNumber(row.original.weight) },
+    { id: 'weight', header: 'Weight (t)', cell: ({ row }) => formatNumber(row.original.weight) },
     {
       id: 'payment',
       header: 'Payment',

apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/CustomerTruckAssignmentCard.tsx

@@ -73,10 +73,7 @@ export function CustomerTruckAssignmentCard({
     (n) => !assignedNumbers.has(n),
   );
 
-  // EXPORT trucks deliver known containers (pre-selected). IMPORT trucks don't —
+  // Both import and export specify the containers each truck carries.
-  // staff register + weigh what was loaded when the truck leaves.
-  const isExport = booking.tradeDirection === "EXPORT";
-
   const resetForm = () => {
     setPlateNumber("");
     setDriverName("");
@@ -91,8 +88,7 @@ export function CustomerTruckAssignmentCard({
         truckPlateNumber: plateNumber.trim().toUpperCase(),
         driverName: driverName.trim(),
         truckType: truckType.trim(),
-        // Import: containers are registered + weighed on departure, not here.
+        containerNumbers: containers,
-        containerNumbers: isExport ? containers : [],
       }),
     onSuccess: (list) => {
       queryClient.setQueryData(trucksKey, list);
@@ -123,7 +119,7 @@ export function CustomerTruckAssignmentCard({
       setError("Plate number, driver name and truck type are required.");
       return;
     }
-    if (isExport && (containers.length < 1 || containers.length > 2)) {
+    if (containers.length < 1 || containers.length > 2) {
       setError("Select 1 or 2 container numbers for this truck.");
       return;
     }
@@ -207,8 +203,8 @@ export function CustomerTruckAssignmentCard({
           </Alert>
         )}
 
-        {/* Add-truck form. Export needs unassigned containers; import always allows another truck. */}
+        {/* Add-truck form — both directions assign the containers each truck carries. */}
-        {(isExport ? availableContainers.length > 0 : true) ? (
+        {availableContainers.length > 0 ? (
           <>
             <Divider label="Add a truck" labelPosition="center" />
             <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="sm">
@@ -231,19 +227,18 @@ export function CustomerTruckAssignmentCard({
                 value={truckType || null}
                 onChange={(value) => setTruckType(value ?? "")}
               />
-              {isExport && (
+              <MultiSelect
-                <MultiSelect
+                label="Containers to load"
-                  label="Containers to load (1–2)"
+                description="20ft: up to 2 per truck · 40ft: 1 per truck"
-                  required
+                required
-                  placeholder="Select container numbers"
+                placeholder="Select container numbers"
-                  data={availableContainers}
+                data={availableContainers}
-                  value={containers}
+                value={containers}
-                  onChange={setContainers}
+                onChange={setContainers}
-                  maxValues={2}
+                maxValues={2}
-                  searchable
+                searchable
-                  nothingFoundMessage="No unassigned containers"
+                nothingFoundMessage="No unassigned containers"
-                />
+              />
-              )}
             </SimpleGrid>
             <Group justify="flex-end">
               <Button