diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 4e3a7194..6de060a6 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -22,6 +22,10 @@ export type WaveBatchListWhere = { item_snapshot_key?: string item_detail_machine?: string distinguish_express?: number + /** 波次订单总数(等值,也可用 { operator: 'between', value: [min, max] }) */ + total_orders?: number + /** 已处理订单数(等值,也可用 { operator: 'between', value: [min, max] }) */ + processed_orders?: number total_orders_min?: number total_orders_max?: number processed_orders_min?: number @@ -38,6 +42,12 @@ export type WaveBatchListWhere = { source?: number /** 英文枚举:unreviewed | partially_reviewed | reviewed */ review_assignment_status?: 'unreviewed' | 'partially_reviewed' | 'reviewed' + /** + * 同步状态(仅 eq)。英文枚举:unsynced | partially_synced | synced; + * 按订单 sync_status 聚合:synced=全部 fin;partially_synced=部分已同步且不含 error; + * unsynced=全未同步或包含 error(同步异常并入未同步集合) + */ + sync_assignment_status?: 'unsynced' | 'partially_synced' | 'synced' } /** order.wave.batchList 排序(对齐 stock.warehouse.list 等 RPC 列表接口) */ @@ -78,9 +88,13 @@ export type WaveBatchListItem = Record & { storage_assignment_status?: string express_assignment_status?: string print_assignment_status?: string + /** 按订单 pick_status 聚合:未拣货/部分拣货/已拣货/拣货异常 */ + pick_assignment_status?: string /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ source?: number review_assignment_status?: string + /** 按订单 sync_status 聚合:未同步/部分同步/已同步/同步异常(error 并入未同步) */ + sync_assignment_status?: string unreviewed_order_count?: number /** 货主信息:波次内所有订单均为同一货主时返回货主名称,否则返回“混合” */ store_name?: string diff --git a/src/api/waybill.warehouse/index.ts b/src/api/waybill.warehouse/index.ts index 9a82c7b9..a3207a03 100644 --- a/src/api/waybill.warehouse/index.ts +++ b/src/api/waybill.warehouse/index.ts @@ -66,9 +66,16 @@ export type WaybillWarehouseListParams = { sort?: WaybillWarehouseListSort } +/** 单次请求可覆盖的配置(不传则使用全局默认超时 10 秒) */ +export type WaybillRequestOptions = { + /** 超时时间(毫秒) */ + timeout?: number +} + /** waybill.warehouse.list:运单列表-仓库侧 */ export function waybillWarehouseList( - data: WaybillWarehouseListParams = {} + data: WaybillWarehouseListParams = {}, + options: WaybillRequestOptions = {} ): Promise { return request({ url: '/system', @@ -79,7 +86,8 @@ export function waybillWarehouseList( timestamp: new Date().getTime() }, data, - isSystemApi: true + isSystemApi: true, + ...(options.timeout ? { timeout: options.timeout } : {}) } as any) } diff --git a/src/views/express/waybill/config/template-config.ts b/src/views/express/waybill/config/template-config.ts index 3d5c2eef..8c738918 100644 --- a/src/views/express/waybill/config/template-config.ts +++ b/src/views/express/waybill/config/template-config.ts @@ -26,6 +26,13 @@ export const PAGE_CONFIG = { enableDetailPanel: true } +/** + * 列表(筛选条件)查询超时时间:60 秒 + * 说明:全局 axios 默认超时为 10 秒,运单列表在大范围时间条件 + 多条件筛选下 + * 后端响应可能超过 10 秒,此处单独放宽为 60 秒,避免误报“请求超时”。 + */ +export const LIST_REQUEST_TIMEOUT = 60 * 1000 + // ============================================================ // 〇-A、组件注册表 // ============================================================ @@ -977,7 +984,8 @@ export const tabPages: TabPageRawConfig[] = [ } ], api: { - list: waybillWarehouseList as ApiMethod, + list: ((params: any) => + waybillWarehouseList(params, { timeout: LIST_REQUEST_TIMEOUT })) as ApiMethod, detail: { source: 'list' } as ComponentApiConfig, export: waybillWarehouseExport as ApiMethod, exportProgress: waybillWarehouseExportTaskProgress as ApiMethod, diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 6a6b277c..b96c76b7 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -125,6 +125,12 @@ + + @@ -899,6 +905,7 @@ import { formatWavePrintAssignmentStatusLabel, formatWavePickAssignmentStatusLabel, formatWaveReviewAssignmentStatusLabel, + formatWaveSyncAssignmentStatusLabel, getWaveAssignmentAggregateTagType, formatWaveSource, getWaveSourceTagType, diff --git a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue index 97ce2f35..c3e766b3 100644 --- a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue @@ -125,6 +125,12 @@ + + @@ -497,6 +503,7 @@ import { formatWavePrintAssignmentStatusLabel, formatWavePickAssignmentStatusLabel, formatWaveReviewAssignmentStatusLabel, + formatWaveSyncAssignmentStatusLabel, getWaveAssignmentAggregateTagType, formatWaveSource, getWaveSourceTagType, diff --git a/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue b/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue index c0e2b205..e03e761b 100644 --- a/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue +++ b/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue @@ -63,6 +63,11 @@ {{ formatWaveReviewAssignmentStatusLabel(row.review_assignment_status) }} + + + {{ formatWaveSyncAssignmentStatusLabel(row.sync_assignment_status) }} + + {{ row.unreviewed_order_count ?? '—' }} @@ -99,6 +104,7 @@ import { formatWavePickAssignmentStatusLabel, formatWavePrintAssignmentStatusLabel, formatWaveReviewAssignmentStatusLabel, + formatWaveSyncAssignmentStatusLabel, formatWaveSource, getWaveAssignmentAggregateTagType, getWaveSourceTagType diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 58f3fa9e..4eb7f351 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -181,6 +181,21 @@ export const waveAvailableFields = [ { label: '已复核', value: 'reviewed' }, ] }), group: WAVE_SCAN_PROCESS_STATUS_GROUP }, + { + // order.wave.batchList where:仅 eq,英文枚举 unsynced/partially_synced/synced + // (同步异常 error 在后端并入未同步集合,故筛选无独立「同步异常」项) + ...scanWorkflowField({ + label: '同步状态', + value: 'sync_assignment_status', + type: 'select', + options: [ + { label: '未同步', value: 'unsynced' }, + { label: '部分同步', value: 'partially_synced' }, + { label: '已同步', value: 'synced' }, + ] + }), + group: WAVE_SCAN_PROCESS_STATUS_GROUP + }, // ===== 订单统计 ===== { ...waveScanBasicField({ label: '最小订单数', value: 'total_orders_min', type: 'number' }), group: WAVE_SCAN_STATS_GROUP }, @@ -381,6 +396,7 @@ export const waveBatchColumns = applyWaveListCopyActions([ { prop: 'print_assignment_status', label: '打印状态', minWidth: 110 }, { prop: 'pick_assignment_status', label: '拣货状态', minWidth: 110 }, { prop: 'review_assignment_status', label: '复核状态', minWidth: 110 }, + { prop: 'sync_assignment_status', label: '同步状态', minWidth: 110 }, { prop: 'unreviewed_order_count', label: '未复核数', minWidth: 96, sortable: true }, { prop: 'logistics_name', label: '快递', minWidth: 120 }, { prop: 'creator', label: '创建人', minWidth: 100 }, @@ -408,8 +424,12 @@ export const waveWhereAllowedFieldList = [ 'print_assignment_status', 'pick_assignment_status', 'review_assignment_status', + // 同步状态(order.wave.batchList where 仅 eq,英文枚举 unsynced/partially_synced/synced) + 'sync_assignment_status', + 'total_orders', 'total_orders_min', 'total_orders_max', + 'processed_orders', 'processed_orders_min', 'processed_orders_max', 'source', @@ -470,6 +490,17 @@ const waveReviewAssignmentStatusLabelMap: Record = { 已复核: '已复核' } +/** 同步状态:接口返回中文(未同步/部分同步/已同步/同步异常),where 筛选传英文枚举 */ +const waveSyncAssignmentStatusLabelMap: Record = { + unsynced: '未同步', + partially_synced: '部分同步', + synced: '已同步', + 未同步: '未同步', + 部分同步: '部分同步', + 已同步: '已同步', + 同步异常: '同步异常' +} + export function formatWaveExpressAssignmentStatusLabel(value: string | number | null | undefined): string { if (value === undefined || value === null || value === '') return '—' const key = String(value).trim() @@ -494,6 +525,17 @@ export function formatWaveReviewAssignmentStatusLabel(value: string | number | n return waveReviewAssignmentStatusLabelMap[key] ?? waveReviewAssignmentStatusLabelMap[key.toLowerCase()] ?? key } +export function formatWaveSyncAssignmentStatusLabel(value: string | number | null | undefined): string { + if (value === undefined || value === null || value === '') return '—' + const key = String(value).trim() + const mapped = waveSyncAssignmentStatusLabelMap[key] ?? waveSyncAssignmentStatusLabelMap[key.toLowerCase()] + if (mapped) return mapped + // 兼容后端可能返回的其他异常类文案(如 error/failure) + const lower = key.toLowerCase() + if (lower === 'error' || lower === 'failure' || lower === 'failed') return '同步异常' + return key +} + /** 快递分配 / 打印状态 / 库位分配等聚合状态列的 tag 类型(兼容英文枚举与中文文案) */ export function getWaveAssignmentAggregateTagType(value: string | number | null | undefined): 'success' | 'warning' | 'info' | 'danger' { const v = String(value ?? '').toLowerCase().trim()