Warehouse

apps/edr-freight-api/src/modules/cargoes/cargoes.service.ts

@@ -157,7 +157,9 @@ export class CargoesService {
     }
 
     cargo.status = 'DELIVERED';
-    if (dto?.deliveryRemarks) cargo.description = dto.deliveryRemarks;
+    cargo.deliveredAt = dto?.pickupDate ? new Date(dto.pickupDate) : new Date();
+    if (dto?.receiverName) cargo.receiverName = dto.receiverName;
+    if (dto?.deliveryRemarks) cargo.deliveryRemarks = dto.deliveryRemarks;
 
     const remaining = await this.cargoRepo.count({
       where: { containerId: cargo.containerId, status: 'LOADED' },

apps/edr-freight-api/src/modules/cargoes/dto/deliver-cargo.dto.ts

@@ -1,6 +1,16 @@
-import { IsOptional, IsString } from 'class-validator';
+import { IsDateString, IsOptional, IsString } from 'class-validator';
 
 export class DeliverCargoDto {
+  /** Name of the person who received / picked up the cargo (Proof of Delivery). */
+  @IsOptional()
+  @IsString()
+  receiverName?: string;
+
+  /** When the cargo was picked up / delivered. Defaults to now. */
+  @IsOptional()
+  @IsDateString()
+  pickupDate?: string;
+
   @IsOptional()
   @IsString()
   deliveryRemarks?: string;

apps/edr-freight-api/src/modules/cargoes/entities/cargoes.entity.ts

@@ -38,6 +38,16 @@ export class Cargo extends BaseEntity {
   @Column({ name: 'unloaded_at', type: 'timestamp', nullable: true })
   unloadedAt!: Date | null;
 
+  // Proof of Delivery (customer pickup) capture.
+  @Column({ name: 'receiver_name', type: 'varchar', nullable: true })
+  receiverName!: string | null;
+
+  @Column({ name: 'delivered_at', type: 'timestamp', nullable: true })
+  deliveredAt!: Date | null;
+
+  @Column({ name: 'delivery_remarks', type: 'text', nullable: true })
+  deliveryRemarks!: string | null;
+
   // Relationship to Container
   @ManyToOne(() => Container, (container) => container.cargoes, { onDelete: 'RESTRICT' })
   @JoinColumn({ name: 'container_id' })

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

@@ -23,6 +23,11 @@ export class CreateWarehouseDto {
   @IsUUID()
   stationId?: string;
 
+  @ApiPropertyOptional({ format: 'uuid', description: 'Parent facility / port this warehouse belongs to.' })
+  @IsOptional()
+  @IsUUID()
+  facilityId?: string;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()

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

@@ -86,7 +86,7 @@ export class WarehouseInventoryService {
 
     return this.inventoryRepository.findAll({
       where,
-      relations: { warehouse: true, yard: true, zone: true },
+      relations: { warehouse: { facility: true }, yard: true, zone: true, booking: true },
       order: { createdAt: 'DESC' },
     });
   }

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

@@ -29,13 +29,14 @@ export class WarehousesService {
 
     return this.warehousesRepository.findAll({
       where: whereClauses,
+      relations: { facility: true },
       order: { code: 'ASC' },
     });
   }
 
   async findById(id: string): Promise<Warehouse> {
     const warehouse = await this.warehousesRepository.findById(id, {
-      relations: { yards: { zones: true } },
+      relations: { facility: true, yards: { zones: true } },
     });
 
     if (!warehouse) {
@@ -53,6 +54,7 @@ export class WarehousesService {
       code: dto.code.trim(),
       type: dto.type,
       stationId: dto.stationId ?? null,
+      facilityId: dto.facilityId ?? null,
       locationName: dto.locationName?.trim() ?? null,
       capacityWeight: dto.capacityWeight ?? null,
       capacityContainers: dto.capacityContainers ?? null,
@@ -80,6 +82,7 @@ export class WarehousesService {
       code: dto.code?.trim() ?? existing.code,
       type: dto.type ?? existing.type,
       stationId: dto.stationId ?? existing.stationId,
+      facilityId: dto.facilityId ?? existing.facilityId,
       locationName: dto.locationName?.trim() ?? existing.locationName,
       capacityWeight: dto.capacityWeight ?? existing.capacityWeight,
       capacityContainers: dto.capacityContainers ?? existing.capacityContainers,