Warehouse receiving for export and GRN generation

apps/edr-freight-api/src/modules/warehouses/dto/bulk-receive.dto.ts

@@ -2,6 +2,26 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { ArrayNotEmpty, IsArray, IsIn, IsNumber, IsOptional, IsString, IsUUID, Min } from 'class-validator';
 
 export class TruckEntranceDto {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  ownerName?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  consigneeDetails?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  edrDigitalBookingId?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  tin?: string;
+
   @ApiProperty()
   @IsString()
   truckPlateNumber!: string;
@@ -11,6 +31,85 @@ export class TruckEntranceDto {
   @IsString()
   trailerPlateNumber?: string;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  assignedEquipmentNumber?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  customsSealNumber?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  declarationNumber?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  incoterms?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  hsCodes?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  itemCode?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  itemDescription?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  packagingType?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  unitCount?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  grossWeightKg?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  netWeightKg?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  volumeDimensions?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  conditionAtReceipt?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  damagedRejectedQuantity?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  warehouseCodeLocation?: string;
+
   @ApiProperty()
   @IsString()
   driverName!: string;
@@ -39,6 +138,16 @@ export class TruckEntranceDto {
   @IsNumber()
   @Min(0)
   exitTareWeightKg?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  driverSignatoryName?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  warehouseManagerName?: string;
 }
 
 /** Bulk-receive eligible PAID bookings into a warehouse location, by trade direction. */

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

@@ -2538,14 +2538,35 @@ export class WarehouseInventoryService {
     const rows = [
       `GRN Number: ${input.grnNumber}`,
       input.direction ? `Direction: ${input.direction}` : null,
+      truck.ownerName ? `Owner / Shipper: ${truck.ownerName}` : null,
+      truck.consigneeDetails ? `Consignee: ${truck.consigneeDetails}` : null,
+      truck.edrDigitalBookingId ? `EDR Digital Booking ID: ${truck.edrDigitalBookingId}` : null,
+      truck.tin ? `TIN: ${truck.tin}` : null,
       `Truck Plate: ${truck.truckPlateNumber}`,
       truck.trailerPlateNumber ? `Trailer Plate: ${truck.trailerPlateNumber}` : null,
+      truck.assignedEquipmentNumber ? `Assigned Wagon / Container: ${truck.assignedEquipmentNumber}` : null,
+      truck.customsSealNumber ? `Customs Seal Number: ${truck.customsSealNumber}` : null,
       truck.truckType ? `Truck Type: ${truck.truckType}` : null,
       `Driver: ${truck.driverName}`,
       `Driver Phone: ${truck.driverPhone}`,
       truck.driverLicenseNumber ? `Driver License: ${truck.driverLicenseNumber}` : null,
       `Entrance Tare Weight: ${Number(truck.entranceTareWeightKg)} kg`,
       truck.exitTareWeightKg !== undefined ? `Exit Tare Weight: ${Number(truck.exitTareWeightKg)} kg` : null,
+      truck.declarationNumber ? `Declaration / Bill of Entry: ${truck.declarationNumber}` : null,
+      truck.incoterms ? `Incoterms: ${truck.incoterms}` : null,
+      truck.hsCodes ? `HS Codes: ${truck.hsCodes}` : null,
+      truck.itemCode ? `Item Code: ${truck.itemCode}` : null,
+      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.netWeightKg !== undefined ? `Net Weight: ${Number(truck.netWeightKg)} kg` : 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,
+      truck.warehouseCodeLocation ? `Warehouse Code / Location: ${truck.warehouseCodeLocation}` : null,
+      truck.driverSignatoryName ? `Driver Signatory: ${truck.driverSignatoryName}` : null,
+      truck.warehouseManagerName ? `EDR Warehouse Manager: ${truck.warehouseManagerName}` : null,
       input.notes?.trim() ? `Remarks: ${input.notes.trim()}` : null,
     ];
     return rows.filter(Boolean).join('\n');