From 18e875ad56bc991d9d3b3c549d0c8a461b9be4f3 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Sat, 9 May 2026 18:18:05 +0800 Subject: [PATCH] =?UTF-8?q?5=E6=9C=889=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.wave/orderwave.ts | 106 +- src/components/ScanBox/index.vue | 91 + src/layout/component/TaskView/index.vue | 7 +- src/stores/modules/scanBoxCache.ts | 66 + .../order/orderManagement/archiveOrder.vue | 1 + .../config/order-common-config.ts | 6 + .../orderManagement/deliveryException.vue | 1 + .../order/orderManagement/deliveryOrder.vue | 1 + .../orderManagement/entrustWarehouse.vue | 1 + .../order/orderManagement/exceptionOrder.vue | 1 + .../order/orderManagement/outboundOrder.vue | 1 + .../order/orderManagement/pendingOrder.vue | 1 + .../order/orderManagement/reviewOrder.vue | 1 + .../waveOrder/GroupWaveBatchListPanel.vue | 114 +- .../waveOrder/SandanWaveBatchListPanel.vue | 138 +- .../component/WaveFetchTaskProgressDialog.vue | 10 + .../order/waveOrder/config/wave-config.ts | 12 - workflows/api-doc-agent/config/响应.md | 1246 ++++++++++++- workflows/api-doc-agent/config/接口.md | 11 +- workflows/api-doc-agent/docs/测试.md | 168 ++ workflows/api-doc-agent/docs/表格数据.md | 0 workflows/api-doc-system/apidata/config.json | 96 +- workflows/api-doc-system/apidata/data.json | 1635 ++++++++++++++++- .../interface-details/interface-details.json | 475 ++++- .../data/module-list/module-list.json | 137 +- .../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 | 337 +++- .../data/module/order/_module.lifecycle.json | 12 + .../data/module/order/module.json | 85 + .../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 +- .../api-doc-system/data/pending-updates.json | 83 +- 96 files changed, 4658 insertions(+), 385 deletions(-) create mode 100644 src/stores/modules/scanBoxCache.ts create mode 100644 workflows/api-doc-agent/docs/测试.md delete mode 100644 workflows/api-doc-agent/docs/表格数据.md create mode 100644 workflows/api-doc-system/data/module/order/_module.lifecycle.json create mode 100644 workflows/api-doc-system/data/module/order/module.json 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 @@