From 57dd323679b42246383f987fc8382c5de06ff790 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 6 Jul 2026 13:23:07 +0800 Subject: [PATCH] 1 --- .../order.pendingOrder/orderpendingOrder.ts | 49 +++++++- .../order/orderManagement/exceptionOrder.vue | 16 +++ .../orderManagement/form/SyncOrderIdsForm.vue | 101 +++++++++++++++-- .../order/orderManagement/pendingOrder.vue | 16 +++ .../orderManagement/utils/toolbar-actions.ts | 105 +++++++++++++++++- .../component/PendingOrderListPanel.vue | 16 +++ 6 files changed, 288 insertions(+), 15 deletions(-) diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index 5f06d1f6..4feb4b7f 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -237,17 +237,46 @@ export type PendingOrderSyncOrderIdsParams = { id?: number | string; }; -/** syncOrderIds 响应:SN 管理订单(is_sn_mgmt=Y)会被拦截并标记失败,需改用单订单回传 */ +/** syncOrderIds 响应:异步模式,返回 request_id 供 syncOrderIdsProgress 轮询 */ export type PendingOrderSyncOrderIdsResponse = { flag: string; code: number; message: string; + request_id: string; + warehouse_id: number; data?: { order_ids?: Array; [key: string]: unknown; }; }; +/** syncOrderIdsProgress 查询参数 */ +export type PendingOrderSyncOrderIdsProgressParams = { + request_id?: string; + requestId?: string; +}; + +/** syncOrderIdsProgress 进度响应 */ +export type PendingOrderSyncOrderIdsProgressResponse = { + flag: string; + code: number; + message: string; + request_id: string; + status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found'; + progress: number; + total_count?: number; + processed_count?: number; + warehouse_id?: number; + result?: { + success_count?: number; + failed_count?: number; + dispatch_results?: Record; + [key: string]: unknown; + }; + error?: string; + update_time?: number; +}; + export function orderPendingOrderList(data: PendingOrderListParams = {}): Promise { return request({ url: "/system", @@ -402,6 +431,22 @@ export function orderPendingOrderSyncOrderIds( } as any); } +export function orderPendingOrderSyncOrderIdsProgress( + data: PendingOrderSyncOrderIdsProgressParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.syncOrderIdsProgress", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderUpdateOrderPlatform( data: PendingOrderUpdateOrderPlatformParams, ): Promise { @@ -674,6 +719,7 @@ export type OrderPendingOrderApi = { allocateStorageProgress: typeof orderPendingOrderAllocateStorageProgress; cancelAllocateStorage: typeof orderPendingOrderCancelAllocateStorage; syncOrderIds: typeof orderPendingOrderSyncOrderIds; + syncOrderIdsProgress: typeof orderPendingOrderSyncOrderIdsProgress; updateOrderPlatform: typeof orderPendingOrderUpdateOrderPlatform; updateOrderExpress: typeof orderPendingOrderUpdateOrderExpress; updateAddress: typeof orderPendingOrderUpdateAddress; @@ -705,6 +751,7 @@ export const orderPendingOrder: OrderPendingOrderApi = { allocateStorageProgress: orderPendingOrderAllocateStorageProgress, cancelAllocateStorage: orderPendingOrderCancelAllocateStorage, syncOrderIds: orderPendingOrderSyncOrderIds, + syncOrderIdsProgress: orderPendingOrderSyncOrderIdsProgress, updateOrderPlatform: orderPendingOrderUpdateOrderPlatform, updateOrderExpress: orderPendingOrderUpdateOrderExpress, updateAddress: orderPendingOrderUpdateAddress, diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index dbd35e1b..9f3df8a7 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -275,6 +275,14 @@ v-model="syncOrderIdsDialogVisible" :order-count="selectionRows.length" :loading="syncOrderIdsLoading" + :request-id="syncOrderIdsRequestId" + :task-status="syncOrderIdsTaskStatus" + :progress-percent="syncOrderIdsProgressPercent" + :total-count="syncOrderIdsTotalCount" + :processed-count="syncOrderIdsProcessedCount" + :success-count="syncOrderIdsSuccessCount" + :failed-count="syncOrderIdsFailedCount" + :message="syncOrderIdsMessage" @closed="resetSyncOrderIdsDialog" @submit="submitSyncOrderIds" /> @@ -883,6 +891,14 @@ const { manualWaybillForm, syncOrderIdsDialogVisible, syncOrderIdsLoading, + syncOrderIdsRequestId, + syncOrderIdsTaskStatus, + syncOrderIdsProgressPercent, + syncOrderIdsTotalCount, + syncOrderIdsProcessedCount, + syncOrderIdsSuccessCount, + syncOrderIdsFailedCount, + syncOrderIdsMessage, batchQuickRecheckDialogVisible, batchQuickRecheckSuggestedIds, batchQuickRecheckSelectedRows, diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue index 4b145a56..5fc80d75 100644 --- a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -7,35 +7,114 @@ destroy-on-close @closed="emit('closed')" > - + {{ orderCount }} 条 - + + + diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 88093532..71f506bb 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -240,6 +240,14 @@ v-model="syncOrderIdsDialogVisible" :order-count="selectionRows.length" :loading="syncOrderIdsLoading" + :request-id="syncOrderIdsRequestId" + :task-status="syncOrderIdsTaskStatus" + :progress-percent="syncOrderIdsProgressPercent" + :total-count="syncOrderIdsTotalCount" + :processed-count="syncOrderIdsProcessedCount" + :success-count="syncOrderIdsSuccessCount" + :failed-count="syncOrderIdsFailedCount" + :message="syncOrderIdsMessage" @closed="resetSyncOrderIdsDialog" @submit="submitSyncOrderIds" /> @@ -730,6 +738,14 @@ const { manualWaybillForm, syncOrderIdsDialogVisible, syncOrderIdsLoading, + syncOrderIdsRequestId, + syncOrderIdsTaskStatus, + syncOrderIdsProgressPercent, + syncOrderIdsTotalCount, + syncOrderIdsProcessedCount, + syncOrderIdsSuccessCount, + syncOrderIdsFailedCount, + syncOrderIdsMessage, batchQuickRecheckDialogVisible, batchQuickRecheckSuggestedIds, batchQuickRecheckSelectedRows, diff --git a/src/views/order/orderManagement/utils/toolbar-actions.ts b/src/views/order/orderManagement/utils/toolbar-actions.ts index afaf7f4c..78f4e71d 100644 --- a/src/views/order/orderManagement/utils/toolbar-actions.ts +++ b/src/views/order/orderManagement/utils/toolbar-actions.ts @@ -536,6 +536,14 @@ export function createPendingToolbarController(params: { const syncOrderIdsDialogVisible = ref(false) const syncOrderIdsLoading = ref(false) + const syncOrderIdsRequestId = ref('') + const syncOrderIdsTaskStatus = ref('') + const syncOrderIdsProgressPercent = ref(0) + const syncOrderIdsTotalCount = ref(0) + const syncOrderIdsProcessedCount = ref(0) + const syncOrderIdsSuccessCount = ref(0) + const syncOrderIdsFailedCount = ref(0) + const syncOrderIdsMessage = ref('') const batchQuickRecheckDialogVisible = ref(false) const batchQuickRecheckSuggestedIds = ref([]) @@ -949,6 +957,14 @@ export function createPendingToolbarController(params: { ElMessage.warning('请先勾选需要同步的订单') return } + syncOrderIdsRequestId.value = '' + syncOrderIdsTaskStatus.value = '' + syncOrderIdsProgressPercent.value = 0 + syncOrderIdsTotalCount.value = 0 + syncOrderIdsProcessedCount.value = 0 + syncOrderIdsSuccessCount.value = 0 + syncOrderIdsFailedCount.value = 0 + syncOrderIdsMessage.value = '' syncOrderIdsDialogVisible.value = true } @@ -998,8 +1014,63 @@ export function createPendingToolbarController(params: { ElMessage.error(res?.message || '同步订单ID失败') return } - const count = Array.isArray(res?.data?.order_ids) ? res.data.order_ids.length : order_ids.length - ElMessage.success((res?.message || '同步请求已受理') + `(${count} 条)`) + + const acceptedPayload = getApiResponsePayload<{ request_id?: string }>(res) + const requestId = String(acceptedPayload.request_id || res?.request_id || '').trim() + if (!requestId) { + // 无 request_id,视为同步完成 + const count = Array.isArray(res?.data?.order_ids) ? res.data.order_ids.length : order_ids.length + ElMessage.success((res?.message || '同步请求已受理') + `(${count} 条)`) + syncOrderIdsDialogVisible.value = false + params.clearSelection() + await params.loadData() + return + } + + applySyncOrderIdsProgress({ + request_id: requestId, + status: 'submitted', + progress: 0, + total_count: order_ids.length, + processed_count: 0, + message: res?.message || '同步任务已受理' + }, requestId) + + ElMessage.success((res?.message || '同步任务已受理') + `(任务ID: ${requestId})`) + params.clearSelection() + + const pollProgress = async () => { + let latestPayload: Record = {} + for (let attempt = 0; attempt < 120; attempt += 1) { + const progressRes = await params.pendingApi.syncOrderIdsProgress({ request_id: requestId }) + const progressOk = progressRes && (progressRes.code === 1 || progressRes.code === 200 || progressRes.flag === 'success') + if (!progressOk) { + throw new Error(progressRes?.message || '查询同步进度失败') + } + latestPayload = getApiResponsePayload(progressRes) + applySyncOrderIdsProgress(latestPayload, requestId) + const status = normalizeAsyncTaskStatus(latestPayload.status) + if (isAsyncTaskSuccessStatus(status)) { + return latestPayload + } + if (isAsyncTaskFailureStatus(status)) { + throw new Error(String(latestPayload.error || latestPayload.message || '同步订单失败')) + } + await sleep(1500) + } + return latestPayload + } + + const progressPayload = await pollProgress() + const successCount = Number( + progressPayload.success_count + ?? progressPayload.result?.success_count + ?? order_ids.length + ) || order_ids.length + const failedCount = Number(progressPayload.failed_count ?? progressPayload.result?.failed_count ?? 0) || 0 + const parts = [`同步完成 ${successCount} 条`] + if (failedCount > 0) parts.push(`失败 ${failedCount} 条`) + ElMessage.success(parts.join(',')) syncOrderIdsDialogVisible.value = false await params.loadData() } catch { @@ -1009,6 +1080,17 @@ export function createPendingToolbarController(params: { } } + function applySyncOrderIdsProgress(progress: Record, fallbackRequestId = '') { + syncOrderIdsRequestId.value = String(progress.request_id || fallbackRequestId || syncOrderIdsRequestId.value || '') + syncOrderIdsTaskStatus.value = normalizeAsyncTaskStatus(progress.status) + syncOrderIdsProgressPercent.value = Number(progress.progress ?? progress.progress_percent ?? syncOrderIdsProgressPercent.value ?? 0) || 0 + syncOrderIdsTotalCount.value = Number(progress.total_count ?? progress.result?.total_count ?? syncOrderIdsTotalCount.value ?? 0) || 0 + syncOrderIdsProcessedCount.value = Number(progress.processed_count ?? progress.result?.processed_count ?? syncOrderIdsProcessedCount.value ?? 0) || 0 + syncOrderIdsSuccessCount.value = Number(progress.success_count ?? progress.result?.success_count ?? syncOrderIdsSuccessCount.value ?? 0) || 0 + syncOrderIdsFailedCount.value = Number(progress.failed_count ?? progress.result?.failed_count ?? syncOrderIdsFailedCount.value ?? 0) || 0 + syncOrderIdsMessage.value = String(progress.error || progress.message || '') + } + function openAllocateExpressDialog() { const rows = params.getSelectedRows() if (!rows.length) { @@ -1086,7 +1168,16 @@ export function createPendingToolbarController(params: { cloneSourceOrderCode.value = '' } - function resetSyncOrderIdsDialog() {} + function resetSyncOrderIdsDialog() { + syncOrderIdsRequestId.value = '' + syncOrderIdsTaskStatus.value = '' + syncOrderIdsProgressPercent.value = 0 + syncOrderIdsTotalCount.value = 0 + syncOrderIdsProcessedCount.value = 0 + syncOrderIdsSuccessCount.value = 0 + syncOrderIdsFailedCount.value = 0 + syncOrderIdsMessage.value = '' + } function openUpdateAddressDialog() { const ids = params.getSelectedIds() @@ -1295,6 +1386,14 @@ export function createPendingToolbarController(params: { manualWaybillForm, syncOrderIdsDialogVisible, syncOrderIdsLoading, + syncOrderIdsRequestId, + syncOrderIdsTaskStatus, + syncOrderIdsProgressPercent, + syncOrderIdsTotalCount, + syncOrderIdsProcessedCount, + syncOrderIdsSuccessCount, + syncOrderIdsFailedCount, + syncOrderIdsMessage, batchQuickRecheckDialogVisible, batchQuickRecheckSuggestedIds, batchQuickRecheckSelectedRows, diff --git a/src/views/order/waveOrder/component/PendingOrderListPanel.vue b/src/views/order/waveOrder/component/PendingOrderListPanel.vue index bf4bda7e..4ead206e 100644 --- a/src/views/order/waveOrder/component/PendingOrderListPanel.vue +++ b/src/views/order/waveOrder/component/PendingOrderListPanel.vue @@ -156,6 +156,14 @@ v-model="syncOrderIdsDialogVisible" :order-count="selectionRows.length" :loading="syncOrderIdsLoading" + :request-id="syncOrderIdsRequestId" + :task-status="syncOrderIdsTaskStatus" + :progress-percent="syncOrderIdsProgressPercent" + :total-count="syncOrderIdsTotalCount" + :processed-count="syncOrderIdsProcessedCount" + :success-count="syncOrderIdsSuccessCount" + :failed-count="syncOrderIdsFailedCount" + :message="syncOrderIdsMessage" @closed="resetSyncOrderIdsDialog" @submit="submitSyncOrderIds" /> @@ -381,6 +389,14 @@ const { storageAllocateMessage, syncOrderIdsDialogVisible, syncOrderIdsLoading, + syncOrderIdsRequestId, + syncOrderIdsTaskStatus, + syncOrderIdsProgressPercent, + syncOrderIdsTotalCount, + syncOrderIdsProcessedCount, + syncOrderIdsSuccessCount, + syncOrderIdsFailedCount, + syncOrderIdsMessage, manualWaybillDialogVisible, manualWaybillLoading, manualWaybillOrderId,