diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 4b35e7f4..a0b6c0d1 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -86,6 +86,11 @@ export type WaveGroupOrderFetchListResponse = { pagination: WaveListPagination } +/** order.wave.singleOrderFetchList:参数与团购列表接口一致,语义为散单候选分组(小于同组订单阈值) */ +export type WaveSingleOrderFetchListParams = WaveGroupOrderFetchListParams + +export type WaveSingleOrderFetchListResponse = WaveGroupOrderFetchListResponse + export type WaveStrategyListParams = { pagination?: { page?: number @@ -205,21 +210,38 @@ export type WaveStrategyMutationResponse = { code: number } -export type WaveStrategyFetchAdminParams = { strategy_id: number } | { strategyId: number } +type WaveStrategyFetchStrategyId = + | { strategy_id: number; strategyId?: number } + | { strategy_id?: number; strategyId: number } -export type WaveStrategyFetchPdaParams = { strategy_id: number } | { strategyId: number } - -/** 按策略提交抓取任务(Admin / PDA)受理响应 */ -export type WaveStrategyFetchByStrategyResponse = { - status: string - task_id: string - warehouse_id: number - strategy_id: number - state: string - message?: string - accepted_at?: string +/** order.wave.waveStrategyFetchAdmin / waveStrategyFetchPda 入参(支持下划线/驼峰别名) */ +export type WaveStrategyFetchAdminParams = WaveStrategyFetchStrategyId & { + cart_id?: string | number + cartId?: string | number + source?: string + operation_source?: string + strategy_params?: Record + strategyParams?: Record } +export type WaveStrategyFetchPdaParams = WaveStrategyFetchAdminParams + +/** 按策略创建抓取主流程任务后的响应(Admin / PDA 一致) */ +export type WaveStrategyFetchTaskCreatedResponse = { + state: string + task_id: string + task_no: string + plan: Record + plan_summary: string + warehouse_id?: number + strategy_id?: number + validation_errors?: Array<{ field?: string; message?: string }> + message?: string +} + +/** @deprecated 使用 WaveStrategyFetchTaskCreatedResponse */ +export type WaveStrategyFetchByStrategyResponse = WaveStrategyFetchTaskCreatedResponse + export type WaveStrategyQuickScanTaskProgressParams = { task_id?: string taskId?: string @@ -279,12 +301,23 @@ export type WaveFetchParams = { }> } +/** order.wave.singleFetch:每项须含 max_fetch_quantity(上限订单数) */ +export type WaveSingleFetchParams = { + structure_list: Array<{ + item_detail_machine: string + max_fetch_quantity: number + quantity?: number + }> +} + export type WaveFetchResponse = { task_id: string warehouse_id: number structure_count: number default_quantity: number auto_fetch_disabled_marker: string + fetch_mode?: string + max_fetch_quantity?: number message?: string } @@ -305,6 +338,10 @@ export type WaveFetchTaskProgressResponse = { error?: string update_time?: string message?: string + fetch_mode?: string + max_fetch_quantity?: number + limit_reached?: boolean + stop_reason?: string } export type WaveBatchAllocateExpressParams = { @@ -503,7 +540,12 @@ export type WaveBatchFinishAutoGroupingResponse = { } export type WaveBatchRemoveOrdersParams = { - ids: Array | string | number + ids?: Array | string | number + order_ids?: Array | string | number + orderIds?: Array | string | number + order_id?: string | number + orderId?: string | number + id?: string | number } export type WaveBatchRemoveOrdersResponse = { @@ -579,6 +621,22 @@ export function orderWaveGroupOrderFetchList( } as any) } +export function orderWaveSingleOrderFetchList( + data: WaveSingleOrderFetchListParams = {} +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.singleOrderFetchList', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + export function orderWaveWaveStrategyList( data: WaveStrategyListParams = {} ): Promise }> { @@ -645,12 +703,12 @@ export function orderWaveWaveStrategyQuickScan( export function orderWaveWaveStrategyFetchAdmin( data: WaveStrategyFetchAdminParams -): Promise { +): Promise { return request({ url: '/system', method: 'post', params: { - method: 'order.wave.waveStrategyFetchPda', + method: 'order.wave.waveStrategyFetchAdmin', v, timestamp: new Date().getTime() }, @@ -661,7 +719,7 @@ export function orderWaveWaveStrategyFetchAdmin( export function orderWaveWaveStrategyFetchPda( data: WaveStrategyFetchPdaParams -): Promise { +): Promise { return request({ url: '/system', method: 'post', @@ -768,6 +826,20 @@ export function orderWaveGroupFetch(data: WaveFetchParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.singleFetch', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + export function orderWaveFetchTaskProgress(data: WaveFetchTaskProgressParams): Promise { return request({ url: '/system', @@ -949,6 +1021,7 @@ export const orderWave = { wavePickTaskList: orderWaveWavePickTaskList, wavePickTaskCancel: orderWaveWavePickTaskCancel, groupOrderFetchList: orderWaveGroupOrderFetchList, + singleOrderFetchList: orderWaveSingleOrderFetchList, waveStrategyList: orderWaveWaveStrategyList, waveStrategyCreate: orderWaveWaveStrategyCreate, waveStrategyUpdate: orderWaveWaveStrategyUpdate, @@ -959,6 +1032,7 @@ export const orderWave = { waveStrategyFallbackOrderList: orderWaveWaveStrategyFallbackOrderList, singleFetchByIds: orderWaveSingleFetchByIds, groupFetch: orderWaveGroupFetch, + singleFetch: orderWaveSingleFetch, fetch: orderWaveFetch, fetchTaskProgress: orderWaveFetchTaskProgress, batchAllocateExpress: orderWaveBatchAllocateExpress, diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 379b25ec..71b2b6d7 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -376,6 +376,8 @@