diff --git a/dist.tar.gz b/dist.tar.gz index b7e2404c..bc6bbd92 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index e2ff4f72..ca46f4a7 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -131,8 +131,9 @@ export type PendingOrderAllocateStorageProgressResponse = { message?: string; }; +/** syncOrderIds:订单 ID 列表(必填,支持多种别名) */ export type PendingOrderSyncOrderIdsParams = { - /** 订单 ID 列表;支持数组、逗号字符串或单个 ID(兼容多种别名,至少传一项) */ + /** 订单 ID 列表,支持数组、逗号分隔字符串或单个 ID */ order_ids?: Array | string | number; orderIds?: Array | string | number; ids?: Array | string | number; @@ -141,7 +142,7 @@ export type PendingOrderSyncOrderIdsParams = { id?: number | string; }; -/** syncOrderIds 响应(SN 管理订单 is_sn_mgmt=Y 会被拦截并标记失败,需改用单订单回传) */ +/** syncOrderIds 响应:SN 管理订单(is_sn_mgmt=Y)会被拦截并标记失败,需改用单订单回传 */ export type PendingOrderSyncOrderIdsResponse = { flag: string; code: number; diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index a799a262..9142d614 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -2,73 +2,9 @@ import request from '@/utils/request' const v = '1.0' -/** order.wave.batchList 的 where 白名单(禁止 warehouse_id / warehouseId) */ -export type WaveBatchListWhere = { - wave_id?: number | string - wave_no?: string - wave_type?: number - wave_status?: number - creator?: string - logistics_name?: string - item_part_type?: number - item_part?: string - item_snapshot_key?: string - item_detail_machine?: string - distinguish_express?: number - total_orders_min?: number - total_orders_max?: number - processed_orders_min?: number - processed_orders_max?: number - /** 英文枚举:unassigned | partially_assigned | assigned */ - express_assignment_status?: 'unassigned' | 'partially_assigned' | 'assigned' - /** 英文枚举:unprinted | partially_printed | printed */ - print_assignment_status?: 'unprinted' | 'partially_printed' | 'printed' - /** 中文:未分配 | 部分分配 | 已分配 */ - storage_assignment_status?: string - /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ - source?: number - /** 英文枚举:unsynced | partially_synced | synced */ - sync_assignment_status?: 'unsynced' | 'partially_synced' | 'synced' - /** 英文枚举:unreviewed | partially_reviewed | reviewed */ - review_assignment_status?: 'unreviewed' | 'partially_reviewed' | 'reviewed' -} +import type { WaveBatchListParams, WaveBatchListResponse, WaveBatchListWhere, WaveListPagination } from '@/api/order/order' -export type WaveBatchListParams = { - pagination?: { - page?: number - pageSize?: number - } - /** 是否仅返回仍有未复核订单的波次,默认 0;传 1/true 时仅返回 unreviewed_order_count > 0 的波次 */ - only_todo?: number | boolean | string - /** 白名单见 WaveBatchListWhere;与列表页动态 where 构建兼容 */ - where?: WaveBatchListWhere | Record -} - -export type WaveListPagination = { - page?: number - pageSize?: number - total?: number - totalPages?: number - hasPrevious?: boolean - hasNext?: boolean -} - -export type WaveBatchListItem = Record & { - order_count?: number - storage_assignment_status?: string - express_assignment_status?: string - print_assignment_status?: string - /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ - source?: number - sync_assignment_status?: string - review_assignment_status?: string - unreviewed_order_count?: number -} - -export type WaveBatchListResponse = { - list: WaveBatchListItem[] - pagination: WaveListPagination -} +export type { WaveBatchListParams, WaveBatchListResponse, WaveBatchListWhere, WaveListPagination } export type WavePickTaskListParams = { warehouse_id: number @@ -159,9 +95,11 @@ export type WaveStrategyListParams = { strategy_type?: number /** 当前仅支持 where.strategy_type(1/2) */ where?: { strategy_type?: number } & Record - /** 0-不计算(默认),1-计算并返回每条策略的 next_fetch_order_count */ + /** 0-不计算(默认),1-计算并返回每条策略的 next_fetch_order_count;支持别名 calculateNextFetchOrderCount */ calculate_next_fetch_order_count?: number calculateNextFetchOrderCount?: number + /** 0-不启用(默认),1-启用调试输出,返回每条策略的 next_fetch_order_list */ + debug?: number } export type WaveStrategyRecord = Record & { @@ -193,6 +131,8 @@ export type WaveStrategyRecord = Record & { update_time?: string | number /** 当请求 calculate_next_fetch_order_count=1 时由后端计算返回 */ next_fetch_order_count?: number + /** 当请求 debug=1 时返回结构/快递/货主 ID 等指标明细 */ + next_fetch_order_list?: Array> } export type WaveStrategyListResponse = { @@ -636,22 +576,6 @@ export type WaveBatchRemoveOrdersResponse = { emptied_wave_ids: Array } -export function orderWaveBatchList( - data: WaveBatchListParams = {} -): Promise }> { - return request({ - url: '/system', - method: 'post', - params: { - method: 'order.wave.batchList', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} - export function orderWaveWavePickTaskList( data: WavePickTaskListParams ): Promise }> { @@ -1112,7 +1036,6 @@ export function orderWaveBatchRemoveOrders( } export const orderWave = { - batchList: orderWaveBatchList, wavePickTaskList: orderWaveWavePickTaskList, wavePickTaskCancel: orderWaveWavePickTaskCancel, wavePickTaskCancelSelf: orderWaveWavePickTaskCancelSelf, diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 2347343f..15b5af62 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -1,9 +1,76 @@ import request from '@/utils/request' -import type { WaveBatchListParams, WaveBatchListResponse } from '@/api/order.wave/orderwave' const v = '1.0' -/** 文档模块 `order` 中的 `order.wave.batchList`(与 `order.wave/orderwave.ts` 行为一致) */ +/** order.wave.batchList 的 where 白名单(禁止 warehouse_id / warehouseId) */ +export type WaveBatchListWhere = { + wave_id?: number | string + wave_no?: string + wave_type?: number + wave_status?: number + creator?: string + logistics_name?: string + item_part_type?: number + item_part?: string + item_snapshot_key?: string + item_detail_machine?: string + distinguish_express?: number + total_orders_min?: number + total_orders_max?: number + processed_orders_min?: number + processed_orders_max?: number + /** 英文枚举:unassigned | partially_assigned | assigned */ + express_assignment_status?: 'unassigned' | 'partially_assigned' | 'assigned' + /** 英文枚举:unprinted | partially_printed | printed */ + print_assignment_status?: 'unprinted' | 'partially_printed' | 'printed' + /** 中文:未分配 | 部分分配 | 已分配 */ + storage_assignment_status?: string + /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ + source?: number + /** 英文枚举:unsynced | partially_synced | synced */ + sync_assignment_status?: 'unsynced' | 'partially_synced' | 'synced' + /** 英文枚举:unreviewed | partially_reviewed | reviewed */ + review_assignment_status?: 'unreviewed' | 'partially_reviewed' | 'reviewed' +} + +export type WaveBatchListParams = { + pagination?: { + page?: number + pageSize?: number + } + /** 是否仅返回仍有未复核订单的波次,默认 0;传 1/true 时仅返回 unreviewed_order_count > 0 的波次 */ + only_todo?: number | boolean | string + /** 白名单见 WaveBatchListWhere;与列表页动态 where 构建兼容 */ + where?: WaveBatchListWhere | Record +} + +export type WaveListPagination = { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean +} + +export type WaveBatchListItem = Record & { + order_count?: number + storage_assignment_status?: string + express_assignment_status?: string + print_assignment_status?: string + /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ + source?: number + sync_assignment_status?: string + review_assignment_status?: string + unreviewed_order_count?: number +} + +export type WaveBatchListResponse = { + list: WaveBatchListItem[] + pagination: WaveListPagination +} + +/** 文档模块 `order` 中的 `order.wave.batchList` */ export function orderModuleWaveBatchList( data: WaveBatchListParams = {} ): Promise }> { @@ -19,3 +86,10 @@ export function orderModuleWaveBatchList( isSystemApi: true } as any) } + +/** 与 orderModuleWaveBatchList 同义,便于业务侧按 method 语义引用 */ +export const orderWaveBatchList = orderModuleWaveBatchList + +export const orderModule = { + waveBatchList: orderModuleWaveBatchList +} diff --git a/src/api/setting.expressInterface/expressInterface.ts b/src/api/setting.expressinterface/expressInterface.ts similarity index 100% rename from src/api/setting.expressInterface/expressInterface.ts rename to src/api/setting.expressinterface/expressInterface.ts diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue index 46e39614..9a84ee66 100644 --- a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -11,6 +11,13 @@ {{ orderCount }} 条 +