mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-09-07 21:15:41 +00:00
feat(warehouse): Batch 5 — Export Ready To Load queue + Auto Load Ready Items
- GET /warehouse-inventory/ready-to-load-export: EXPORT+PASSED+READY_FOR_LOADING items with booking details (customer, container, cargo type, route, inspection status) - Direction filtering via deriveTradeDirection (route-based, not stored field) - Frontend ReadyToLoadTab: full table (checkbox, booking ref/id, customer, container, cargo type, weight, route, inspection status, current status) with selection - Auto Load Ready Items button reuses existing POST /load-passed-export endpoint - Replaces "Ready To Load — coming in the next batch" placeholder in Export sub-tabs Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -78,6 +78,12 @@ export class WarehouseInventoryController {
|
|||||||
return this.inventoryService.loadPassedExport(performedBy);
|
return this.inventoryService.loadPassedExport(performedBy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('ready-to-load-export')
|
||||||
|
@ApiOperation({ summary: 'EXPORT inventory that passed inspection and is READY_FOR_LOADING' })
|
||||||
|
readyToLoadExport() {
|
||||||
|
return this.inventoryService.readyToLoadExport();
|
||||||
|
}
|
||||||
|
|
||||||
@Post('bulk-mark-inspected')
|
@Post('bulk-mark-inspected')
|
||||||
@ApiOperation({ summary: 'Bulk mark received inventory inspection PASSED (EXPORT → READY_FOR_LOADING)' })
|
@ApiOperation({ summary: 'Bulk mark received inventory inspection PASSED (EXPORT → READY_FOR_LOADING)' })
|
||||||
bulkMarkInspected(@Body() dto: BulkInspectDto) {
|
bulkMarkInspected(@Body() dto: BulkInspectDto) {
|
||||||
|
|||||||
@@ -154,6 +154,21 @@ export interface BulkInspectResult {
|
|||||||
results: { inventoryId: string; status: string; reason?: string }[];
|
results: { inventoryId: string; status: string; reason?: string }[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ReadyToLoadRow {
|
||||||
|
id: string;
|
||||||
|
bookingId: string | null;
|
||||||
|
bookingReference: string | null;
|
||||||
|
customerId: string | null;
|
||||||
|
customerName: string | null;
|
||||||
|
containerNumber: string | null;
|
||||||
|
cargoType: string | null;
|
||||||
|
weight: number | null;
|
||||||
|
origin: string | null;
|
||||||
|
destination: string | null;
|
||||||
|
inspectionStatus: string | null;
|
||||||
|
status: string;
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class WarehouseInventoryService {
|
export class WarehouseInventoryService {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -601,6 +616,46 @@ export class WarehouseInventoryService {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** EXPORT inventory that passed inspection and is waiting to be loaded (READY_FOR_LOADING). */
|
||||||
|
async readyToLoadExport(): Promise<ReadyToLoadRow[]> {
|
||||||
|
const rows: Array<
|
||||||
|
ReadyToLoadRow & { originCountry: string | null; destinationCountry: string | null }
|
||||||
|
> = await this.dataSource.query(
|
||||||
|
`SELECT inv.id,
|
||||||
|
inv.booking_id AS "bookingId",
|
||||||
|
b.reference AS "bookingReference",
|
||||||
|
b.company_id AS "customerId",
|
||||||
|
company.name AS "customerName",
|
||||||
|
ct.container_number AS "containerNumber",
|
||||||
|
COALESCE(cgt.cargo_type_name, b.cargo_free_text) AS "cargoType",
|
||||||
|
inv.weight AS "weight",
|
||||||
|
oy.code AS "origin",
|
||||||
|
dy.code AS "destination",
|
||||||
|
oy.country AS "originCountry",
|
||||||
|
dy.country AS "destinationCountry",
|
||||||
|
inv.inspection_status AS "inspectionStatus",
|
||||||
|
inv.status
|
||||||
|
FROM freight.warehouse_inventory inv
|
||||||
|
LEFT JOIN freight.bookings b ON b.id = inv.booking_id AND b.deleted_at IS NULL
|
||||||
|
LEFT JOIN freight.companies company ON company.id = b.company_id
|
||||||
|
LEFT JOIN freight.yards oy ON oy.id = b.origin_yard_id
|
||||||
|
LEFT JOIN freight.yards dy ON dy.id = b.destination_yard_id
|
||||||
|
LEFT JOIN freight.cargo_types cgt ON cgt.id = b.cargo_type_id
|
||||||
|
LEFT JOIN freight.containers ct ON ct.id = inv.container_id
|
||||||
|
WHERE inv.deleted_at IS NULL
|
||||||
|
AND inv.status = 'READY_FOR_LOADING'
|
||||||
|
AND inv.inspection_status = 'PASSED'
|
||||||
|
ORDER BY inv.created_at DESC`,
|
||||||
|
);
|
||||||
|
|
||||||
|
return rows
|
||||||
|
.filter((r) => {
|
||||||
|
const dir = deriveTradeDirection({ country: r.originCountry }, { country: r.destinationCountry });
|
||||||
|
return dir === 'EXPORT';
|
||||||
|
})
|
||||||
|
.map(({ originCountry: _oc, destinationCountry: _dc, ...rest }) => rest);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bulk-mark received items inspection PASSED (reusing the inspection service to create a minimal
|
* Bulk-mark received items inspection PASSED (reusing the inspection service to create a minimal
|
||||||
* report + sync inspectionStatus/inspectedAt). EXPORT items advance straight to READY_FOR_LOADING.
|
* report + sync inspectionStatus/inspectedAt). EXPORT items advance straight to READY_FOR_LOADING.
|
||||||
|
|||||||
@@ -23,12 +23,13 @@ import {
|
|||||||
useBulkReceive,
|
useBulkReceive,
|
||||||
useEligibleBookings,
|
useEligibleBookings,
|
||||||
useLoadPassedExport,
|
useLoadPassedExport,
|
||||||
|
useReadyToLoadExport,
|
||||||
useReceiveInventory,
|
useReceiveInventory,
|
||||||
useWarehouseYards,
|
useWarehouseYards,
|
||||||
useWarehouseZones,
|
useWarehouseZones,
|
||||||
useWarehouses,
|
useWarehouses,
|
||||||
} from '@/hooks/useWarehouses';
|
} from '@/hooks/useWarehouses';
|
||||||
import type { BulkReceiveResult, LoadPassedExportResult, ReceiveInventoryPayload } from '@/types/warehouse';
|
import type { BulkReceiveResult, LoadPassedExportResult, ReadyToLoadRow, ReceiveInventoryPayload } from '@/types/warehouse';
|
||||||
import { BookingSelect } from './BookingSelect';
|
import { BookingSelect } from './BookingSelect';
|
||||||
import { extractErrorMessage, formatNumber } from './options';
|
import { extractErrorMessage, formatNumber } from './options';
|
||||||
|
|
||||||
@@ -327,6 +328,136 @@ function EligibleTab({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Export items that passed inspection and are queued to be loaded onto a train. */
|
||||||
|
function ReadyToLoadTab({ enabled, onChanged }: { enabled: boolean; onChanged?: () => void }) {
|
||||||
|
const { toast } = useToast();
|
||||||
|
const { data: rows = [], isLoading } = useReadyToLoadExport(enabled);
|
||||||
|
const loadPassed = useLoadPassedExport();
|
||||||
|
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||||
|
|
||||||
|
const allSelected = rows.length > 0 && selected.size === rows.length;
|
||||||
|
const someSelected = selected.size > 0 && !allSelected;
|
||||||
|
const toggleAll = () => setSelected(allSelected ? new Set() : new Set(rows.map((r) => r.id)));
|
||||||
|
const toggleOne = (id: string) =>
|
||||||
|
setSelected((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
next.has(id) ? next.delete(id) : next.add(id);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
|
||||||
|
const autoLoad = async () => {
|
||||||
|
try {
|
||||||
|
const res = (await loadPassed.mutateAsync(undefined)) as { data: LoadPassedExportResult };
|
||||||
|
const r = res.data;
|
||||||
|
toast({
|
||||||
|
title: `${r.loadedCount} items loaded`,
|
||||||
|
description: r.skippedCount ? `${r.skippedCount} skipped` : undefined,
|
||||||
|
});
|
||||||
|
setSelected(new Set());
|
||||||
|
onChanged?.();
|
||||||
|
} catch (error) {
|
||||||
|
toast({ variant: 'destructive', title: 'Load failed', description: extractErrorMessage(error) });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack gap="sm" mt="sm">
|
||||||
|
<Group justify="space-between">
|
||||||
|
<Text size="sm" c="dimmed">
|
||||||
|
<b>{rows.length}</b> item{rows.length !== 1 ? 's' : ''} ready to load
|
||||||
|
</Text>
|
||||||
|
<Button
|
||||||
|
size="compact-sm"
|
||||||
|
variant="filled"
|
||||||
|
color="teal"
|
||||||
|
leftSection={<Truck size={14} />}
|
||||||
|
loading={loadPassed.isPending}
|
||||||
|
disabled={rows.length === 0}
|
||||||
|
onClick={autoLoad}
|
||||||
|
>
|
||||||
|
Auto Load Ready Items
|
||||||
|
</Button>
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
{isLoading ? (
|
||||||
|
<Group justify="center" py="lg">
|
||||||
|
<Loader size="sm" />
|
||||||
|
</Group>
|
||||||
|
) : rows.length === 0 ? (
|
||||||
|
<Text c="dimmed" ta="center" py="lg" size="sm">
|
||||||
|
No EXPORT items with inspection PASSED waiting to be loaded.
|
||||||
|
</Text>
|
||||||
|
) : (
|
||||||
|
<Table.ScrollContainer minWidth={1600}>
|
||||||
|
<Table highlightOnHover verticalSpacing="xs" striped>
|
||||||
|
<Table.Thead>
|
||||||
|
<Table.Tr>
|
||||||
|
<Table.Th w={40}>
|
||||||
|
<Checkbox
|
||||||
|
aria-label="Select all"
|
||||||
|
checked={allSelected}
|
||||||
|
indeterminate={someSelected}
|
||||||
|
onChange={toggleAll}
|
||||||
|
/>
|
||||||
|
</Table.Th>
|
||||||
|
<Table.Th>Booking Ref</Table.Th>
|
||||||
|
<Table.Th>Booking ID</Table.Th>
|
||||||
|
<Table.Th>Customer ID</Table.Th>
|
||||||
|
<Table.Th>Customer Name</Table.Th>
|
||||||
|
<Table.Th>Container #</Table.Th>
|
||||||
|
<Table.Th>Cargo Type</Table.Th>
|
||||||
|
<Table.Th>Weight</Table.Th>
|
||||||
|
<Table.Th>Route</Table.Th>
|
||||||
|
<Table.Th>Inspection</Table.Th>
|
||||||
|
<Table.Th>Status</Table.Th>
|
||||||
|
</Table.Tr>
|
||||||
|
</Table.Thead>
|
||||||
|
<Table.Tbody>
|
||||||
|
{rows.map((r: ReadyToLoadRow) => (
|
||||||
|
<Table.Tr key={r.id}>
|
||||||
|
<Table.Td>
|
||||||
|
<Checkbox
|
||||||
|
aria-label={`Select ${r.bookingReference ?? r.id}`}
|
||||||
|
checked={selected.has(r.id)}
|
||||||
|
onChange={() => toggleOne(r.id)}
|
||||||
|
/>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Text size="sm" fw={600}>{r.bookingReference ?? '—'}</Text>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Text size="xs" c="dimmed">{r.bookingId ? `${r.bookingId.slice(0, 8)}…` : '—'}</Text>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Text size="xs" c="dimmed">{r.customerId ? `${r.customerId.slice(0, 8)}…` : '—'}</Text>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>{r.customerName ?? '—'}</Table.Td>
|
||||||
|
<Table.Td>{r.containerNumber ?? '—'}</Table.Td>
|
||||||
|
<Table.Td>{r.cargoType ?? '—'}</Table.Td>
|
||||||
|
<Table.Td>{formatNumber(Number(r.weight))}</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
{r.origin || r.destination ? `${r.origin ?? '?'} → ${r.destination ?? '?'}` : '—'}
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Badge color="green" variant="light" size="sm">
|
||||||
|
{r.inspectionStatus ?? '—'}
|
||||||
|
</Badge>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Badge color="teal" variant="light" size="sm">
|
||||||
|
{r.status}
|
||||||
|
</Badge>
|
||||||
|
</Table.Td>
|
||||||
|
</Table.Tr>
|
||||||
|
))}
|
||||||
|
</Table.Tbody>
|
||||||
|
</Table>
|
||||||
|
</Table.ScrollContainer>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/** New bulk Receive: Import / Export tabs with eligible PAID bookings. */
|
/** New bulk Receive: Import / Export tabs with eligible PAID bookings. */
|
||||||
function BulkReceiveModal({ opened, onClose, onReceived }: ReceiveInventoryModalProps) {
|
function BulkReceiveModal({ opened, onClose, onReceived }: ReceiveInventoryModalProps) {
|
||||||
const [location, setLocation] = useState<Location>({ warehouseId: '', yardId: '', zoneId: '' });
|
const [location, setLocation] = useState<Location>({ warehouseId: '', yardId: '', zoneId: '' });
|
||||||
@@ -367,9 +498,7 @@ function BulkReceiveModal({ opened, onClose, onReceived }: ReceiveInventoryModal
|
|||||||
<EligibleTab direction="EXPORT" location={location} enabled={opened} onChanged={onReceived} />
|
<EligibleTab direction="EXPORT" location={location} enabled={opened} onChanged={onReceived} />
|
||||||
</Tabs.Panel>
|
</Tabs.Panel>
|
||||||
<Tabs.Panel value="ready-to-load">
|
<Tabs.Panel value="ready-to-load">
|
||||||
<Text c="dimmed" ta="center" py="lg" size="sm">
|
<ReadyToLoadTab enabled={opened} onChanged={onReceived} />
|
||||||
Ready To Load — coming in the next batch.
|
|
||||||
</Text>
|
|
||||||
</Tabs.Panel>
|
</Tabs.Panel>
|
||||||
<Tabs.Panel value="loaded">
|
<Tabs.Panel value="loaded">
|
||||||
<Text c="dimmed" ta="center" py="lg" size="sm">
|
<Text c="dimmed" ta="center" py="lg" size="sm">
|
||||||
|
|||||||
@@ -311,6 +311,7 @@ export const URL_CONSTANTS = {
|
|||||||
RECEIVE_BULK: '/warehouse-inventory/receive-bulk',
|
RECEIVE_BULK: '/warehouse-inventory/receive-bulk',
|
||||||
LOAD_PASSED_EXPORT: '/warehouse-inventory/load-passed-export',
|
LOAD_PASSED_EXPORT: '/warehouse-inventory/load-passed-export',
|
||||||
BULK_MARK_INSPECTED: '/warehouse-inventory/bulk-mark-inspected',
|
BULK_MARK_INSPECTED: '/warehouse-inventory/bulk-mark-inspected',
|
||||||
|
READY_TO_LOAD_EXPORT: '/warehouse-inventory/ready-to-load-export',
|
||||||
},
|
},
|
||||||
|
|
||||||
WAREHOUSE_LOADINGS: {
|
WAREHOUSE_LOADINGS: {
|
||||||
|
|||||||
@@ -203,6 +203,14 @@ export const useLoadPassedExport = () =>
|
|||||||
export const useBulkMarkInspected = () =>
|
export const useBulkMarkInspected = () =>
|
||||||
useInventoryMutation((payload: BulkInspectPayload) => warehouseService.bulkMarkInspected(payload));
|
useInventoryMutation((payload: BulkInspectPayload) => warehouseService.bulkMarkInspected(payload));
|
||||||
|
|
||||||
|
export function useReadyToLoadExport(enabled = true) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['warehouse-inventory', 'ready-to-load-export'],
|
||||||
|
queryFn: () => warehouseService.readyToLoadExport().then((r) => r.data),
|
||||||
|
enabled,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// ── Loading (Batch 3) ────────────────────────────────────────────────────────
|
// ── Loading (Batch 3) ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export function useLoadableWagons(enabled = true) {
|
export function useLoadableWagons(enabled = true) {
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ import type {
|
|||||||
LoadPassedExportResult,
|
LoadPassedExportResult,
|
||||||
BulkInspectPayload,
|
BulkInspectPayload,
|
||||||
BulkInspectResult,
|
BulkInspectResult,
|
||||||
|
ReadyToLoadRow,
|
||||||
ReserveInventoryPayload,
|
ReserveInventoryPayload,
|
||||||
SaveWarehousePayload,
|
SaveWarehousePayload,
|
||||||
SaveYardPayload,
|
SaveYardPayload,
|
||||||
@@ -130,6 +131,8 @@ export const warehouseService = {
|
|||||||
apiClient.post<LoadPassedExportResult>(URL_CONSTANTS.WAREHOUSE_INVENTORY.LOAD_PASSED_EXPORT, {}),
|
apiClient.post<LoadPassedExportResult>(URL_CONSTANTS.WAREHOUSE_INVENTORY.LOAD_PASSED_EXPORT, {}),
|
||||||
bulkMarkInspected: (payload: BulkInspectPayload) =>
|
bulkMarkInspected: (payload: BulkInspectPayload) =>
|
||||||
apiClient.post<BulkInspectResult>(URL_CONSTANTS.WAREHOUSE_INVENTORY.BULK_MARK_INSPECTED, payload),
|
apiClient.post<BulkInspectResult>(URL_CONSTANTS.WAREHOUSE_INVENTORY.BULK_MARK_INSPECTED, payload),
|
||||||
|
readyToLoadExport: () =>
|
||||||
|
apiClient.get<ReadyToLoadRow[]>(URL_CONSTANTS.WAREHOUSE_INVENTORY.READY_TO_LOAD_EXPORT),
|
||||||
move: (id: string, payload: MoveInventoryPayload) =>
|
move: (id: string, payload: MoveInventoryPayload) =>
|
||||||
apiClient.post<WarehouseInventoryItem>(URL_CONSTANTS.WAREHOUSE_INVENTORY.MOVE(id), payload),
|
apiClient.post<WarehouseInventoryItem>(URL_CONSTANTS.WAREHOUSE_INVENTORY.MOVE(id), payload),
|
||||||
movements: (id: string) =>
|
movements: (id: string) =>
|
||||||
|
|||||||
@@ -380,6 +380,21 @@ export interface BulkInspectResult {
|
|||||||
results: { inventoryId: string; status: string; reason?: string }[];
|
results: { inventoryId: string; status: string; reason?: string }[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ReadyToLoadRow {
|
||||||
|
id: string;
|
||||||
|
bookingId: string | null;
|
||||||
|
bookingReference: string | null;
|
||||||
|
customerId: string | null;
|
||||||
|
customerName: string | null;
|
||||||
|
containerNumber: string | null;
|
||||||
|
cargoType: string | null;
|
||||||
|
weight: number | null;
|
||||||
|
origin: string | null;
|
||||||
|
destination: string | null;
|
||||||
|
inspectionStatus: string | null;
|
||||||
|
status: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface InventoryInquiryResult {
|
export interface InventoryInquiryResult {
|
||||||
id: string;
|
id: string;
|
||||||
bookingId: string;
|
bookingId: string;
|
||||||
|
|||||||
Reference in New Issue
Block a user