diff --git a/dist.tar.gz b/dist.tar.gz index 61915564..5622b8e2 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index cf22208c..7cf2839e 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -23,6 +23,99 @@ export type WaveGroupOrderFetchListParams = { return_order_ids?: boolean } +export type WaveStrategyListParams = { + pagination?: { + page?: number + pageSize?: number + currentPage?: number + page_size?: number + size?: number + } +} + +export type WaveStrategyCreateParams = { + strategy_name: string + strategy_type: number + batch_mode: number + status?: number + order_min_sku?: number + order_max_sku?: number + order_min_qty?: number + order_max_qty?: number + min_same_structure?: number + max_same_structure?: number + batch_max_orders?: number + batch_max_skus?: number + group_batch_max_orders?: number + require_same_express?: boolean + allow_cross_owner?: boolean + description?: string + allowed_provinces?: Array + allowed_platforms?: Array + allowed_owners?: Array + allowed_expresses?: Array +} + +export type WaveStrategyUpdateParams = { + id?: number + strategy_id?: number + strategyId?: number + strategy_name?: string + strategy_type?: number + batch_mode?: number + status?: number + order_min_sku?: number + order_max_sku?: number + order_min_qty?: number + order_max_qty?: number + min_same_structure?: number + max_same_structure?: number + batch_max_orders?: number + batch_max_skus?: number + group_batch_max_orders?: number + require_same_express?: boolean + allow_cross_owner?: boolean + description?: string + allowed_provinces?: Array + allowed_platforms?: Array + allowed_owners?: Array + allowed_expresses?: Array +} + +export type WaveStrategyQuickScanParams = { +} + +export type WaveStrategyQuickScanResponse = { + status: string + task_id: string + warehouse_id: number + state: string + message?: string + accepted_at: string +} + +export type WaveStrategyQuickScanTaskProgressParams = { + task_id?: string + taskId?: string +} + +export type WaveStrategyQuickScanTaskProgressResponse = { + task_id: string + state: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id?: number + total_order_count?: number + processed_order_count?: number + matched_order_count?: number + unmatched_order_count?: number + progress_percent?: number + submitted_at?: string + start_time?: string + end_time?: string + error_message?: string + error_code?: string + duration_ms?: number +} + export type WaveStrategyFallbackOrderListParams = { pagination?: { page?: number @@ -38,6 +131,25 @@ export type WaveStrategyFallbackOrderListParams = { } } +/** 不符合波次策略订单行;含接口新增的 item_snapshot(商品名称*数量|…) */ +export type WaveStrategyFallbackOrderListRow = Record & { + item_snapshot?: string +} + +export type WaveStrategyFallbackOrderListPagination = { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean +} + +export type WaveStrategyFallbackOrderListResponse = { + list: WaveStrategyFallbackOrderListRow[] + pagination: WaveStrategyFallbackOrderListPagination +} + export type WaveFetchParams = { structure_list: Array<{ item_detail_machine: string @@ -239,7 +351,83 @@ export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams } as any) } -export function orderWaveWaveStrategyFallbackOrderList(data: WaveStrategyFallbackOrderListParams = {}): Promise { +export function orderWaveWaveStrategyList(data: WaveStrategyListParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyList', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderWaveWaveStrategyCreate(data: WaveStrategyCreateParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyCreate', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderWaveWaveStrategyUpdate(data: WaveStrategyUpdateParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyUpdate', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderWaveWaveStrategyQuickScan( + data: WaveStrategyQuickScanParams = {} +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyQuickScan', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderWaveWaveStrategyQuickScanTaskProgress( + data: WaveStrategyQuickScanTaskProgressParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyQuickScanTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderWaveWaveStrategyFallbackOrderList( + data: WaveStrategyFallbackOrderListParams = {} +): Promise { return request({ url: '/system', method: 'post', @@ -485,6 +673,11 @@ export function orderWaveBatchRemoveOrders(data: WaveBatchRemoveOrdersParams): P export const orderWave = { batchList: orderWaveBatchList, groupOrderFetchList: orderWaveGroupOrderFetchList, + waveStrategyList: orderWaveWaveStrategyList, + waveStrategyCreate: orderWaveWaveStrategyCreate, + waveStrategyUpdate: orderWaveWaveStrategyUpdate, + waveStrategyQuickScan: orderWaveWaveStrategyQuickScan, + waveStrategyQuickScanTaskProgress: orderWaveWaveStrategyQuickScanTaskProgress, waveStrategyFallbackOrderList: orderWaveWaveStrategyFallbackOrderList, singleFetchByIds: orderWaveSingleFetchByIds, groupFetch: orderWaveGroupFetch, diff --git a/src/views/order/waveOrder/WaveBatchListPanel.vue b/src/views/order/waveOrder/WaveBatchListPanel.vue index 5f10ab13..ced1bb39 100644 --- a/src/views/order/waveOrder/WaveBatchListPanel.vue +++ b/src/views/order/waveOrder/WaveBatchListPanel.vue @@ -233,29 +233,17 @@ />
- 波次详情 + + +
- - {{ getWaveCode(selectedRow) }} - {{ getWaveTypeText(selectedRow) }} - - {{ getStatusText(selectedRow) }} - - {{ getOrderCount(selectedRow) }} - {{ getProcessedOrders(selectedRow) }} - {{ selectedRow.warehouse_id ?? '—' }} - {{ selectedRow.logistics_name || '—' }} - {{ getStorageAssignmentStatusText(selectedRow) }} - {{ selectedRow.express_assignment_status || '—' }} - {{ selectedRow.creator || selectedRow.creator_name || '—' }} - {{ getItemSnapshotText(selectedRow) }} - {{ getOrderInfoSummary(selectedRow) }} - {{ formatDateTime(selectedRow.create_time || selectedRow.created_at || selectedRow.create_at) }} - {{ formatDateTime(selectedRow.update_time || selectedRow.updated_at || selectedRow.update_at) }} - {{ getOrderListPreview(selectedRow) }} - + +
+ +
+
@@ -435,7 +423,7 @@ 已选 {{ fallbackOrderSelectionRows.length }} 个订单
+ + 快速扫描 + 查询 重置 按订单IDs抓取删单
+
+
+ 波次策略快速扫描任务已提交 + 任务ID:{{ waveStrategyQuickScanResult.taskId }} +
+ +
+ 提交状态:{{ waveStrategyQuickScanResult.status || '—' }} + 任务状态:{{ waveStrategyQuickScanResult.state || '—' }} + 仓库ID:{{ waveStrategyQuickScanResult.warehouseId || '—' }} + 处理进度:{{ waveStrategyQuickScanResult.processedOrderCount }} / {{ waveStrategyQuickScanResult.totalOrderCount }} + 匹配订单:{{ waveStrategyQuickScanResult.matchedOrderCount }} + 未匹配订单:{{ waveStrategyQuickScanResult.unmatchedOrderCount }} + 受理时间:{{ formatDateTime(waveStrategyQuickScanResult.acceptedAt) }} +
+
+ {{ waveStrategyQuickScanResult.message }} +
+
+ + + +