From abd7ab70134752b75037894503ebb16fa2f689e7 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Fri, 8 May 2026 18:15:30 +0800 Subject: [PATCH] =?UTF-8?q?5=E6=9C=888=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.wave/orderwave.ts | 296 +- ...tPanel.vue => GroupWaveBatchListPanel.vue} | 428 +- .../waveOrder/SandanWaveBatchListPanel.vue | 3588 +++++++++++++++++ .../component/PendingOrderListPanel.vue | 5 +- .../WaveStrategyQuickScanProgressDialog.vue | 154 + .../order/waveOrder/config/wave-config.ts | 38 +- src/views/order/waveOrder/groupWave.vue | 7 - src/views/order/waveOrder/index.vue | 10 +- src/views/order/waveOrder/sandanWave.vue | 7 - workflows/api-doc-agent/config/接口.md | 10 +- .../interface-details/interface-details.json | 398 +- .../data/module-list/module-list.json | 60 +- .../data/module/config/_module.lifecycle.json | 2 +- .../data/module/config/module.json | 4 +- .../module/dashboard/_module.lifecycle.json | 2 +- .../data/module/dashboard/module.json | 4 +- .../data/module/index/_module.lifecycle.json | 2 +- .../data/module/index/module.json | 4 +- .../order.archiveorder/_module.lifecycle.json | 2 +- .../module/order.archiveorder/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../order.deliveryexpectionorder/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/order.deliveryorder/module.json | 4 +- .../order.entrustorder/_module.lifecycle.json | 2 +- .../module/order.entrustorder/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/order.expectionorder/module.json | 4 +- .../module/order.index/_module.lifecycle.json | 2 +- .../data/module/order.index/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/order.outboundorder/module.json | 4 +- .../order.pendingorder/_module.lifecycle.json | 2 +- .../module/order.pendingorder/module.json | 4 +- .../module/order.print/_module.lifecycle.json | 2 +- .../data/module/order.print/module.json | 4 +- .../order.revieworder/_module.lifecycle.json | 2 +- .../data/module/order.revieworder/module.json | 4 +- .../module/order.wave/_module.lifecycle.json | 2 +- .../data/module/order.wave/module.json | 1341 +++--- .../data/module/pick/_module.lifecycle.json | 2 +- .../data/module/pick/module.json | 4 +- .../data/module/print/_module.lifecycle.json | 2 +- .../data/module/print/module.json | 4 +- .../printer.station/_module.lifecycle.json | 2 +- .../data/module/printer.station/module.json | 4 +- .../setting.account/_module.lifecycle.json | 2 +- .../data/module/setting.account/module.json | 4 +- .../setting.express/_module.lifecycle.json | 2 +- .../data/module/setting.express/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../setting.expressinterface/module.json | 4 +- .../setting.permission/_module.lifecycle.json | 2 +- .../module/setting.permission/module.json | 4 +- .../setting.platform/_module.lifecycle.json | 2 +- .../data/module/setting.platform/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/setting.printtemplate/module.json | 4 +- .../setting.role/_module.lifecycle.json | 2 +- .../data/module/setting.role/module.json | 4 +- .../setting.warehouse/_module.lifecycle.json | 2 +- .../data/module/setting.warehouse/module.json | 4 +- .../data/module/stock/_module.lifecycle.json | 2 +- .../data/module/stock/module.json | 4 +- .../storage.entry/_module.lifecycle.json | 2 +- .../data/module/storage.entry/module.json | 4 +- .../storage.inventory/_module.lifecycle.json | 2 +- .../data/module/storage.inventory/module.json | 4 +- .../storage.stockout/_module.lifecycle.json | 2 +- .../data/module/storage.stockout/module.json | 4 +- .../storage_receiving/_module.lifecycle.json | 2 +- .../data/module/storage_receiving/module.json | 4 +- .../data/module/store/_module.lifecycle.json | 2 +- .../data/module/store/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/storewarehouse.store/module.json | 4 +- .../data/module/user/_module.lifecycle.json | 2 +- .../data/module/user/module.json | 4 +- .../module/warehouse/_module.lifecycle.json | 2 +- .../data/module/warehouse/module.json | 4 +- 80 files changed, 5457 insertions(+), 1085 deletions(-) rename src/views/order/waveOrder/{WaveBatchListPanel.vue => GroupWaveBatchListPanel.vue} (90%) create mode 100644 src/views/order/waveOrder/SandanWaveBatchListPanel.vue create mode 100644 src/views/order/waveOrder/component/WaveStrategyQuickScanProgressDialog.vue delete mode 100644 src/views/order/waveOrder/groupWave.vue delete mode 100644 src/views/order/waveOrder/sandanWave.vue diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 7cf2839e..9f0b6321 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -10,6 +10,20 @@ export type WaveBatchListParams = { where?: Record } +export type WaveListPagination = { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean +} + +export type WaveBatchListResponse = { + list: Array> + pagination: WaveListPagination +} + export type WaveGroupOrderFetchListParams = { pagination?: { page?: number @@ -23,6 +37,11 @@ export type WaveGroupOrderFetchListParams = { return_order_ids?: boolean } +export type WaveGroupOrderFetchListResponse = { + list: Array> + pagination: WaveListPagination +} + export type WaveStrategyListParams = { pagination?: { page?: number @@ -33,6 +52,47 @@ export type WaveStrategyListParams = { } } +export type WaveStrategyRecord = Record & { + id?: number + strategy_id?: number + strategyId?: number + strategy_name?: string + strategy_type?: number + batch_mode?: number + status?: number + order_min_sku?: number | null + order_max_sku?: number | null + order_min_qty?: number | null + order_max_qty?: number | null + min_same_structure?: number | null + max_same_structure?: number | null + batch_max_orders?: number | null + batch_max_skus?: number | null + group_batch_max_orders?: number | null + require_same_express?: boolean | number + allow_cross_owner?: boolean | number + description?: string + allowed_provinces?: Array | string + allowed_platforms?: Array | string + allowed_owners?: Array | string + allowed_expresses?: Array | string + warehouse_id?: number + create_time?: string | number + update_time?: string | number +} + +export type WaveStrategyListResponse = { + list: WaveStrategyRecord[] + pagination: { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean + } +} + export type WaveStrategyCreateParams = { strategy_name: string strategy_type: number @@ -50,16 +110,18 @@ export type WaveStrategyCreateParams = { require_same_express?: boolean allow_cross_owner?: boolean description?: string - allowed_provinces?: Array - allowed_platforms?: Array - allowed_owners?: Array - allowed_expresses?: Array + allowed_provinces?: Array | string + allowed_platforms?: Array | string + allowed_owners?: Array | string + allowed_expresses?: Array | string } -export type WaveStrategyUpdateParams = { - id?: number - strategy_id?: number - strategyId?: number +type WaveStrategyIdentityParam = + | { id: number; strategy_id?: number; strategyId?: number } + | { id?: number; strategy_id: number; strategyId?: number } + | { id?: number; strategy_id?: number; strategyId: number } + +export type WaveStrategyUpdateParams = WaveStrategyIdentityParam & { strategy_name?: string strategy_type?: number batch_mode?: number @@ -76,10 +138,10 @@ export type WaveStrategyUpdateParams = { require_same_express?: boolean allow_cross_owner?: boolean description?: string - allowed_provinces?: Array - allowed_platforms?: Array - allowed_owners?: Array - allowed_expresses?: Array + allowed_provinces?: Array | string + allowed_platforms?: Array | string + allowed_owners?: Array | string + allowed_expresses?: Array | string } export type WaveStrategyQuickScanParams = { @@ -91,7 +153,27 @@ export type WaveStrategyQuickScanResponse = { warehouse_id: number state: string message?: string - accepted_at: string + accepted_at?: string +} + +export type WaveStrategyMutationResponse = { + data: WaveStrategyRecord + code: number +} + +export type WaveStrategyFetchAdminParams = { 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 } export type WaveStrategyQuickScanTaskProgressParams = { @@ -125,10 +207,6 @@ export type WaveStrategyFallbackOrderListParams = { size?: number } where?: Record - sort?: { - sortField?: string - sortOrder?: 'ASC' | 'DESC' | string - } } /** 不符合波次策略订单行;含接口新增的 item_snapshot(商品名称*数量|…) */ @@ -192,8 +270,10 @@ export type WaveBatchAllocateExpressParams = { } export type WaveBatchAllocateExpressResponse = { + status: string task_id: string - status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id: number + accepted_at: string message?: string } @@ -204,15 +284,23 @@ export type WaveBatchAllocateExpressTaskProgressParams = { export type WaveBatchAllocateExpressTaskProgressResponse = { task_id: string - status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + state: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id?: number + total_wave_count?: number + total_order_count?: number + processed_order_count?: number + success_order_count?: number + failed_order_count?: number progress_percent?: number + duration_ms?: number + error_message?: string + error_code?: string + // Backward-compatible fields + status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string total_count?: number success_count?: number failed_count?: number - total_order_count?: number allocated_order_count?: number - failed_order_count?: number - duration_ms?: number update_time?: string error?: string message?: string @@ -225,8 +313,10 @@ export type WaveBatchAllocateStorageParams = { } export type WaveBatchAllocateStorageResponse = { + status: string task_id: string - status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id: number + accepted_at: string message?: string } @@ -237,15 +327,23 @@ export type WaveBatchAllocateStorageTaskProgressParams = { export type WaveBatchAllocateStorageTaskProgressResponse = { task_id: string - status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + state: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id?: number + total_wave_count?: number + total_order_count?: number + processed_order_count?: number + success_order_count?: number + failed_order_count?: number progress_percent?: number + duration_ms?: number + error_message?: string + error_code?: string + // Backward-compatible fields + status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string total_count?: number success_count?: number failed_count?: number - total_order_count?: number allocated_order_count?: number - failed_order_count?: number - duration_ms?: number update_time?: string error?: string message?: string @@ -258,8 +356,10 @@ export type WaveBatchRemoveExceptionOrdersParams = { } export type WaveBatchRemoveExceptionOrdersResponse = { + status: string task_id: string - status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id: number + accepted_at: string message?: string } @@ -270,22 +370,41 @@ export type WaveBatchRemoveExceptionOrdersTaskProgressParams = { export type WaveBatchRemoveExceptionOrdersTaskProgressResponse = { task_id: string - status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + state: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + warehouse_id?: number + total_wave_count?: number + total_order_count?: number + processed_order_count?: number + removed_order_count?: number + failed_order_count?: number progress_percent?: number + duration_ms?: number + error_message?: string + error_code?: string + // Backward-compatible fields + status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string total_count?: number success_count?: number failed_count?: number - total_order_count?: number - removed_order_count?: number - failed_order_count?: number - duration_ms?: number update_time?: string error?: string message?: string } export type WaveBatchCancelParams = { - ids: Array | string | number + ids?: Array | string | number + wave_ids?: Array | string | number + waveIds?: Array | string | number + task_id?: string + taskId?: string +} + +export type WaveBatchCancelResponse = { + status: string + task_id: string + warehouse_id: number + accepted_at: string + message?: string } export type WaveBatchCancelTaskProgressParams = { @@ -295,17 +414,21 @@ export type WaveBatchCancelTaskProgressParams = { export type WaveBatchCancelTaskProgressResponse = { task_id: string - status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string - state?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string + state: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string progress_percent?: number + total_wave_count?: number + processed_wave_count?: number + duration_ms?: number + error_message?: string + error_code?: string + result?: Record + // Backward-compatible fields + status?: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' | string total_count?: number success_count?: number failed_count?: number - total_wave_count?: number - processed_wave_count?: number total_order_count?: number processed_order_count?: number - duration_ms?: number update_time?: string error?: string message?: string @@ -315,15 +438,42 @@ export type WaveBatchAutoGroupingParams = { ids: Array | string | number } +export type WaveBatchAutoGroupingResponse = { + ids?: Array + affected_wave_ids?: Array + updated_wave_count?: number + skipped_wave_ids?: Array + skipped_wave_count?: number + skipped_details?: Array<{ wave_id?: number | string; reason?: string }> +} + export type WaveBatchFinishAutoGroupingParams = { ids: Array | string | number } +export type WaveBatchFinishAutoGroupingResponse = { + ids?: Array + affected_wave_ids?: Array + updated_wave_ids?: Array + updated_wave_count?: number +} + export type WaveBatchRemoveOrdersParams = { ids: Array | string | number } -export function orderWaveBatchList(data: WaveBatchListParams = {}): Promise { +export type WaveBatchRemoveOrdersResponse = { + ids: Array + removed_order_ids: Array + removed_order_count: number + affected_wave_ids: Array + updated_wave_ids: Array + emptied_wave_ids: Array +} + +export function orderWaveBatchList( + data: WaveBatchListParams = {} +): Promise }> { return request({ url: '/system', method: 'post', @@ -337,7 +487,9 @@ export function orderWaveBatchList(data: WaveBatchListParams = {}): Promise } as any) } -export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams = {}): Promise { +export function orderWaveGroupOrderFetchList( + data: WaveGroupOrderFetchListParams = {} +): Promise }> { return request({ url: '/system', method: 'post', @@ -351,7 +503,9 @@ export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams } as any) } -export function orderWaveWaveStrategyList(data: WaveStrategyListParams = {}): Promise { +export function orderWaveWaveStrategyList( + data: WaveStrategyListParams = {} +): Promise }> { return request({ url: '/system', method: 'post', @@ -365,7 +519,9 @@ export function orderWaveWaveStrategyList(data: WaveStrategyListParams = {}): Pr } as any) } -export function orderWaveWaveStrategyCreate(data: WaveStrategyCreateParams): Promise { +export function orderWaveWaveStrategyCreate( + data: WaveStrategyCreateParams +): Promise { return request({ url: '/system', method: 'post', @@ -379,7 +535,9 @@ export function orderWaveWaveStrategyCreate(data: WaveStrategyCreateParams): Pro } as any) } -export function orderWaveWaveStrategyUpdate(data: WaveStrategyUpdateParams): Promise { +export function orderWaveWaveStrategyUpdate( + data: WaveStrategyUpdateParams +): Promise { return request({ url: '/system', method: 'post', @@ -409,6 +567,38 @@ export function orderWaveWaveStrategyQuickScan( } as any) } +export function orderWaveWaveStrategyFetchAdmin( + data: WaveStrategyFetchAdminParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyFetchAdmin', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderWaveWaveStrategyFetchPda( + data: WaveStrategyFetchPdaParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.waveStrategyFetchPda', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + export function orderWaveWaveStrategyQuickScanTaskProgress( data: WaveStrategyQuickScanTaskProgressParams ): Promise { @@ -600,7 +790,9 @@ export function orderWaveBatchRemoveExceptionOrdersTaskProgress(data: WaveBatchR } as any) } -export function orderWaveBatchCancel(data: WaveBatchCancelParams): Promise { +export function orderWaveBatchCancel( + data: WaveBatchCancelParams +): Promise; flag?: string }> { return request({ url: '/system', method: 'post', @@ -628,7 +820,9 @@ export function orderWaveBatchCancelTaskProgress(data: WaveBatchCancelTaskProgre } as any) } -export function orderWaveBatchAutoGrouping(data: WaveBatchAutoGroupingParams): Promise { +export function orderWaveBatchAutoGrouping( + data: WaveBatchAutoGroupingParams +): Promise }> { return request({ url: '/system', method: 'post', @@ -642,7 +836,9 @@ export function orderWaveBatchAutoGrouping(data: WaveBatchAutoGroupingParams): P } as any) } -export function orderWaveBatchFinishAutoGrouping(data: WaveBatchFinishAutoGroupingParams): Promise { +export function orderWaveBatchFinishAutoGrouping( + data: WaveBatchFinishAutoGroupingParams +): Promise }> { return request({ url: '/system', method: 'post', @@ -656,7 +852,9 @@ export function orderWaveBatchFinishAutoGrouping(data: WaveBatchFinishAutoGroupi } as any) } -export function orderWaveBatchRemoveOrders(data: WaveBatchRemoveOrdersParams): Promise { +export function orderWaveBatchRemoveOrders( + data: WaveBatchRemoveOrdersParams +): Promise; flag?: string }> { return request({ url: '/system', method: 'post', @@ -677,6 +875,8 @@ export const orderWave = { waveStrategyCreate: orderWaveWaveStrategyCreate, waveStrategyUpdate: orderWaveWaveStrategyUpdate, waveStrategyQuickScan: orderWaveWaveStrategyQuickScan, + waveStrategyFetchAdmin: orderWaveWaveStrategyFetchAdmin, + waveStrategyFetchPda: orderWaveWaveStrategyFetchPda, waveStrategyQuickScanTaskProgress: orderWaveWaveStrategyQuickScanTaskProgress, waveStrategyFallbackOrderList: orderWaveWaveStrategyFallbackOrderList, singleFetchByIds: orderWaveSingleFetchByIds, diff --git a/src/views/order/waveOrder/WaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue similarity index 90% rename from src/views/order/waveOrder/WaveBatchListPanel.vue rename to src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 3634cbfb..b18d0403 100644 --- a/src/views/order/waveOrder/WaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -463,26 +463,6 @@ -
-
- 波次策略快速扫描任务已提交 - 任务ID:{{ waveStrategyQuickScanResult.taskId }} -
- -
- 提交状态:{{ waveStrategyQuickScanResult.status || '—' }} - 任务状态:{{ waveStrategyQuickScanResult.state || '—' }} - 仓库ID:{{ waveStrategyQuickScanResult.warehouseId || '—' }} - 处理进度:{{ waveStrategyQuickScanResult.processedOrderCount }} / {{ waveStrategyQuickScanResult.totalOrderCount }} - 匹配订单:{{ waveStrategyQuickScanResult.matchedOrderCount }} - 未匹配订单:{{ waveStrategyQuickScanResult.unmatchedOrderCount }} - 受理时间:{{ formatDateTime(waveStrategyQuickScanResult.acceptedAt) }} -
-
- {{ waveStrategyQuickScanResult.message }} -
-
- - + - +