5月8日
This commit is contained in:
parent
097846f385
commit
abd7ab7013
@ -10,6 +10,20 @@ export type WaveBatchListParams = {
|
||||
where?: Record<string, any>
|
||||
}
|
||||
|
||||
export type WaveListPagination = {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
total?: number
|
||||
totalPages?: number
|
||||
hasPrevious?: boolean
|
||||
hasNext?: boolean
|
||||
}
|
||||
|
||||
export type WaveBatchListResponse = {
|
||||
list: Array<Record<string, unknown>>
|
||||
pagination: WaveListPagination
|
||||
}
|
||||
|
||||
export type WaveGroupOrderFetchListParams = {
|
||||
pagination?: {
|
||||
page?: number
|
||||
@ -23,6 +37,11 @@ export type WaveGroupOrderFetchListParams = {
|
||||
return_order_ids?: boolean
|
||||
}
|
||||
|
||||
export type WaveGroupOrderFetchListResponse = {
|
||||
list: Array<Record<string, unknown>>
|
||||
pagination: WaveListPagination
|
||||
}
|
||||
|
||||
export type WaveStrategyListParams = {
|
||||
pagination?: {
|
||||
page?: number
|
||||
@ -33,6 +52,47 @@ export type WaveStrategyListParams = {
|
||||
}
|
||||
}
|
||||
|
||||
export type WaveStrategyRecord = Record<string, unknown> & {
|
||||
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> | string
|
||||
allowed_platforms?: Array<string> | string
|
||||
allowed_owners?: Array<number | string> | string
|
||||
allowed_expresses?: Array<string> | 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<string>
|
||||
allowed_platforms?: Array<string>
|
||||
allowed_owners?: Array<number | string>
|
||||
allowed_expresses?: Array<string>
|
||||
allowed_provinces?: Array<string> | string
|
||||
allowed_platforms?: Array<string> | string
|
||||
allowed_owners?: Array<number | string> | string
|
||||
allowed_expresses?: Array<string> | 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<string>
|
||||
allowed_platforms?: Array<string>
|
||||
allowed_owners?: Array<number | string>
|
||||
allowed_expresses?: Array<string>
|
||||
allowed_provinces?: Array<string> | string
|
||||
allowed_platforms?: Array<string> | string
|
||||
allowed_owners?: Array<number | string> | string
|
||||
allowed_expresses?: Array<string> | 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<string, any>
|
||||
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> | string | number
|
||||
ids?: Array<string | number> | string | number
|
||||
wave_ids?: Array<string | number> | string | number
|
||||
waveIds?: Array<string | number> | 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<string, unknown>
|
||||
// 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> | string | number
|
||||
}
|
||||
|
||||
export type WaveBatchAutoGroupingResponse = {
|
||||
ids?: Array<number | string>
|
||||
affected_wave_ids?: Array<number | string>
|
||||
updated_wave_count?: number
|
||||
skipped_wave_ids?: Array<number | string>
|
||||
skipped_wave_count?: number
|
||||
skipped_details?: Array<{ wave_id?: number | string; reason?: string }>
|
||||
}
|
||||
|
||||
export type WaveBatchFinishAutoGroupingParams = {
|
||||
ids: Array<string | number> | string | number
|
||||
}
|
||||
|
||||
export type WaveBatchFinishAutoGroupingResponse = {
|
||||
ids?: Array<number | string>
|
||||
affected_wave_ids?: Array<number | string>
|
||||
updated_wave_ids?: Array<number | string>
|
||||
updated_wave_count?: number
|
||||
}
|
||||
|
||||
export type WaveBatchRemoveOrdersParams = {
|
||||
ids: Array<string | number> | string | number
|
||||
}
|
||||
|
||||
export function orderWaveBatchList(data: WaveBatchListParams = {}): Promise<any> {
|
||||
export type WaveBatchRemoveOrdersResponse = {
|
||||
ids: Array<number | string>
|
||||
removed_order_ids: Array<number | string>
|
||||
removed_order_count: number
|
||||
affected_wave_ids: Array<number | string>
|
||||
updated_wave_ids: Array<number | string>
|
||||
emptied_wave_ids: Array<number | string>
|
||||
}
|
||||
|
||||
export function orderWaveBatchList(
|
||||
data: WaveBatchListParams = {}
|
||||
): Promise<WaveBatchListResponse & { code?: number; message?: string; data?: Partial<WaveBatchListResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -337,7 +487,9 @@ export function orderWaveBatchList(data: WaveBatchListParams = {}): Promise<any>
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams = {}): Promise<any> {
|
||||
export function orderWaveGroupOrderFetchList(
|
||||
data: WaveGroupOrderFetchListParams = {}
|
||||
): Promise<WaveGroupOrderFetchListResponse & { code?: number; message?: string; data?: Partial<WaveGroupOrderFetchListResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -351,7 +503,9 @@ export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveWaveStrategyList(data: WaveStrategyListParams = {}): Promise<any> {
|
||||
export function orderWaveWaveStrategyList(
|
||||
data: WaveStrategyListParams = {}
|
||||
): Promise<WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -365,7 +519,9 @@ export function orderWaveWaveStrategyList(data: WaveStrategyListParams = {}): Pr
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveWaveStrategyCreate(data: WaveStrategyCreateParams): Promise<any> {
|
||||
export function orderWaveWaveStrategyCreate(
|
||||
data: WaveStrategyCreateParams
|
||||
): Promise<WaveStrategyMutationResponse & { code?: number; message?: string; data?: WaveStrategyRecord }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -379,7 +535,9 @@ export function orderWaveWaveStrategyCreate(data: WaveStrategyCreateParams): Pro
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveWaveStrategyUpdate(data: WaveStrategyUpdateParams): Promise<any> {
|
||||
export function orderWaveWaveStrategyUpdate(
|
||||
data: WaveStrategyUpdateParams
|
||||
): Promise<WaveStrategyMutationResponse & { code?: number; message?: string; data?: WaveStrategyRecord }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -409,6 +567,38 @@ export function orderWaveWaveStrategyQuickScan(
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveWaveStrategyFetchAdmin(
|
||||
data: WaveStrategyFetchAdminParams
|
||||
): Promise<WaveStrategyFetchByStrategyResponse & { code?: number; message?: string }> {
|
||||
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<WaveStrategyFetchByStrategyResponse & { code?: number; message?: string }> {
|
||||
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<WaveStrategyQuickScanTaskProgressResponse & { code?: number; message?: string }> {
|
||||
@ -600,7 +790,9 @@ export function orderWaveBatchRemoveExceptionOrdersTaskProgress(data: WaveBatchR
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchCancel(data: WaveBatchCancelParams): Promise<any> {
|
||||
export function orderWaveBatchCancel(
|
||||
data: WaveBatchCancelParams
|
||||
): Promise<WaveBatchCancelResponse & { code?: number; message?: string; data?: Record<string, unknown>; 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<any> {
|
||||
export function orderWaveBatchAutoGrouping(
|
||||
data: WaveBatchAutoGroupingParams
|
||||
): Promise<WaveBatchAutoGroupingResponse & { code?: number; message?: string; data?: Record<string, unknown> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -642,7 +836,9 @@ export function orderWaveBatchAutoGrouping(data: WaveBatchAutoGroupingParams): P
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchFinishAutoGrouping(data: WaveBatchFinishAutoGroupingParams): Promise<any> {
|
||||
export function orderWaveBatchFinishAutoGrouping(
|
||||
data: WaveBatchFinishAutoGroupingParams
|
||||
): Promise<WaveBatchFinishAutoGroupingResponse & { code?: number; message?: string; data?: Record<string, unknown> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -656,7 +852,9 @@ export function orderWaveBatchFinishAutoGrouping(data: WaveBatchFinishAutoGroupi
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveBatchRemoveOrders(data: WaveBatchRemoveOrdersParams): Promise<any> {
|
||||
export function orderWaveBatchRemoveOrders(
|
||||
data: WaveBatchRemoveOrdersParams
|
||||
): Promise<WaveBatchRemoveOrdersResponse & { code?: number; message?: string; data?: Partial<WaveBatchRemoveOrdersResponse>; 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,
|
||||
|
||||
@ -463,26 +463,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="waveStrategyQuickScanResult.taskId" class="task-progress-panel task-progress-panel--toolbar">
|
||||
<div class="task-progress-panel__header">
|
||||
<span class="task-progress-panel__title">波次策略快速扫描任务已提交</span>
|
||||
<span class="task-progress-panel__meta">任务ID:{{ waveStrategyQuickScanResult.taskId }}</span>
|
||||
</div>
|
||||
<el-progress :percentage="waveStrategyQuickScanPercent" :status="waveStrategyQuickScanProgressBarStatus" :stroke-width="16" />
|
||||
<div class="task-progress-panel__info">
|
||||
<span>提交状态:{{ waveStrategyQuickScanResult.status || '—' }}</span>
|
||||
<span>任务状态:{{ waveStrategyQuickScanResult.state || '—' }}</span>
|
||||
<span>仓库ID:{{ waveStrategyQuickScanResult.warehouseId || '—' }}</span>
|
||||
<span>处理进度:{{ waveStrategyQuickScanResult.processedOrderCount }} / {{ waveStrategyQuickScanResult.totalOrderCount }}</span>
|
||||
<span>匹配订单:{{ waveStrategyQuickScanResult.matchedOrderCount }}</span>
|
||||
<span>未匹配订单:{{ waveStrategyQuickScanResult.unmatchedOrderCount }}</span>
|
||||
<span>受理时间:{{ formatDateTime(waveStrategyQuickScanResult.acceptedAt) }}</span>
|
||||
</div>
|
||||
<div v-if="waveStrategyQuickScanResult.message" class="task-progress-panel__message">
|
||||
{{ waveStrategyQuickScanResult.message }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
ref="singleOrderTableRef"
|
||||
:data="fallbackOrderList"
|
||||
@ -494,7 +474,7 @@
|
||||
@selection-change="handleFallbackOrderSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="48" reserve-selection />
|
||||
<el-table-column prop="id" label="订单ID" min-width="100" />
|
||||
<!-- <el-table-column prop="id" label="订单ID" min-width="100" /> -->
|
||||
<el-table-column label="订单号" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
{{ row.delivery_no || row.delivery_order_code || row.order_sn || '—' }}
|
||||
@ -632,8 +612,18 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="description" label="说明" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="88" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="150" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
type="warning"
|
||||
link
|
||||
size="small"
|
||||
:loading="waveStrategyFetchSubmittingId === Number(row?.id || 0)"
|
||||
:disabled="!Number(row?.id || 0)"
|
||||
@click="submitWaveStrategyFetchAdmin(row)"
|
||||
>
|
||||
后台抓取
|
||||
</el-button>
|
||||
<el-button type="primary" link size="small" @click="openEditWaveStrategyDialog(row)">
|
||||
编辑
|
||||
</el-button>
|
||||
@ -671,11 +661,17 @@
|
||||
:model-value="Boolean(fetchTaskProgress.taskId)"
|
||||
:progress="fetchTaskProgress"
|
||||
/>
|
||||
<wave-strategy-quick-scan-progress-dialog
|
||||
v-model="waveStrategyQuickScanDialogVisible"
|
||||
:progress="waveStrategyQuickScanResult"
|
||||
@update:model-value="handleWaveStrategyQuickScanDialogVisibleChange"
|
||||
/>
|
||||
|
||||
<el-dialog
|
||||
v-model="waveStrategyFormDialogVisible"
|
||||
:title="waveStrategyFormMode === 'create' ? '新建波次策略' : '编辑波次策略'"
|
||||
width="720px"
|
||||
align-center
|
||||
destroy-on-close
|
||||
append-to-body
|
||||
>
|
||||
@ -697,8 +693,12 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="waveStrategyFormModel.status" clearable placeholder="请选择状态">
|
||||
<el-option label="禁用" :value="0" />
|
||||
<el-option label="启用" :value="1" />
|
||||
<el-option
|
||||
v-for="option in waveStrategyStatusOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@ -731,30 +731,98 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="要求同快递" prop="require_same_express">
|
||||
<el-select v-model="waveStrategyFormModel.require_same_express" clearable placeholder="请选择">
|
||||
<el-option label="是" :value="true" />
|
||||
<el-option label="否" :value="false" />
|
||||
<el-option
|
||||
v-for="option in waveBooleanOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许跨货主" prop="allow_cross_owner">
|
||||
<el-select v-model="waveStrategyFormModel.allow_cross_owner" clearable placeholder="请选择">
|
||||
<el-option label="是" :value="true" />
|
||||
<el-option label="否" :value="false" />
|
||||
<el-option
|
||||
v-for="option in waveBooleanOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="说明" prop="description" class="wave-strategy-form-item--full">
|
||||
<el-input v-model="waveStrategyFormModel.description" type="textarea" :rows="2" clearable placeholder="策略说明(可选)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="允许货主" class="wave-strategy-form-item--full">
|
||||
<el-input v-model="waveStrategyFormModel.allowed_owners_text" clearable placeholder="多个值用英文逗号分隔,例如 1001,1002" />
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_owners"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许货主"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyOwnerOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许快递编码" class="wave-strategy-form-item--full">
|
||||
<el-input v-model="waveStrategyFormModel.allowed_expresses_text" clearable placeholder="多个值用英文逗号分隔,例如 SF,YTO,ZTO" />
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_expresses"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许快递编码"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyExpressOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许省份" class="wave-strategy-form-item--full">
|
||||
<el-input v-model="waveStrategyFormModel.allowed_provinces_text" clearable placeholder="多个值用英文逗号分隔,例如 浙江,江苏" />
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_provinces"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许省份"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyProvinceOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许平台" class="wave-strategy-form-item--full">
|
||||
<el-input v-model="waveStrategyFormModel.allowed_platforms_text" clearable placeholder="多个值用英文逗号分隔,例如 taobao,jd" />
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_platforms"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许平台"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyPlatformOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@ -778,6 +846,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { KeepAlive, computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
@ -786,9 +855,13 @@ import {
|
||||
waveScanBoxConfig,
|
||||
waveUpperTableDefaults,
|
||||
waveAvailableFields,
|
||||
fallbackOrderAvailableFields,
|
||||
waveBatchColumns,
|
||||
waveWhereAllowedFields,
|
||||
getWaveToolbarButtons,
|
||||
waveStrategyFormRules,
|
||||
waveStrategyStatusOptions,
|
||||
waveBooleanOptions,
|
||||
waveFetchTaskStatusTextMap,
|
||||
waveStatusTextMap,
|
||||
waveTypeTextMap,
|
||||
@ -799,6 +872,7 @@ import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import PendingOrderListPanel from './component/PendingOrderListPanel.vue'
|
||||
import WaveBatchDetailPanel from './component/WaveBatchDetailPanel.vue'
|
||||
import WaveFetchTaskProgressDialog from './component/WaveFetchTaskProgressDialog.vue'
|
||||
import WaveStrategyQuickScanProgressDialog from './component/WaveStrategyQuickScanProgressDialog.vue'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import { settingWarehouseGetSettings as getWarehouseSettings } from '@/api/setting.warehouse/settingwarehouse'
|
||||
import {
|
||||
@ -817,6 +891,7 @@ import {
|
||||
orderWaveGroupFetch,
|
||||
orderWaveSingleFetchByIds,
|
||||
orderWaveWaveStrategyCreate,
|
||||
orderWaveWaveStrategyFetchAdmin,
|
||||
orderWaveWaveStrategyFallbackOrderList,
|
||||
orderWaveWaveStrategyQuickScan,
|
||||
orderWaveWaveStrategyQuickScanTaskProgress,
|
||||
@ -826,27 +901,40 @@ import {
|
||||
orderWaveGroupOrderFetchList
|
||||
} from '@/api/order.wave/orderwave'
|
||||
import type {
|
||||
WaveBatchAutoGroupingResponse,
|
||||
WaveBatchAllocateExpressTaskProgressResponse,
|
||||
WaveBatchAllocateExpressResponse,
|
||||
WaveBatchAllocateStorageTaskProgressResponse,
|
||||
WaveBatchAllocateStorageResponse,
|
||||
WaveBatchCancelResponse,
|
||||
WaveBatchCancelTaskProgressResponse,
|
||||
WaveBatchFinishAutoGroupingResponse,
|
||||
WaveBatchListResponse,
|
||||
WaveBatchRemoveExceptionOrdersResponse,
|
||||
WaveBatchRemoveExceptionOrdersTaskProgressResponse,
|
||||
WaveGroupOrderFetchListResponse,
|
||||
WaveFetchParams,
|
||||
WaveFetchResponse,
|
||||
WaveFetchTaskProgressResponse,
|
||||
WaveStrategyCreateParams,
|
||||
WaveStrategyFetchByStrategyResponse,
|
||||
WaveStrategyFallbackOrderListResponse,
|
||||
WaveStrategyFallbackOrderListRow,
|
||||
WaveStrategyListResponse,
|
||||
WaveStrategyMutationResponse,
|
||||
WaveStrategyUpdateParams,
|
||||
WaveStrategyQuickScanResponse,
|
||||
WaveStrategyQuickScanTaskProgressResponse
|
||||
} from '@/api/order.wave/orderwave'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
import { getWavePrintData } from '@/api/order.print/orderprint'
|
||||
import type { WavePrintDataPayload } from '@/api/order.print/orderprint'
|
||||
import WaveBatchPrintPreviewDialog from './component/WaveBatchPrintPreviewDialog.vue'
|
||||
const props = defineProps<{
|
||||
/** 1 团购波次,2 散单波次 */
|
||||
waveType: 1 | 2
|
||||
}>()
|
||||
import pcasCodeData from 'china-division/dist/pcas-code.json'
|
||||
const WAVE_TYPE = 1 as const
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
|
||||
const scanBox = ref<any>(null)
|
||||
const upperTable = ref<any>(null)
|
||||
@ -887,6 +975,7 @@ const batchAllocateStorageTaskPollTimer = ref<ReturnType<typeof setTimeout> | nu
|
||||
const batchRemoveExceptionOrdersTaskPollTimer = ref<ReturnType<typeof setTimeout> | null>(null)
|
||||
const batchCancelTaskPollTimer = ref<ReturnType<typeof setTimeout> | null>(null)
|
||||
const waveStrategyQuickScanTaskPollTimer = ref<ReturnType<typeof setTimeout> | null>(null)
|
||||
const waveStrategyQuickScanDialogVisible = ref(false)
|
||||
const pendingOrderDialogVisible = ref(false)
|
||||
const pendingOrderDialogWaveNo = ref('')
|
||||
const fetchTaskProgress = reactive({
|
||||
@ -963,6 +1052,7 @@ const fallbackOrderSelectionRows = ref<any[]>([])
|
||||
const fallbackOrderPagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
|
||||
const waveStrategyListLoading = ref(false)
|
||||
const waveStrategyQuickScanSubmitting = ref(false)
|
||||
const waveStrategyFetchSubmittingId = ref<number | null>(null)
|
||||
const waveStrategyList = ref<any[]>([])
|
||||
const waveStrategyFormDialogVisible = ref(false)
|
||||
const waveStrategyFormSubmitting = ref(false)
|
||||
@ -986,16 +1076,11 @@ const waveStrategyFormModel = reactive({
|
||||
require_same_express: undefined as boolean | undefined,
|
||||
allow_cross_owner: undefined as boolean | undefined,
|
||||
description: '',
|
||||
allowed_owners_text: '',
|
||||
allowed_expresses_text: '',
|
||||
allowed_provinces_text: '',
|
||||
allowed_platforms_text: ''
|
||||
allowed_owners: [] as string[],
|
||||
allowed_expresses: [] as string[],
|
||||
allowed_provinces: [] as string[],
|
||||
allowed_platforms: [] as string[]
|
||||
})
|
||||
const waveStrategyFormRules = {
|
||||
strategy_name: [{ required: true, message: '请输入策略名称', trigger: 'blur' }],
|
||||
strategy_type: [{ required: true, message: '请输入策略类型', trigger: 'change' }],
|
||||
batch_mode: [{ required: true, message: '请输入批次模式', trigger: 'change' }]
|
||||
}
|
||||
const waveStrategyQuickScanResult = reactive({
|
||||
status: '',
|
||||
taskId: '',
|
||||
@ -1017,25 +1102,16 @@ const waveStrategyPagination = reactive({ currentPage: 1, pageSize: 20, total: 0
|
||||
const fallbackOrderOwnerOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const fallbackOrderLogisticsOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const fallbackOrderPlatformOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const waveStrategyOwnerOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const waveStrategyExpressOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const waveStrategyProvinceOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const waveStrategyPlatformOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
const presetTree = ref<any[]>([])
|
||||
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(waveAvailableFields)))
|
||||
const fallbackOrderAvailableFieldsRef = reactive([
|
||||
{ label: '订单ID', value: 'id', type: 'number' },
|
||||
{ label: '订单号', value: 'delivery_no', type: 'text' },
|
||||
{ label: '物流单号', value: 'tracking_no', type: 'text' },
|
||||
{ label: '商品种数最小值', value: 'items_count_min', type: 'number' },
|
||||
{ label: '商品种数最大值', value: 'items_count_max', type: 'number' },
|
||||
{ label: '商品总数最小值', value: 'items_total_min', type: 'number' },
|
||||
{ label: '商品总数最大值', value: 'items_total_max', type: 'number' },
|
||||
{ label: '物流公司', value: 'sys_logistics_name', type: 'select', options: fallbackOrderLogisticsOptions.value },
|
||||
{ label: '店铺名称', value: 'store_name', type: 'text' },
|
||||
{ label: '货主', value: 'owner_name', type: 'select', options: fallbackOrderOwnerOptions.value },
|
||||
{ label: '省份', value: 'province', type: 'text' },
|
||||
{ label: '来源平台', value: 'sys_platform_name', type: 'select', options: fallbackOrderPlatformOptions.value }
|
||||
])
|
||||
const fallbackOrderAvailableFieldsRef = reactive(JSON.parse(JSON.stringify(fallbackOrderAvailableFields)))
|
||||
const columns = ref(JSON.parse(JSON.stringify(waveBatchColumns)))
|
||||
|
||||
const toolbarButtons = computed(() => getWaveToolbarButtons(props.waveType))
|
||||
const toolbarButtons = computed(() => getWaveToolbarButtons(WAVE_TYPE))
|
||||
|
||||
const detailVisible = ref(true)
|
||||
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
||||
@ -1161,9 +1237,9 @@ const groupOrderFilters = reactive({
|
||||
returnOrderIds: false
|
||||
})
|
||||
const groupOrderQuantityMap = reactive<Record<string, number | undefined>>({})
|
||||
const isGroupWaveTab = computed(() => props.waveType === 1)
|
||||
const currentWaveType = computed(() => props.waveType)
|
||||
const tableListId = computed(() => `wave-management-list-${props.waveType}`)
|
||||
const isGroupWaveTab = computed(() => WAVE_TYPE === 1)
|
||||
const currentWaveType = computed(() => WAVE_TYPE)
|
||||
const tableListId = computed(() => `wave-management-list-${WAVE_TYPE}`)
|
||||
|
||||
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
|
||||
const printableSelectionRows = computed(() => selectionRows.value.filter((row: any) => !isAutoGroupingWave(row)))
|
||||
@ -1214,17 +1290,6 @@ const batchCancelTaskProgressBarStatus = computed(() => {
|
||||
if (batchCancelTaskProgress.status === 'success' || batchCancelTaskPercent.value >= 100) return 'success'
|
||||
return undefined
|
||||
})
|
||||
const waveStrategyQuickScanPercent = computed(() => {
|
||||
const value = Number(waveStrategyQuickScanResult.progressPercent || 0)
|
||||
if (!Number.isFinite(value)) return 0
|
||||
return Math.min(100, Math.max(0, value))
|
||||
})
|
||||
const waveStrategyQuickScanProgressBarStatus = computed(() => {
|
||||
const status = normalizeAsyncTaskStatus(waveStrategyQuickScanResult.state)
|
||||
if (isAsyncTaskFailureStatus(status)) return 'exception'
|
||||
if (isAsyncTaskSuccessStatus(status) || waveStrategyQuickScanPercent.value >= 100) return 'success'
|
||||
return undefined
|
||||
})
|
||||
const pendingOrderDialogTitle = computed(() => pendingOrderDialogWaveNo.value ? `待处理订单 - ${pendingOrderDialogWaveNo.value}` : '待处理订单')
|
||||
|
||||
watch(
|
||||
@ -1276,13 +1341,13 @@ async function loadData() {
|
||||
if (where.wave_type === undefined || where.wave_type === null || where.wave_type === '') {
|
||||
where.wave_type = currentWaveType.value
|
||||
}
|
||||
const res: any = await orderWaveBatchList({
|
||||
const res = await orderWaveBatchList({
|
||||
pagination: {
|
||||
page: pagination.currentPage,
|
||||
pageSize: pagination.pageSize
|
||||
},
|
||||
where
|
||||
})
|
||||
}) as WaveBatchListResponse & { code?: number; message?: string; data?: Partial<WaveBatchListResponse> }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '获取波次列表失败')
|
||||
}
|
||||
@ -1540,7 +1605,7 @@ async function handleBatchAutoGrouping() {
|
||||
|
||||
batchAutoGroupingLoading.value = true
|
||||
try {
|
||||
const res: any = await orderWaveBatchAutoGrouping({ ids })
|
||||
const res = await orderWaveBatchAutoGrouping({ ids }) as WaveBatchAutoGroupingResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '批量修改自动加团状态失败')
|
||||
}
|
||||
@ -1580,7 +1645,7 @@ async function handleBatchFinishAutoGrouping() {
|
||||
|
||||
batchFinishAutoGroupingLoading.value = true
|
||||
try {
|
||||
const res: any = await orderWaveBatchFinishAutoGrouping({ ids })
|
||||
const res = await orderWaveBatchFinishAutoGrouping({ ids }) as WaveBatchFinishAutoGroupingResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '批量结束自动加团失败')
|
||||
}
|
||||
@ -1824,7 +1889,7 @@ function applyBatchAllocateExpressTaskProgress(progress: Partial<WaveBatchAlloca
|
||||
batchAllocateExpressTaskProgress.progressPercent = Number(progress.progress_percent ?? batchAllocateExpressTaskProgress.progressPercent ?? 0)
|
||||
batchAllocateExpressTaskProgress.durationMs = Number(progress.duration_ms ?? batchAllocateExpressTaskProgress.durationMs ?? 0)
|
||||
batchAllocateExpressTaskProgress.updateTime = String(progress.update_time || '')
|
||||
batchAllocateExpressTaskProgress.error = String(progress.error || '')
|
||||
batchAllocateExpressTaskProgress.error = String(progress.error_message || progress.error || '')
|
||||
batchAllocateExpressTaskProgress.message = String(progress.message || '')
|
||||
}
|
||||
|
||||
@ -1883,7 +1948,7 @@ function applyBatchAllocateStorageTaskProgress(progress: Partial<WaveBatchAlloca
|
||||
batchAllocateStorageTaskProgress.progressPercent = Number(progress.progress_percent ?? batchAllocateStorageTaskProgress.progressPercent ?? 0)
|
||||
batchAllocateStorageTaskProgress.durationMs = Number(progress.duration_ms ?? batchAllocateStorageTaskProgress.durationMs ?? 0)
|
||||
batchAllocateStorageTaskProgress.updateTime = String(progress.update_time || '')
|
||||
batchAllocateStorageTaskProgress.error = String(progress.error || '')
|
||||
batchAllocateStorageTaskProgress.error = String(progress.error_message || progress.error || '')
|
||||
batchAllocateStorageTaskProgress.message = String(progress.message || '')
|
||||
}
|
||||
|
||||
@ -1940,7 +2005,7 @@ function applyBatchRemoveExceptionOrdersTaskProgress(progress: Partial<WaveBatch
|
||||
batchRemoveExceptionOrdersTaskProgress.progressPercent = Number(progress.progress_percent ?? batchRemoveExceptionOrdersTaskProgress.progressPercent ?? 0)
|
||||
batchRemoveExceptionOrdersTaskProgress.durationMs = Number(progress.duration_ms ?? batchRemoveExceptionOrdersTaskProgress.durationMs ?? 0)
|
||||
batchRemoveExceptionOrdersTaskProgress.updateTime = String(progress.update_time || '')
|
||||
batchRemoveExceptionOrdersTaskProgress.error = String(progress.error || '')
|
||||
batchRemoveExceptionOrdersTaskProgress.error = String(progress.error_message || progress.error || '')
|
||||
batchRemoveExceptionOrdersTaskProgress.message = String(progress.message || '')
|
||||
}
|
||||
|
||||
@ -1995,7 +2060,7 @@ function applyBatchCancelTaskProgress(progress: Partial<WaveBatchCancelTaskProgr
|
||||
batchCancelTaskProgress.progressPercent = Number(progress.progress_percent ?? batchCancelTaskProgress.progressPercent ?? 0)
|
||||
batchCancelTaskProgress.durationMs = Number(progress.duration_ms ?? batchCancelTaskProgress.durationMs ?? 0)
|
||||
batchCancelTaskProgress.updateTime = String(progress.update_time || '')
|
||||
batchCancelTaskProgress.error = String(progress.error || '')
|
||||
batchCancelTaskProgress.error = String(progress.error_message || progress.error || '')
|
||||
batchCancelTaskProgress.message = String(progress.message || '')
|
||||
}
|
||||
|
||||
@ -2164,7 +2229,7 @@ async function handleBatchAllocateExpress() {
|
||||
|
||||
batchAllocateExpressLoading.value = true
|
||||
try {
|
||||
const res = await orderWaveBatchAllocateExpress({ wave_ids }) as { code?: number; message?: string; task_id?: string; status?: string }
|
||||
const res = await orderWaveBatchAllocateExpress({ wave_ids }) as WaveBatchAllocateExpressResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '提交批次分配快递号任务失败')
|
||||
}
|
||||
@ -2223,7 +2288,7 @@ async function handleBatchAllocateStorage() {
|
||||
|
||||
batchAllocateStorageLoading.value = true
|
||||
try {
|
||||
const res = await orderWaveBatchAllocateStorage({ wave_ids }) as { code?: number; message?: string; task_id?: string; status?: string }
|
||||
const res = await orderWaveBatchAllocateStorage({ wave_ids }) as WaveBatchAllocateStorageResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '提交批量分配储位任务失败')
|
||||
}
|
||||
@ -2282,7 +2347,7 @@ async function handleBatchRemoveExceptionOrders() {
|
||||
|
||||
batchRemoveExceptionOrdersLoading.value = true
|
||||
try {
|
||||
const res = await orderWaveBatchRemoveExceptionOrders({ wave_ids }) as { code?: number; message?: string; task_id?: string; status?: string }
|
||||
const res = await orderWaveBatchRemoveExceptionOrders({ wave_ids }) as WaveBatchRemoveExceptionOrdersResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '提交批量移除异常订单任务失败')
|
||||
}
|
||||
@ -2342,7 +2407,7 @@ async function handleBatchCancel() {
|
||||
|
||||
batchCancelLoading.value = true
|
||||
try {
|
||||
const res: any = await orderWaveBatchCancel({ ids })
|
||||
const res = await orderWaveBatchCancel({ ids }) as WaveBatchCancelResponse & { code?: number; message?: string; flag?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '批量取消波次失败')
|
||||
}
|
||||
@ -2417,6 +2482,68 @@ function mapNameOptions(rawList: any[], nameKeys: string[]) {
|
||||
return result
|
||||
}
|
||||
|
||||
function mapCodeNameOptions(rawList: any[], codeKeys: string[], nameKeys: string[]) {
|
||||
const result: Array<{ label: string; value: string }> = []
|
||||
const seen = new Set<string>()
|
||||
for (const item of rawList || []) {
|
||||
const code = normalizeCode(codeKeys.map((key) => item?.[key]).find((v) => v !== undefined && v !== null && v !== ''))
|
||||
if (!code || seen.has(code)) continue
|
||||
const name = normalizeCode(nameKeys.map((key) => item?.[key]).find((v) => v !== undefined && v !== null && v !== ''))
|
||||
result.push({
|
||||
value: code,
|
||||
label: name && name !== code ? `${code} (${name})` : code
|
||||
})
|
||||
seen.add(code)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
function toStringList(value: unknown): string[] {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map((item) => String(item).trim()).filter(Boolean)
|
||||
}
|
||||
if (typeof value === 'string') {
|
||||
return value.split(',').map((item) => item.trim()).filter(Boolean)
|
||||
}
|
||||
return []
|
||||
}
|
||||
|
||||
function patchSelectOptionsByValues(
|
||||
optionsRef: { value: Array<{ label: string; value: string }> },
|
||||
values: string[]
|
||||
) {
|
||||
const existing = new Set(optionsRef.value.map((item) => item.value))
|
||||
const missing = values.filter((item) => item && !existing.has(item))
|
||||
if (!missing.length) return
|
||||
optionsRef.value = optionsRef.value.concat(missing.map((value) => ({ label: value, value })))
|
||||
}
|
||||
|
||||
type RegionNode = { code: string; name: string; children?: RegionNode[] }
|
||||
const chinaRegionTree = (Array.isArray(pcasCodeData) ? pcasCodeData : []) as RegionNode[]
|
||||
const allProvinceOptionsFromDict = chinaRegionTree.map((item) => ({
|
||||
label: String(item?.name || '').trim(),
|
||||
value: String(item?.name || '').trim()
|
||||
})).filter((item) => item.value)
|
||||
|
||||
function refreshWaveStrategyProvinceOptions() {
|
||||
const provinceSet = new Set<string>(allProvinceOptionsFromDict.map((item) => item.value))
|
||||
waveStrategyFormModel.allowed_provinces.forEach((item) => {
|
||||
const value = normalizeCode(item)
|
||||
if (value) provinceSet.add(value)
|
||||
})
|
||||
waveStrategyList.value.forEach((row: any) => {
|
||||
toStringList(row?.allowed_provinces).forEach((item) => {
|
||||
const value = normalizeCode(item)
|
||||
if (value) provinceSet.add(value)
|
||||
})
|
||||
})
|
||||
fallbackOrderList.value.forEach((row: any) => {
|
||||
const value = normalizeCode(row?.province)
|
||||
if (value) provinceSet.add(value)
|
||||
})
|
||||
waveStrategyProvinceOptions.value = Array.from(provinceSet).map((value) => ({ label: value, value }))
|
||||
}
|
||||
|
||||
function unwrapIndexListResponse(res: any): any[] {
|
||||
const payload = res?.data !== undefined ? res.data : res
|
||||
if (Array.isArray(payload)) return payload
|
||||
@ -2459,29 +2586,58 @@ async function loadFallbackOrderFilterOptions() {
|
||||
const platformRaw = unwrapIndexListResponse(platformRes)
|
||||
|
||||
const ownerNameSet = new Set<string>()
|
||||
const waveStrategyOwnerCodeSet = new Set<string>()
|
||||
stores.forEach((item: any) => {
|
||||
const ownerName = String(item?.label || item?.name || '').trim()
|
||||
if (!ownerName) return
|
||||
ownerNameSet.add(ownerName)
|
||||
const ownerCode = normalizeCode(item?.value ?? item?.id ?? item?.owner_code ?? item?.code)
|
||||
if (ownerCode) waveStrategyOwnerCodeSet.add(ownerCode)
|
||||
})
|
||||
fallbackOrderOwnerOptions.value = Array.from(ownerNameSet).map((name) => ({
|
||||
label: name,
|
||||
value: name
|
||||
}))
|
||||
waveStrategyOwnerOptions.value = Array.from(waveStrategyOwnerCodeSet).map((code) => {
|
||||
const owner = stores.find((item: any) => normalizeCode(item?.value ?? item?.id ?? item?.owner_code ?? item?.code) === code)
|
||||
const ownerName = normalizeCode(owner?.label || owner?.name)
|
||||
return {
|
||||
value: code,
|
||||
label: ownerName && ownerName !== code ? `${code} (${ownerName})` : code
|
||||
}
|
||||
})
|
||||
fallbackOrderLogisticsOptions.value = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name', 'label'])
|
||||
fallbackOrderPlatformOptions.value = mapNameOptions(platformRaw, ['name', 'platform_name', 'sys_platform_name', 'label'])
|
||||
waveStrategyExpressOptions.value = mapCodeNameOptions(
|
||||
expressRaw,
|
||||
['code', 'express_code', 'logistics_code', 'value'],
|
||||
['name', 'logistics_name', 'express_name', 'label']
|
||||
)
|
||||
waveStrategyPlatformOptions.value = mapCodeNameOptions(
|
||||
platformRaw,
|
||||
['code', 'platform_code', 'value', 'platform'],
|
||||
['name', 'platform_name', 'sys_platform_name', 'label']
|
||||
)
|
||||
|
||||
patchFallbackFieldOptions('owner_name', fallbackOrderOwnerOptions.value)
|
||||
patchFallbackFieldOptions('sys_logistics_name', fallbackOrderLogisticsOptions.value)
|
||||
patchFallbackFieldOptions('sys_platform_name', fallbackOrderPlatformOptions.value)
|
||||
patchSelectOptionsByValues(waveStrategyOwnerOptions, waveStrategyFormModel.allowed_owners)
|
||||
patchSelectOptionsByValues(waveStrategyExpressOptions, waveStrategyFormModel.allowed_expresses)
|
||||
patchSelectOptionsByValues(waveStrategyPlatformOptions, waveStrategyFormModel.allowed_platforms)
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
} catch (error) {
|
||||
console.error('load fallback order filter options failed:', error)
|
||||
fallbackOrderOwnerOptions.value = []
|
||||
fallbackOrderLogisticsOptions.value = []
|
||||
fallbackOrderPlatformOptions.value = []
|
||||
waveStrategyOwnerOptions.value = []
|
||||
waveStrategyExpressOptions.value = []
|
||||
waveStrategyPlatformOptions.value = []
|
||||
patchFallbackFieldOptions('owner_name', [])
|
||||
patchFallbackFieldOptions('sys_logistics_name', [])
|
||||
patchFallbackFieldOptions('sys_platform_name', [])
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
}
|
||||
}
|
||||
|
||||
@ -2584,12 +2740,12 @@ function buildFallbackOrderListPayload() {
|
||||
async function fetchWaveStrategyList() {
|
||||
waveStrategyListLoading.value = true
|
||||
try {
|
||||
const res: any = await orderWaveWaveStrategyList({
|
||||
const res = await orderWaveWaveStrategyList({
|
||||
pagination: {
|
||||
page: waveStrategyPagination.currentPage,
|
||||
pageSize: waveStrategyPagination.pageSize
|
||||
}
|
||||
})
|
||||
}) as WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '获取波次策略列表失败')
|
||||
}
|
||||
@ -2603,16 +2759,44 @@ async function fetchWaveStrategyList() {
|
||||
waveStrategyPagination.currentPage = responsePagination.page || waveStrategyPagination.currentPage
|
||||
waveStrategyPagination.pageSize = responsePagination.pageSize || waveStrategyPagination.pageSize
|
||||
waveStrategyPagination.total = responsePagination.total || 0
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
} catch (error: any) {
|
||||
console.error('fetch wave strategy list failed:', error)
|
||||
waveStrategyList.value = []
|
||||
waveStrategyPagination.total = 0
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
ElMessage.error(error?.message || '获取波次策略列表失败')
|
||||
} finally {
|
||||
waveStrategyListLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function submitWaveStrategyFetchAdmin(row: Record<string, any>) {
|
||||
const strategyId = Number(row?.id || 0)
|
||||
if (!strategyId) {
|
||||
ElMessage.warning('无法识别策略ID,请刷新后重试')
|
||||
return
|
||||
}
|
||||
|
||||
waveStrategyFetchSubmittingId.value = strategyId
|
||||
try {
|
||||
const res = await orderWaveWaveStrategyFetchAdmin({
|
||||
strategy_id: strategyId
|
||||
}) as WaveStrategyFetchByStrategyResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '提交后台抓取任务失败')
|
||||
}
|
||||
const taskId = String(res?.task_id || '')
|
||||
const message = res?.message || '后台抓取任务已受理'
|
||||
ElMessage.success(taskId ? `${message}(任务ID:${taskId})` : message)
|
||||
} catch (error: any) {
|
||||
console.error('submit wave strategy fetch admin failed:', error)
|
||||
ElMessage.error(error?.message || '提交后台抓取任务失败')
|
||||
} finally {
|
||||
waveStrategyFetchSubmittingId.value = null
|
||||
}
|
||||
}
|
||||
|
||||
function handleWaveStrategyPageChange(page: number) {
|
||||
waveStrategyPagination.currentPage = page
|
||||
void fetchWaveStrategyList()
|
||||
@ -2642,26 +2826,14 @@ function resetWaveStrategyForm() {
|
||||
waveStrategyFormModel.require_same_express = undefined
|
||||
waveStrategyFormModel.allow_cross_owner = undefined
|
||||
waveStrategyFormModel.description = ''
|
||||
waveStrategyFormModel.allowed_owners_text = ''
|
||||
waveStrategyFormModel.allowed_expresses_text = ''
|
||||
waveStrategyFormModel.allowed_provinces_text = ''
|
||||
waveStrategyFormModel.allowed_platforms_text = ''
|
||||
waveStrategyFormModel.allowed_owners = []
|
||||
waveStrategyFormModel.allowed_expresses = []
|
||||
waveStrategyFormModel.allowed_provinces = []
|
||||
waveStrategyFormModel.allowed_platforms = []
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
waveStrategyFormRef.value?.clearValidate?.()
|
||||
}
|
||||
|
||||
function splitCsvText(text: string): string[] {
|
||||
if (!text) return []
|
||||
return text
|
||||
.split(',')
|
||||
.map((item) => item.trim())
|
||||
.filter(Boolean)
|
||||
}
|
||||
|
||||
function mapListToCsv(value: unknown): string {
|
||||
if (!Array.isArray(value)) return ''
|
||||
return value.map((item) => String(item)).join(',')
|
||||
}
|
||||
|
||||
function buildWaveStrategyPayload() {
|
||||
const payload: Partial<WaveStrategyCreateParams & WaveStrategyUpdateParams> = {
|
||||
strategy_name: waveStrategyFormModel.strategy_name.trim(),
|
||||
@ -2681,10 +2853,10 @@ function buildWaveStrategyPayload() {
|
||||
allow_cross_owner: waveStrategyFormModel.allow_cross_owner,
|
||||
description: waveStrategyFormModel.description.trim() || undefined
|
||||
}
|
||||
const allowedOwners = splitCsvText(waveStrategyFormModel.allowed_owners_text)
|
||||
const allowedExpresses = splitCsvText(waveStrategyFormModel.allowed_expresses_text)
|
||||
const allowedProvinces = splitCsvText(waveStrategyFormModel.allowed_provinces_text)
|
||||
const allowedPlatforms = splitCsvText(waveStrategyFormModel.allowed_platforms_text)
|
||||
const allowedOwners = waveStrategyFormModel.allowed_owners
|
||||
const allowedExpresses = waveStrategyFormModel.allowed_expresses
|
||||
const allowedProvinces = waveStrategyFormModel.allowed_provinces
|
||||
const allowedPlatforms = waveStrategyFormModel.allowed_platforms
|
||||
if (allowedOwners.length) payload.allowed_owners = allowedOwners
|
||||
if (allowedExpresses.length) payload.allowed_expresses = allowedExpresses
|
||||
if (allowedProvinces.length) payload.allowed_provinces = allowedProvinces
|
||||
@ -2702,6 +2874,7 @@ function buildWaveStrategyPayload() {
|
||||
function openCreateWaveStrategyDialog() {
|
||||
waveStrategyFormMode.value = 'create'
|
||||
resetWaveStrategyForm()
|
||||
void loadFallbackOrderFilterOptions()
|
||||
waveStrategyFormDialogVisible.value = true
|
||||
}
|
||||
|
||||
@ -2733,10 +2906,15 @@ function openEditWaveStrategyDialog(row: Record<string, any>) {
|
||||
waveStrategyFormModel.allow_cross_owner = false
|
||||
}
|
||||
waveStrategyFormModel.description = String(row?.description || '')
|
||||
waveStrategyFormModel.allowed_owners_text = mapListToCsv(row?.allowed_owners)
|
||||
waveStrategyFormModel.allowed_expresses_text = mapListToCsv(row?.allowed_expresses)
|
||||
waveStrategyFormModel.allowed_provinces_text = mapListToCsv(row?.allowed_provinces)
|
||||
waveStrategyFormModel.allowed_platforms_text = mapListToCsv(row?.allowed_platforms)
|
||||
waveStrategyFormModel.allowed_owners = toStringList(row?.allowed_owners)
|
||||
waveStrategyFormModel.allowed_expresses = toStringList(row?.allowed_expresses)
|
||||
waveStrategyFormModel.allowed_provinces = toStringList(row?.allowed_provinces)
|
||||
waveStrategyFormModel.allowed_platforms = toStringList(row?.allowed_platforms)
|
||||
patchSelectOptionsByValues(waveStrategyOwnerOptions, waveStrategyFormModel.allowed_owners)
|
||||
patchSelectOptionsByValues(waveStrategyExpressOptions, waveStrategyFormModel.allowed_expresses)
|
||||
patchSelectOptionsByValues(waveStrategyPlatformOptions, waveStrategyFormModel.allowed_platforms)
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
void loadFallbackOrderFilterOptions()
|
||||
waveStrategyFormDialogVisible.value = true
|
||||
}
|
||||
|
||||
@ -2752,7 +2930,9 @@ async function submitWaveStrategyForm() {
|
||||
try {
|
||||
const payload = buildWaveStrategyPayload()
|
||||
if (waveStrategyFormMode.value === 'create') {
|
||||
const res: any = await orderWaveWaveStrategyCreate(payload as WaveStrategyCreateParams)
|
||||
const res = await orderWaveWaveStrategyCreate(
|
||||
payload as WaveStrategyCreateParams
|
||||
) as WaveStrategyMutationResponse & { code?: number; message?: string; data?: Record<string, unknown> }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '新建波次策略失败')
|
||||
}
|
||||
@ -2761,10 +2941,10 @@ async function submitWaveStrategyForm() {
|
||||
if (!waveStrategyEditingId.value) {
|
||||
throw new Error('缺少策略ID,无法更新')
|
||||
}
|
||||
const res: any = await orderWaveWaveStrategyUpdate({
|
||||
const res = await orderWaveWaveStrategyUpdate({
|
||||
id: waveStrategyEditingId.value,
|
||||
...(payload as WaveStrategyUpdateParams)
|
||||
})
|
||||
}) as WaveStrategyMutationResponse & { code?: number; message?: string; data?: Record<string, unknown> }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '更新波次策略失败')
|
||||
}
|
||||
@ -2798,6 +2978,13 @@ function resetWaveStrategyQuickScanResult() {
|
||||
waveStrategyQuickScanResult.errorMessage = ''
|
||||
}
|
||||
|
||||
function handleWaveStrategyQuickScanDialogVisibleChange(visible: boolean) {
|
||||
waveStrategyQuickScanDialogVisible.value = visible
|
||||
if (!visible) {
|
||||
resetWaveStrategyQuickScanResult()
|
||||
}
|
||||
}
|
||||
|
||||
function stopWaveStrategyQuickScanTaskPolling() {
|
||||
if (waveStrategyQuickScanTaskPollTimer.value) {
|
||||
clearTimeout(waveStrategyQuickScanTaskPollTimer.value)
|
||||
@ -2864,8 +3051,9 @@ async function pollWaveStrategyQuickScanTaskProgress() {
|
||||
async function submitWaveStrategyQuickScan() {
|
||||
stopWaveStrategyQuickScanTaskPolling()
|
||||
waveStrategyQuickScanSubmitting.value = true
|
||||
waveStrategyQuickScanDialogVisible.value = true
|
||||
try {
|
||||
const res = await orderWaveWaveStrategyQuickScan()
|
||||
const res = await orderWaveWaveStrategyQuickScan() as WaveStrategyQuickScanResponse & { code?: number; message?: string }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '提交波次策略快速扫描任务失败')
|
||||
}
|
||||
@ -2886,6 +3074,7 @@ async function submitWaveStrategyQuickScan() {
|
||||
} catch (error: any) {
|
||||
console.error('submit wave strategy quick scan failed:', error)
|
||||
resetWaveStrategyQuickScanResult()
|
||||
waveStrategyQuickScanDialogVisible.value = false
|
||||
ElMessage.error(error?.message || '提交波次策略快速扫描任务失败')
|
||||
} finally {
|
||||
waveStrategyQuickScanSubmitting.value = false
|
||||
@ -2910,10 +3099,12 @@ async function fetchFallbackOrderList() {
|
||||
fallbackOrderPagination.currentPage = responsePagination.page || fallbackOrderPagination.currentPage
|
||||
fallbackOrderPagination.pageSize = responsePagination.pageSize || fallbackOrderPagination.pageSize
|
||||
fallbackOrderPagination.total = responsePagination.total || 0
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
} catch (error: any) {
|
||||
console.error('fetch fallback order list failed:', error)
|
||||
fallbackOrderList.value = []
|
||||
fallbackOrderPagination.total = 0
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
ElMessage.error(error?.message || '获取不符合波次策略订单失败')
|
||||
} finally {
|
||||
fallbackOrderListLoading.value = false
|
||||
@ -2931,7 +3122,8 @@ function getFallbackOrderItemSnapshotText(row: WaveStrategyFallbackOrderListRow)
|
||||
async function fetchGroupOrderList() {
|
||||
groupOrderListLoading.value = true
|
||||
try {
|
||||
const res: any = await orderWaveGroupOrderFetchList(buildGroupOrderListPayload())
|
||||
const res = await orderWaveGroupOrderFetchList(buildGroupOrderListPayload()) as
|
||||
WaveGroupOrderFetchListResponse & { code?: number; message?: string; data?: Partial<WaveGroupOrderFetchListResponse> }
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '获取可抓取团购单列表失败')
|
||||
}
|
||||
3588
src/views/order/waveOrder/SandanWaveBatchListPanel.vue
Normal file
3588
src/views/order/waveOrder/SandanWaveBatchListPanel.vue
Normal file
File diff suppressed because it is too large
Load Diff
@ -456,8 +456,9 @@ async function handleRemoveOrdersFromWave() {
|
||||
return
|
||||
}
|
||||
|
||||
const updatedCount = Number(res?.data?.updated_count ?? ids.length) || ids.length
|
||||
ElMessage.success(`${res?.message || '移出波次成功'} ${updatedCount} 条`)
|
||||
const payload = res?.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
|
||||
const removedCount = Number(payload?.removed_order_count ?? ids.length) || ids.length
|
||||
ElMessage.success(`${res?.message || '移出波次成功'} ${removedCount} 条`)
|
||||
upperTable.value?.clearSelection?.()
|
||||
selectionRows.value = []
|
||||
hasSelection.value = false
|
||||
|
||||
@ -0,0 +1,154 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="modelValue"
|
||||
title="波次策略快速扫描"
|
||||
width="min(560px, 92vw)"
|
||||
append-to-body
|
||||
align-center
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
>
|
||||
<div v-if="progress.taskId" class="task-progress-panel">
|
||||
<div class="task-progress-panel__header">
|
||||
<span class="task-progress-panel__title">扫描任务进度</span>
|
||||
<span class="task-progress-panel__meta">任务ID:{{ progress.taskId }}</span>
|
||||
</div>
|
||||
<el-progress :percentage="progressPercent" :status="progressBarStatus" :stroke-width="16" />
|
||||
<div class="task-progress-panel__info">
|
||||
<span>提交状态:{{ progress.status || '—' }}</span>
|
||||
<span>任务状态:{{ progress.state || '—' }}</span>
|
||||
<span>仓库ID:{{ progress.warehouseId || '—' }}</span>
|
||||
<span>处理进度:{{ progress.processedOrderCount }} / {{ progress.totalOrderCount }}</span>
|
||||
<span>匹配订单:{{ progress.matchedOrderCount }}</span>
|
||||
<span>未匹配订单:{{ progress.unmatchedOrderCount }}</span>
|
||||
<span>受理时间:{{ formatDateTime(progress.acceptedAt) }}</span>
|
||||
</div>
|
||||
<div v-if="progress.message" class="task-progress-panel__message">
|
||||
{{ progress.message }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button :disabled="!canClose" @click="handleClose">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
|
||||
export interface WaveStrategyQuickScanProgressViewModel {
|
||||
status: string
|
||||
taskId: string
|
||||
warehouseId?: number
|
||||
state: string
|
||||
message: string
|
||||
acceptedAt: string
|
||||
totalOrderCount: number
|
||||
processedOrderCount: number
|
||||
matchedOrderCount: number
|
||||
unmatchedOrderCount: number
|
||||
progressPercent: number
|
||||
}
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: boolean
|
||||
progress: WaveStrategyQuickScanProgressViewModel
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', value: boolean): void
|
||||
}>()
|
||||
|
||||
function normalizeStatus(value: unknown) {
|
||||
return String(value ?? '').trim().toLowerCase()
|
||||
}
|
||||
|
||||
const progressPercent = computed(() => {
|
||||
const value = Number(props.progress.progressPercent || 0)
|
||||
if (!Number.isFinite(value)) return 0
|
||||
return Math.min(100, Math.max(0, value))
|
||||
})
|
||||
|
||||
const progressBarStatus = computed(() => {
|
||||
const status = normalizeStatus(props.progress.state)
|
||||
if (['failed', 'failure', 'error', 'exception', 'not_found'].includes(status)) return 'exception'
|
||||
if (['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete'].includes(status) || progressPercent.value >= 100) return 'success'
|
||||
return undefined
|
||||
})
|
||||
|
||||
const canClose = computed(() => {
|
||||
const status = normalizeStatus(props.progress.state)
|
||||
return ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete', 'failed', 'failure', 'error', 'exception', 'not_found'].includes(status)
|
||||
})
|
||||
|
||||
function handleClose() {
|
||||
if (!canClose.value) return
|
||||
emit('update:modelValue', false)
|
||||
}
|
||||
|
||||
function formatDateTime(value: string | number | null | undefined) {
|
||||
if (!value) return '—'
|
||||
let normalizedValue: string | number = value
|
||||
if (typeof value === 'string' && /^\d+$/.test(value.trim())) {
|
||||
const numericValue = Number(value.trim())
|
||||
normalizedValue = value.trim().length <= 10 ? numericValue * 1000 : numericValue
|
||||
} else if (typeof value === 'number' && Number.isFinite(value) && value > 0 && value < 1000000000000) {
|
||||
normalizedValue = value * 1000
|
||||
}
|
||||
|
||||
const date = new Date(normalizedValue)
|
||||
if (Number.isNaN(date.getTime())) return String(value)
|
||||
const y = date.getFullYear()
|
||||
const m = String(date.getMonth() + 1).padStart(2, '0')
|
||||
const d = String(date.getDate()).padStart(2, '0')
|
||||
const hh = String(date.getHours()).padStart(2, '0')
|
||||
const mm = String(date.getMinutes()).padStart(2, '0')
|
||||
const ss = String(date.getSeconds()).padStart(2, '0')
|
||||
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.task-progress-panel {
|
||||
border: 1px solid #e4e7ed;
|
||||
border-radius: 6px;
|
||||
padding: 10px 12px;
|
||||
background: #fafcff;
|
||||
}
|
||||
|
||||
.task-progress-panel__header {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: baseline;
|
||||
gap: 8px 16px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.task-progress-panel__title {
|
||||
font-weight: 600;
|
||||
font-size: 13px;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.task-progress-panel__meta {
|
||||
font-size: 12px;
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.task-progress-panel__info {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px 16px;
|
||||
margin-top: 8px;
|
||||
font-size: 12px;
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.task-progress-panel__message {
|
||||
margin-top: 8px;
|
||||
font-size: 12px;
|
||||
color: #409eff;
|
||||
}
|
||||
</style>
|
||||
@ -83,6 +83,23 @@ export const waveAvailableFields = [
|
||||
{ label: '最大已处理订单', value: 'processed_orders_max', type: 'number' }
|
||||
]
|
||||
|
||||
/** 抓取散单候选:左侧筛选可用字段 */
|
||||
export const fallbackOrderAvailableFields = [
|
||||
// { label: '订单ID', value: 'id', type: 'number' },
|
||||
{ label: '订单号', value: 'delivery_no', type: 'text' },
|
||||
{ label: '物流单号', value: 'tracking_no', type: 'text' },
|
||||
{ label: '商品种数最小值', value: 'items_count_min', type: 'number' },
|
||||
{ label: '商品种数最大值', value: 'items_count_max', type: 'number' },
|
||||
{ label: '商品总数最小值', value: 'items_total_min', type: 'number' },
|
||||
{ label: '商品总数最大值', value: 'items_total_max', type: 'number' },
|
||||
{ label: '物流公司', value: 'sys_logistics_name', type: 'select', options: [] },
|
||||
{ label: '店铺名称', value: 'store_name', type: 'text' },
|
||||
{ label: '平台', value: 'sys_platform_name', type: 'select', options: [] }
|
||||
// { label: '货主', value: 'owner_name', type: 'select', options: [] },
|
||||
// { label: '省份', value: 'province', type: 'text' },
|
||||
// { label: '来源平台', value: 'sys_platform_name', type: 'select', options: [] }
|
||||
]
|
||||
|
||||
/** 主表列配置 */
|
||||
export const waveBatchColumns = [
|
||||
// { prop: 'wave_id', label: '波次ID', minWidth: 160, fixed: 'left' },
|
||||
@ -133,7 +150,7 @@ export const waveWhereAllowedFieldList = [
|
||||
export const waveWhereAllowedFields = new Set<string>(waveWhereAllowedFieldList)
|
||||
|
||||
/**
|
||||
* 主工具栏按钮(action 与 WaveBatchListPanel 内 toolbarActionMap 键一致)
|
||||
* 主工具栏按钮(action 与波次列表页内 toolbarActionMap 键一致)
|
||||
*/
|
||||
export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
|
||||
{ key: 'refresh', label: '刷新', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' },
|
||||
@ -327,3 +344,22 @@ export const waveStorageAssignmentErrorPhraseMap: Array<[RegExp, string]> = [
|
||||
[/not found/gi, '未找到'],
|
||||
[/none|success|succeeded|finished|completed|done|fin/gi, '无']
|
||||
]
|
||||
|
||||
/** 波次策略表单校验规则 */
|
||||
export const waveStrategyFormRules = {
|
||||
strategy_name: [{ required: true, message: '请输入策略名称', trigger: 'blur' }],
|
||||
strategy_type: [{ required: true, message: '请输入策略类型', trigger: 'change' }],
|
||||
batch_mode: [{ required: true, message: '请输入批次模式', trigger: 'change' }]
|
||||
}
|
||||
|
||||
/** 波次策略状态选项 */
|
||||
export const waveStrategyStatusOptions = [
|
||||
{ label: '禁用', value: 0 },
|
||||
{ label: '启用', value: 1 }
|
||||
]
|
||||
|
||||
/** 通用布尔选项 */
|
||||
export const waveBooleanOptions = [
|
||||
{ label: '是', value: true },
|
||||
{ label: '否', value: false }
|
||||
]
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
<template>
|
||||
<wave-batch-list-panel :wave-type="1" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import WaveBatchListPanel from './WaveBatchListPanel.vue'
|
||||
</script>
|
||||
@ -28,8 +28,8 @@
|
||||
import { ref, watch, computed, markRaw } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import GroupWave from './groupWave.vue'
|
||||
import SandanWave from './sandanWave.vue'
|
||||
import GroupWaveBatchListPanel from './GroupWaveBatchListPanel.vue'
|
||||
import SandanWaveBatchListPanel from './SandanWaveBatchListPanel.vue'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
|
||||
const route = useRoute()
|
||||
@ -48,15 +48,15 @@ type WaveTabItem = {
|
||||
}
|
||||
|
||||
const tabs = ref<WaveTabItem[]>([
|
||||
{ name: 'groupWave', label: '团购波次', component: markRaw(GroupWave) },
|
||||
{ name: 'sandanWave', label: '散单波次', component: markRaw(SandanWave) }
|
||||
{ name: 'groupWave', label: '团购波次', component: markRaw(GroupWaveBatchListPanel) },
|
||||
{ name: 'sandanWave', label: '散单波次', component: markRaw(SandanWaveBatchListPanel) }
|
||||
])
|
||||
|
||||
/**
|
||||
* 同步地址栏 tab 与当前页签。
|
||||
* 注意:布局层 AppMain 使用 route.fullPath 作为 router-view 的 key,
|
||||
* 若在「无 tab 参数」的首屏强制 router.replace 补上 ?tab=,会改变 fullPath 导致整页销毁重建,
|
||||
* WaveBatchListPanel 等子组件会挂载两次并重复请求。缺省团购页签时只更新本地 activeTab,不写回路由。
|
||||
* 波次页签子组件会挂载两次并重复请求。缺省团购页签时只更新本地 activeTab,不写回路由。
|
||||
*/
|
||||
watch(
|
||||
() => route.query.tab,
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
<template>
|
||||
<wave-batch-list-panel :wave-type="2" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import WaveBatchListPanel from './WaveBatchListPanel.vue'
|
||||
</script>
|
||||
@ -1,11 +1,11 @@
|
||||
# 接口
|
||||
|
||||
- 更新时间: 2026-05-07 17:25:00
|
||||
- 更新时间: 2026-05-08 09:22:13
|
||||
- 扫描目录: `src\api`
|
||||
- 模块数: 34
|
||||
- API 文件数: 34
|
||||
- 接口数: 275
|
||||
- 已启用: 244
|
||||
- 接口数: 277
|
||||
- 已启用: 246
|
||||
- 占位接口: 2
|
||||
|
||||
## 模块统计
|
||||
@ -25,7 +25,7 @@
|
||||
| order.pendingorder | 1 | 16 | 16 | 0 |
|
||||
| order.print | 1 | 1 | 1 | 0 |
|
||||
| order.revieworder | 1 | 3 | 3 | 0 |
|
||||
| order.wave | 1 | 24 | 23 | 0 |
|
||||
| order.wave | 1 | 26 | 25 | 0 |
|
||||
| pick | 1 | 1 | 1 | 0 |
|
||||
| print | 1 | 13 | 12 | 1 |
|
||||
| printer.station | 1 | 11 | 1 | 0 |
|
||||
@ -136,6 +136,8 @@
|
||||
| order.wave | orderWaveSingleOrderFetchList | order.wave.singleOrderFetchList | POST | 否 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyCreate | order.wave.waveStrategyCreate | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyFallbackOrderList | order.wave.waveStrategyFallbackOrderList | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyFetchAdmin | order.wave.waveStrategyFetchAdmin | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyFetchPda | order.wave.waveStrategyFetchPda | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyList | order.wave.waveStrategyList | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyQuickScan | order.wave.waveStrategyQuickScan | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
| order.wave | orderWaveWaveStrategyQuickScanTaskProgress | order.wave.waveStrategyQuickScanTaskProgress | POST | 是 | 否 | order.wave/orderwave.ts | |
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
@ -12,13 +12,13 @@
|
||||
"label": "全部"
|
||||
}
|
||||
},
|
||||
"totalInterfaceCount": 241,
|
||||
"totalInterfaceCount": 243,
|
||||
"changes": {
|
||||
"summary": {
|
||||
"moduleAdded": 0,
|
||||
"moduleDeleted": 0,
|
||||
"moduleUpdated": 1,
|
||||
"interfaceAdded": 2,
|
||||
"moduleUpdated": 0,
|
||||
"interfaceAdded": 0,
|
||||
"interfaceDeleted": 0,
|
||||
"interfaceParamsUpdated": 0,
|
||||
"interfaceResponseUpdated": 0
|
||||
@ -26,40 +26,10 @@
|
||||
"moduleUpdates": {
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"updated": [
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"previousModuleName": "订单波次模块",
|
||||
"previousModuleKey": "order.wave",
|
||||
"interfaceChanges": {
|
||||
"addedMethods": [
|
||||
"order.wave.waveStrategyCreate",
|
||||
"order.wave.waveStrategyUpdate"
|
||||
],
|
||||
"deletedMethods": [],
|
||||
"paramsUpdatedMethods": [],
|
||||
"responseUpdatedMethods": []
|
||||
}
|
||||
}
|
||||
]
|
||||
"updated": []
|
||||
},
|
||||
"interfaceUpdates": {
|
||||
"added": [
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"method": "order.wave.waveStrategyCreate"
|
||||
},
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"method": "order.wave.waveStrategyUpdate"
|
||||
}
|
||||
],
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"paramsUpdated": [],
|
||||
"responseUpdated": []
|
||||
@ -4765,7 +4735,7 @@
|
||||
"name": "ids / order_ids / orderIds",
|
||||
"type": "array|string|number",
|
||||
"required": true,
|
||||
"description": "订单ID列表,支持数组、逗号分隔字符串或单个ID;优先使用 ids 字段"
|
||||
"description": "订单 ID 列表;支持数组、逗号分隔字符串或单个 ID。入参会被去重并转换为正整数。字段解析优先顺序:ids -> order_ids -> orderIds。"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
@ -4791,31 +4761,31 @@
|
||||
"name": "fetched_order_ids",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "实际被抓取并分配到波次的订单ID列表"
|
||||
"description": "实际被抓取并成功分配到波次的订单 ID 列表(为归一化后的 ids 的子集)"
|
||||
},
|
||||
{
|
||||
"name": "fetched_order_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "实际被抓取的订单数量"
|
||||
"description": "实际被抓取的订单数量(等于 fetched_order_ids.length)"
|
||||
},
|
||||
{
|
||||
"name": "excluded_existing_wave_order_ids",
|
||||
"type": "array",
|
||||
"required": false,
|
||||
"description": "原始入参中已在其它波次中的订单ID(被排除)"
|
||||
"description": "原始入参中已在其它波次中的订单 ID(被排除,不会被抓取)"
|
||||
},
|
||||
{
|
||||
"name": "skipped_order_ids",
|
||||
"type": "array",
|
||||
"required": false,
|
||||
"description": "未被抓取的订单ID(包括已存在波次、状态不符或出库中等)"
|
||||
"description": "因订单状态不符、正在出库或其他业务原因被跳过的订单 ID(不会被抓取)"
|
||||
},
|
||||
{
|
||||
"name": "not_found_order_ids",
|
||||
"type": "array",
|
||||
"required": false,
|
||||
"description": "入参中未在数据库中找到的订单ID"
|
||||
"description": "入参中未在数据库中找到的订单 ID"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -4905,8 +4875,8 @@
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyCreate",
|
||||
"title": "创建波次策略。warehouse_id 与 creator_name 强制使用当前登录仓库上下文,不允许外部覆盖;创建成功后会递增仓库的 wave_strategy_version 并失效相关仓库配置缓存,调用方可通过策略版本变更感知策略推进。",
|
||||
"description": "创建波次策略。warehouse_id 与 creator_name 强制使用当前登录仓库上下文,不允许外部覆盖;创建成功后会递增仓库的 wave_strategy_version 并失效相关仓库配置缓存,调用方可通过策略版本变更感知策略推进。",
|
||||
"title": "新增波次策略。warehouse_id 与 creator_name 强制使用当前上下文,不接受外部覆盖。创建成功后会推进仓库的 wave_strategy_version 并失效相关缓存。",
|
||||
"description": "新增波次策略。warehouse_id 与 creator_name 强制使用当前上下文,不接受外部覆盖。创建成功后会推进仓库的 wave_strategy_version 并失效相关缓存。",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
@ -4927,121 +4897,121 @@
|
||||
"name": "strategy_name",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "策略名称,必填"
|
||||
"description": "策略名称(必填)"
|
||||
},
|
||||
{
|
||||
"name": "strategy_type",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "策略类型(正整数)"
|
||||
"description": "策略类型(必填,正整数):1-散单 2-团购"
|
||||
},
|
||||
{
|
||||
"name": "batch_mode",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "批次模式(正整数)"
|
||||
"description": "拣货模式(必填,正整数)"
|
||||
},
|
||||
{
|
||||
"name": "status",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "状态,0=禁用,1=启用"
|
||||
"description": "状态:1-启用 0-停用(可选)"
|
||||
},
|
||||
{
|
||||
"name": "order_min_sku",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最小 SKU 数"
|
||||
"description": "订单最小 SKU 种类数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "order_max_sku",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最大 SKU 数"
|
||||
"description": "订单最大 SKU 种类数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "order_min_qty",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最小件数"
|
||||
"description": "订单最小商品总数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "order_max_qty",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最大件数"
|
||||
"description": "订单最大商品总数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "min_same_structure",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "同结构最小订单数(正整数)"
|
||||
"description": "最小相同结构订单数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "max_same_structure",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "同结构最大订单数(正整数)。若该值 >= 仓库配置 min_group_order_fetch_quantity,则自动下调为 min_group_order_fetch_quantity - 1(最小为 1)。"
|
||||
"description": "最大相同结构订单数(可选,正整数或 null)。注意:若传入值 >= 仓库配置的 min_group_order_fetch_quantity,则会被下调为 min_group_order_fetch_quantity - 1,最小为 1。"
|
||||
},
|
||||
{
|
||||
"name": "batch_max_orders",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "批次最大订单数"
|
||||
"description": "批次最大订单数(可选)"
|
||||
},
|
||||
{
|
||||
"name": "batch_max_skus",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "批次最大 SKU 数"
|
||||
"description": "批次最大 SKU 总数(可选)"
|
||||
},
|
||||
{
|
||||
"name": "group_batch_max_orders",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "团购批次最大订单数"
|
||||
"description": "团购批次最大订单数(可选)"
|
||||
},
|
||||
{
|
||||
"name": "require_same_express",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"description": "是否要求相同快递"
|
||||
"description": "是否要求相同快递(可选,布尔)"
|
||||
},
|
||||
{
|
||||
"name": "allow_cross_owner",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"description": "是否允许跨货主(默认 true)"
|
||||
"description": "是否允许跨货主(可选,布尔)"
|
||||
},
|
||||
{
|
||||
"name": "description",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "策略描述"
|
||||
"description": "策略描述(可选)"
|
||||
},
|
||||
{
|
||||
"name": "allowed_provinces",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的省份列表(可选)"
|
||||
"description": "允许的省份列表(可选,支持数组、JSON 字符串或逗号分隔字符串)"
|
||||
},
|
||||
{
|
||||
"name": "allowed_platforms",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的平台列表(可选)"
|
||||
"description": "允许的平台列表(可选,支持数组、JSON 字符串或逗号分隔字符串)"
|
||||
},
|
||||
{
|
||||
"name": "allowed_owners",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的货主列表;必须在系统可用货主范围内,否则接口直接返回错误"
|
||||
"description": "允许的货主列表(可选,支持数组/JSON/逗号分隔);系统会校验所传货主是否在仓库可用货主范围内,非法值将导致 400 错误。"
|
||||
},
|
||||
{
|
||||
"name": "allowed_expresses",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的快递编码列表;必须在系统可用快递范围内,否则接口直接返回错误"
|
||||
"description": "允许的快递编码列表(可选,支持数组/JSON/逗号分隔);系统会校验所传编码是否在可用快递列表内,非法值将导致 400 错误。"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
@ -5049,13 +5019,13 @@
|
||||
"name": "data",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"description": "新建的波次策略记录,原始 wms_wave_strategy 字段"
|
||||
"description": "创建的策略对象,字段同 order.wave.waveStrategyList.list[*] 所示"
|
||||
},
|
||||
{
|
||||
"name": "code",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "业务状态码,200 表示成功"
|
||||
"description": "HTTP-like 状态码,成功时返回 200"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -5064,8 +5034,8 @@
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyFallbackOrderList",
|
||||
"title": "查询兜底不符合波次策略的订单列表(接口内置基础筛选:当前表、非待审核 step != 0、未分配波次 wave_id = 0、wave_scan_result = 2)。",
|
||||
"description": "查询兜底不符合波次策略的订单列表(接口内置基础筛选:当前表、非待审核 step != 0、未分配波次 wave_id = 0、wave_scan_result = 2)。",
|
||||
"title": "基于波次策略的回退候选订单列表。该接口内置固定筛选条件:step != 0、wave_id = 0、wave_scan_result = 2。用于展示策略未命中但需回退处理的订单候选。",
|
||||
"description": "基于波次策略的回退候选订单列表。该接口内置固定筛选条件:step != 0、wave_id = 0、wave_scan_result = 2。用于展示策略未命中但需回退处理的订单候选。",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
@ -5086,19 +5056,13 @@
|
||||
"name": "pagination",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "分页参数,支持 page / pageSize,兼容 currentPage / page_size / size"
|
||||
"description": "分页参数,支持 page / pageSize"
|
||||
},
|
||||
{
|
||||
"name": "where",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "统一 where 条件对象;禁止传入 warehouse_id / warehouseId。注意:接口在服务端固定叠加基础筛选(step != 0、wave_id = 0、wave_scan_result = 2),where 将在此基础上附加更多过滤条件。"
|
||||
},
|
||||
{
|
||||
"name": "sort",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "排序参数,支持 sortField / sortOrder"
|
||||
"description": "筛选白名单字段(object)。仅支持下列字段,且禁止传入 warehouse_id / warehouseId: - id(等值) - delivery_no / deliveryNo(模糊) - tracking_no / trackingNo(模糊) - items_count_min / items_count_max(范围) - items_total_min / items_total_max(范围) - sys_logistics_name(模糊) - store_name(模糊) - owner_name(等值) - province(模糊) - sys_platform_name(模糊) 说明:若传入未列出的字段或禁止字段(如 warehouse_id)接口会返回 400。"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
@ -5106,13 +5070,7 @@
|
||||
"name": "list",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "订单列表(raw 行数据,字段字典见 docs/order-workbench-list-api.md )。注意:返回的每个订单项中新增字段 `item_snapshot`,用于快速展示商品快照,格式为 商品名称*数量|商品名称*数量。"
|
||||
},
|
||||
{
|
||||
"name": "list[].item_snapshot",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "每个订单项新增 item_snapshot 字段,格式为 商品名称*数量|商品名称*数量(例:苹果*2|香蕉*3)"
|
||||
"description": "回退候选订单简要列表。数组内对象字段说明见 children。"
|
||||
},
|
||||
{
|
||||
"name": "pagination",
|
||||
@ -5122,13 +5080,163 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyFetchAdmin",
|
||||
"title": "按策略提交抓取任务(仅后台管理使用,壳子方法,当前仅受理返回任务信息,后续补真实执行逻辑)",
|
||||
"description": "按策略提交抓取任务(仅后台管理使用,壳子方法,当前仅受理返回任务信息,后续补真实执行逻辑)",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
"status": {
|
||||
"isUsed": false,
|
||||
"isPlaceholder": false
|
||||
},
|
||||
"headers": [
|
||||
{
|
||||
"name": "Authorization",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "Bearer token"
|
||||
}
|
||||
],
|
||||
"params": [
|
||||
{
|
||||
"name": "strategy_id / strategyId",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "策略ID(正整数,支持下划线/驼峰)"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "status",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "提交状态,固定 success"
|
||||
},
|
||||
{
|
||||
"name": "task_id",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务ID"
|
||||
},
|
||||
{
|
||||
"name": "warehouse_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "仓库ID"
|
||||
},
|
||||
{
|
||||
"name": "strategy_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "策略ID"
|
||||
},
|
||||
{
|
||||
"name": "state",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务状态,固定 submitted"
|
||||
},
|
||||
{
|
||||
"name": "message",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "可选提示信息"
|
||||
},
|
||||
{
|
||||
"name": "accepted_at",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "任务受理时间(ISO)"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyFetchPda",
|
||||
"title": "按策略提交抓取任务(仅PDA使用,壳子方法,当前仅受理返回任务信息,后续补真实执行逻辑)",
|
||||
"description": "按策略提交抓取任务(仅PDA使用,壳子方法,当前仅受理返回任务信息,后续补真实执行逻辑)",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
"status": {
|
||||
"isUsed": false,
|
||||
"isPlaceholder": false
|
||||
},
|
||||
"headers": [
|
||||
{
|
||||
"name": "Authorization",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "Bearer token"
|
||||
}
|
||||
],
|
||||
"params": [
|
||||
{
|
||||
"name": "strategy_id / strategyId",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "策略ID(正整数,支持下划线/驼峰)"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "status",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "提交状态,固定 success"
|
||||
},
|
||||
{
|
||||
"name": "task_id",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务ID"
|
||||
},
|
||||
{
|
||||
"name": "warehouse_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "仓库ID"
|
||||
},
|
||||
{
|
||||
"name": "strategy_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "策略ID"
|
||||
},
|
||||
{
|
||||
"name": "state",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务状态,固定 submitted"
|
||||
},
|
||||
{
|
||||
"name": "message",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "可选提示信息"
|
||||
},
|
||||
{
|
||||
"name": "accepted_at",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "任务受理时间(ISO)"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyList",
|
||||
"title": "查询当前仓库的波次策略列表,数据来源 wms_wave_strategy",
|
||||
"description": "查询当前仓库的波次策略列表,数据来源 wms_wave_strategy",
|
||||
"title": "查询当前仓库波次策略列表。仅查询当前登录仓库在 wms_wave_strategy 中的数据,返回标准 list/pagination 结构。",
|
||||
"description": "查询当前仓库波次策略列表。仅查询当前登录仓库在 wms_wave_strategy 中的数据,返回标准 list/pagination 结构。",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
@ -5149,7 +5257,7 @@
|
||||
"name": "pagination",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "分页参数,支持 page / pageSize,兼容 currentPage / page_size / size"
|
||||
"description": "分页参数,支持 page / pageSize"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
@ -5157,7 +5265,7 @@
|
||||
"name": "list",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "当前仓库波次策略原始字段列表(如 id/strategy_name/warehouse_id/strategy_type/status/batch_mode 等)"
|
||||
"description": "策略列表,每项为波次策略记录"
|
||||
},
|
||||
{
|
||||
"name": "pagination",
|
||||
@ -5172,8 +5280,8 @@
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyQuickScan",
|
||||
"title": "提交当前仓库订单快速扫描任务(异步)",
|
||||
"description": "提交当前仓库订单快速扫描任务(异步)",
|
||||
"title": "提交波次策略快速扫描异步任务。无外部参数,使用当前仓库上下文;同一仓库同一时刻仅允许一个任务运行,若已有运行任务直接返回已有 task_id。",
|
||||
"description": "提交波次策略快速扫描异步任务。无外部参数,使用当前仓库上下文;同一仓库同一时刻仅允许一个任务运行,若已有运行任务直接返回已有 task_id。",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
@ -5201,31 +5309,31 @@
|
||||
"name": "task_id",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务 ID(用于查询任务进度)"
|
||||
"description": "任务 ID(用于后续查询进度)"
|
||||
},
|
||||
{
|
||||
"name": "warehouse_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "当前仓库ID"
|
||||
"description": "仓库 ID(来自当前上下文)"
|
||||
},
|
||||
{
|
||||
"name": "state",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务当前状态,通常为 submitted"
|
||||
"description": "任务状态(一般为 submitted 或 running)"
|
||||
},
|
||||
{
|
||||
"name": "message",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "受理提示信息"
|
||||
"description": "可选提示信息"
|
||||
},
|
||||
{
|
||||
"name": "accepted_at",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务受理时间(ISO8601)"
|
||||
"required": false,
|
||||
"description": "任务受理时间(ISO 字符串)"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -5234,8 +5342,8 @@
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyQuickScanTaskProgress",
|
||||
"title": "查询订单快速扫描任务进度",
|
||||
"description": "查询订单快速扫描任务进度",
|
||||
"title": "查询波次策略快速扫描任务进度。接受 task_id / taskId,若未找到返回 state='not_found'。",
|
||||
"description": "查询波次策略快速扫描任务进度。接受 task_id / taskId,若未找到返回 state='not_found'。",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
@ -5256,7 +5364,7 @@
|
||||
"name": "task_id / taskId",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务 ID(后端生成或提交时传入),兼容 taskId 参数名"
|
||||
"description": "任务 ID(下划线或驼峰兼容,必填)"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
@ -5270,37 +5378,37 @@
|
||||
"name": "state",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "任务状态枚举:submitted(已受理)/ running(进行中)/ success(成功)/ failed(失败)/ not_found(未找到)"
|
||||
"description": "任务状态:submitted/running/success/failed/not_found"
|
||||
},
|
||||
{
|
||||
"name": "warehouse_id",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "任务关联仓库 ID(若有)"
|
||||
"description": "仓库 ID"
|
||||
},
|
||||
{
|
||||
"name": "total_order_count",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "参与扫描的订单总数"
|
||||
"description": "扫描订单总数"
|
||||
},
|
||||
{
|
||||
"name": "processed_order_count",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "已处理的订单数量"
|
||||
"description": "已处理订单数"
|
||||
},
|
||||
{
|
||||
"name": "matched_order_count",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "匹配到波次的订单数量"
|
||||
"description": "命中策略的订单数"
|
||||
},
|
||||
{
|
||||
"name": "unmatched_order_count",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "未匹配到波次的订单数量"
|
||||
"description": "未命中策略的订单数"
|
||||
},
|
||||
{
|
||||
"name": "progress_percent",
|
||||
@ -5312,37 +5420,37 @@
|
||||
"name": "submitted_at",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "任务提交时间(ISO8601)"
|
||||
"description": "提交时间(timestamp 或 ISO)"
|
||||
},
|
||||
{
|
||||
"name": "start_time",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "任务开始时间(ISO8601)"
|
||||
"description": "实际开始时间(ISO)"
|
||||
},
|
||||
{
|
||||
"name": "end_time",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "任务结束时间(ISO8601)"
|
||||
"description": "结束时间(ISO)"
|
||||
},
|
||||
{
|
||||
"name": "error_message",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "失败时的错误信息"
|
||||
"description": "错误信息(若失败)"
|
||||
},
|
||||
{
|
||||
"name": "error_code",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "失败时的错误码"
|
||||
"description": "错误码(若失败)"
|
||||
},
|
||||
{
|
||||
"name": "duration_ms",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "任务已运行耗时(毫秒)"
|
||||
"description": "耗时,毫秒"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -5351,8 +5459,8 @@
|
||||
"moduleKey": "order.wave",
|
||||
"moduleFolder": "order.wave",
|
||||
"method": "order.wave.waveStrategyUpdate",
|
||||
"title": "更新波次策略。warehouse_id 与 creator_name 强制使用当前登录仓库上下文,不允许外部覆盖;更新成功后会递增仓库的 wave_strategy_version 并失效相关仓库配置缓存。",
|
||||
"description": "更新波次策略。warehouse_id 与 creator_name 强制使用当前登录仓库上下文,不允许外部覆盖;更新成功后会递增仓库的 wave_strategy_version 并失效相关仓库配置缓存。",
|
||||
"title": "修改波次策略。warehouse_id 与 creator_name 强制使用当前上下文,不接受外部覆盖。id(或 strategy_id/strategyId)为必填主键,其他字段为可选更新;更新成功后会推进仓库的 wave_strategy_version 并失效相关缓存。",
|
||||
"description": "修改波次策略。warehouse_id 与 creator_name 强制使用当前上下文,不接受外部覆盖。id(或 strategy_id/strategyId)为必填主键,其他字段为可选更新;更新成功后会推进仓库的 wave_strategy_version 并失效相关缓存。",
|
||||
"endpoint": "/system",
|
||||
"authRequired": false,
|
||||
"loginRequired": true,
|
||||
@ -5373,141 +5481,141 @@
|
||||
"name": "id / strategy_id / strategyId",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "要更新的策略 ID"
|
||||
"description": "策略主键,兼容 id / strategy_id / strategyId(必填)"
|
||||
},
|
||||
{
|
||||
"name": "strategy_name",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "策略名称"
|
||||
"description": "策略名称(可选)"
|
||||
},
|
||||
{
|
||||
"name": "strategy_type",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "策略类型(正整数)"
|
||||
"description": "策略类型(可选,正整数)"
|
||||
},
|
||||
{
|
||||
"name": "batch_mode",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "批次模式(正整数)"
|
||||
"description": "拣货模式(可选,正整数)"
|
||||
},
|
||||
{
|
||||
"name": "status",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "状态,0=禁用,1=启用"
|
||||
"description": "状态:1-启用 0-停用(可选)"
|
||||
},
|
||||
{
|
||||
"name": "order_min_sku",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最小 SKU 数"
|
||||
"description": "订单最小 SKU 种类数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "order_max_sku",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最大 SKU 数"
|
||||
"description": "订单最大 SKU 种类数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "order_min_qty",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最小件数"
|
||||
"description": "订单最小商品总数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "order_max_qty",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "单订单最大件数"
|
||||
"description": "订单最大商品总数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "min_same_structure",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "同结构最小订单数(正整数)"
|
||||
"description": "最小相同结构订单数(可选,正整数或 null)"
|
||||
},
|
||||
{
|
||||
"name": "max_same_structure",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "同结构最大订单数(正整数)。若该值 >= 仓库配置 min_group_order_fetch_quantity,则自动下调为 min_group_order_fetch_quantity - 1(最小为 1)。"
|
||||
"description": "最大相同结构订单数(可选,正整数或 null)。会受仓库 min_group_order_fetch_quantity 约束,接口会自动调整。"
|
||||
},
|
||||
{
|
||||
"name": "batch_max_orders",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "批次最大订单数"
|
||||
"description": "批次最大订单数(可选)"
|
||||
},
|
||||
{
|
||||
"name": "batch_max_skus",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "批次最大 SKU 数"
|
||||
"description": "批次最大 SKU 总数(可选)"
|
||||
},
|
||||
{
|
||||
"name": "group_batch_max_orders",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "团购批次最大订单数"
|
||||
"description": "团购批次最大订单数(可选)"
|
||||
},
|
||||
{
|
||||
"name": "require_same_express",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"description": "是否要求相同快递"
|
||||
"description": "是否要求相同快递(可选,布尔)"
|
||||
},
|
||||
{
|
||||
"name": "allow_cross_owner",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"description": "是否允许跨货主(默认 true)"
|
||||
"description": "是否允许跨货主(可选,布尔)"
|
||||
},
|
||||
{
|
||||
"name": "description",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "策略描述"
|
||||
"description": "策略描述(可选)"
|
||||
},
|
||||
{
|
||||
"name": "allowed_provinces",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的省份列表(可选)"
|
||||
"description": "允许的省份列表(可选,支持数组/JSON/逗号分隔)"
|
||||
},
|
||||
{
|
||||
"name": "allowed_platforms",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的平台列表(可选)"
|
||||
"description": "允许的平台列表(可选,支持数组/JSON/逗号分隔)"
|
||||
},
|
||||
{
|
||||
"name": "allowed_owners",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的货主列表;必须在系统可用货主范围内,否则接口直接返回错误"
|
||||
"description": "允许的货主列表(可选,支持数组/JSON/逗号分隔);系统会校验所传货主是否在仓库可用货主范围内,非法值将导致 400 错误。"
|
||||
},
|
||||
{
|
||||
"name": "allowed_expresses",
|
||||
"type": "array",
|
||||
"type": "array|string",
|
||||
"required": false,
|
||||
"description": "允许的快递编码列表;必须在系统可用快递范围内,否则接口直接返回错误"
|
||||
"description": "允许的快递编码列表(可选,支持数组/JSON/逗号分隔);系统会校验所传编码是否在可用快递列表内,非法值将导致 400 错误。"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "data",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "更新后的波次策略记录(原始 wms_wave_strategy 字段)"
|
||||
"required": true,
|
||||
"description": "更新后的策略对象,字段同 order.wave.waveStrategyList.list[*] 所示"
|
||||
},
|
||||
{
|
||||
"name": "code",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "业务状态码,200 表示成功"
|
||||
"description": "HTTP-like 状态码,成功时返回 200"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
@ -13,13 +13,13 @@
|
||||
}
|
||||
},
|
||||
"moduleCount": 34,
|
||||
"totalInterfaceCount": 241,
|
||||
"totalInterfaceCount": 243,
|
||||
"changes": {
|
||||
"summary": {
|
||||
"moduleAdded": 0,
|
||||
"moduleDeleted": 0,
|
||||
"moduleUpdated": 1,
|
||||
"interfaceAdded": 2,
|
||||
"moduleUpdated": 0,
|
||||
"interfaceAdded": 0,
|
||||
"interfaceDeleted": 0,
|
||||
"interfaceParamsUpdated": 0,
|
||||
"interfaceResponseUpdated": 0
|
||||
@ -27,40 +27,10 @@
|
||||
"moduleUpdates": {
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"updated": [
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"previousModuleName": "订单波次模块",
|
||||
"previousModuleKey": "order.wave",
|
||||
"interfaceChanges": {
|
||||
"addedMethods": [
|
||||
"order.wave.waveStrategyCreate",
|
||||
"order.wave.waveStrategyUpdate"
|
||||
],
|
||||
"deletedMethods": [],
|
||||
"paramsUpdatedMethods": [],
|
||||
"responseUpdatedMethods": []
|
||||
}
|
||||
}
|
||||
]
|
||||
"updated": []
|
||||
},
|
||||
"interfaceUpdates": {
|
||||
"added": [
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"method": "order.wave.waveStrategyCreate"
|
||||
},
|
||||
{
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"method": "order.wave.waveStrategyUpdate"
|
||||
}
|
||||
],
|
||||
"added": [],
|
||||
"deleted": [],
|
||||
"paramsUpdated": [],
|
||||
"responseUpdated": []
|
||||
@ -310,11 +280,8 @@
|
||||
"moduleName": "订单波次模块",
|
||||
"moduleKey": "order.wave",
|
||||
"folder": "order.wave",
|
||||
"interfaceCount": 25,
|
||||
"interfaceCount": 27,
|
||||
"interfaces": [
|
||||
{
|
||||
"method": "order.wave.groupOrderFetchList"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.waveStrategyList"
|
||||
},
|
||||
@ -327,15 +294,24 @@
|
||||
{
|
||||
"method": "order.wave.waveStrategyQuickScan"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.waveStrategyFetchPda"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.waveStrategyFetchAdmin"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.waveStrategyQuickScanTaskProgress"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.waveStrategyFallbackOrderList"
|
||||
"method": "order.wave.groupOrderFetchList"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.singleFetchByIds"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.waveStrategyFallbackOrderList"
|
||||
},
|
||||
{
|
||||
"method": "order.wave.singleOrderFetchList"
|
||||
},
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-05-05 09:15:19",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-05-04 09:11:04",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-05-04 17:23:48",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-17 19:37:49",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-17 20:21:27",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-17 19:16:50",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-05-04 09:11:04",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": "2026-04-17 19:16:50"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
},
|
||||
"status": "active",
|
||||
"createdAt": "2026-04-16 11:15:05",
|
||||
"updatedAt": "2026-05-07 17:23:10",
|
||||
"updatedAt": "2026-05-08 17:47:16",
|
||||
"deletedAt": null,
|
||||
"restoredAt": null
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"generatedAt": "2026-05-07 17:23:10",
|
||||
"generatedAtLocal": "2026-05-07 17:23:10",
|
||||
"generatedAt": "2026-05-08 17:47:16",
|
||||
"generatedAtLocal": "2026-05-08 17:47:16",
|
||||
"source": "remote",
|
||||
"filter": {
|
||||
"platform": {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user