This commit is contained in:
yin 2026-05-12 18:16:09 +08:00
parent 53c0321e0d
commit 2194cd9cca
85 changed files with 3248 additions and 1699 deletions

View File

@ -14,6 +14,20 @@ export type WavePrintDataPayload = {
ext?: Record<string, unknown>
}
export type GetWavePlatformPrintDataParams = {
warehouse_id: number
wave_ids: Array<number | string>
}
/** 接口文档:summary / wave_ids / platform_groups / order_list / ext */
export type WavePlatformPrintDataPayload = {
summary?: Record<string, unknown>
wave_ids?: Array<number | string>
platform_groups?: unknown[]
order_list?: Record<string, unknown>[]
ext?: Record<string, unknown>
}
/** 按波次 IDs 获取订单打印数据(order.print.getWavePrintData) */
export function getWavePrintData(data: GetWavePrintDataParams) {
return request({
@ -28,3 +42,18 @@ export function getWavePrintData(data: GetWavePrintDataParams) {
isSystemApi: true
} as any)
}
/** 按波次 IDs 获取平台打印中间态数据(order.print.getWavePlatformPrintData) */
export function getWavePlatformPrintData(data: GetWavePlatformPrintDataParams) {
return request({
url: '/system',
method: 'post',
params: {
method: 'order.print.getWavePlatformPrintData',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -2,12 +2,40 @@ import request from '@/utils/request'
const v = '1.0'
/** order.wave.batchList 的 where 白名单(禁止 warehouse_id / warehouseId) */
export type WaveBatchListWhere = {
wave_id?: number | string
wave_no?: string
wave_type?: number
wave_status?: number
creator?: string
logistics_name?: string
item_part_type?: number
item_part?: string
item_snapshot_key?: string
item_detail_machine?: string
distinguish_express?: number
total_orders_min?: number
total_orders_max?: number
processed_orders_min?: number
processed_orders_max?: number
/** 英文枚举:unassigned | partially_assigned | assigned */
express_assignment_status?: 'unassigned' | 'partially_assigned' | 'assigned'
/** 英文枚举:unprinted | partially_printed | printed */
print_assignment_status?: 'unprinted' | 'partially_printed' | 'printed'
/** 中文:未分配 | 部分分配 | 已分配 */
storage_assignment_status?: string
/** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */
source?: number
}
export type WaveBatchListParams = {
pagination?: {
page?: number
pageSize?: number
}
where?: Record<string, any>
/** 白名单见 WaveBatchListWhere;与列表页动态 where 构建兼容 */
where?: WaveBatchListWhere | Record<string, any>
}
export type WaveListPagination = {
@ -19,8 +47,17 @@ export type WaveListPagination = {
hasNext?: boolean
}
export type WaveBatchListItem = Record<string, unknown> & {
order_count?: number
storage_assignment_status?: string
express_assignment_status?: string
print_assignment_status?: string
/** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */
source?: number
}
export type WaveBatchListResponse = {
list: Array<Record<string, unknown>>
list: WaveBatchListItem[]
pagination: WaveListPagination
}
@ -166,12 +203,12 @@ export type WaveStrategyCreateParams = {
strategy_type: number
batch_mode: number
status?: number
order_min_sku?: number
order_max_sku?: number
order_min_qty?: number
order_max_qty?: number
min_same_structure?: number
max_same_structure?: 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
batch_max_skus?: number
group_batch_max_orders?: number
@ -194,12 +231,12 @@ export type WaveStrategyUpdateParams = WaveStrategyIdentityParam & {
strategy_type?: number
batch_mode?: number
status?: number
order_min_sku?: number
order_max_sku?: number
order_min_qty?: number
order_max_qty?: number
min_same_structure?: number
max_same_structure?: 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
batch_max_skus?: number
group_batch_max_orders?: number

View File

@ -0,0 +1,747 @@
<template>
<div class="order-sub-container">
<!-- <scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
:width="waveScanBoxConfig.width"
:tree-props="waveScanBoxConfig.treeProps"
:auto-submit="waveScanBoxConfig.autoSubmit"
:preset-tree="presetTree"
:available-fields="availableFieldsRef"
@condition-change="handleConditionChange"
@reset="handleConditionReset"
@condition-clear="handleConditionClear"
/> -->
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left" @wheel="handleToolbarWheel">
<div
class="toolbar-scroll-container"
ref="scrollContainerRef"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@mouseleave="handleMouseUp"
>
<el-button size="small" type="primary" :loading="fallbackOrderListLoading" @click="loadData">查询</el-button>
<el-button size="small" @click="resetFallbackOrderCondition">重置</el-button>
<el-button size="small" @click="openColumnConfigPanel">字段设置</el-button>
<el-button
size="small"
type="warning"
:loading="waveStrategyQuickScanSubmitting"
@click="submitWaveStrategyQuickScan"
>
快速扫描
</el-button>
<el-button
size="small"
type="warning"
:disabled="!selectionRows.length"
:loading="singleOrderSubmitting"
@click="submitFallbackOrderFetchByIds"
>
按订单IDs抓取删单
</el-button>
</div>
</div>
<div class="toolbar-right">
<span class="toolbar-switch-label">已选 {{ selectionRows.length }} 个订单</span>
</div>
</div>
<div class="split-stack">
<div class="upper-wrapper" :style="upperPaneFullStyle">
<upper-table
ref="upperTable"
title="不符合波次策略订单列表"
:enable-column-config="true"
:column-config-schema-version="1"
:table-id="tableListId"
:data="list"
:row-key="getRowIdentity"
:columns="columns"
:table-size="tableSize"
:pagination="pagination"
:show-index="true"
:show-selection="true"
:loading="fallbackOrderListLoading"
:queryTime="queryTime"
@page-change="handlePageChange"
@page-size-change="handlePageSizeChange"
@refresh="loadData"
@selection-change="handleSelectionChange"
>
<template #column-delivery_no="{ row }">
<span>{{ row.delivery_no || row.delivery_order_code || row.order_sn || '—' }}</span>
</template>
<template #column-tracking_no="{ row }">
<span>{{ row.tracking_no || row.tracking_number || '—' }}</span>
</template>
<template #column-store_name="{ row }">
<span>{{ row.store_name || row.shop_name || row.shop || '—' }}</span>
</template>
<template #column-sys_logistics_name="{ row }">
<span>{{ row.sys_logistics_name || row.logistics_name || '—' }}</span>
</template>
<template #column-items_count="{ row }">
<span>{{ row.items_count ?? row.item_count ?? '—' }}</span>
</template>
<template #column-items_total="{ row }">
<span>{{ row.items_total ?? row.item_total ?? '—' }}</span>
</template>
<template #column-item_snapshot="{ row }">
<span class="order-info-text">{{ getFallbackOrderItemSnapshotText(row) }}</span>
</template>
<template #column-updated_at="{ row }">
{{ formatDateTime(row.updated_at || row.update_time || row.updated_time) }}
</template>
<template #empty>
<div class="empty-tip">暂无不符合波次策略订单</div>
</template>
</upper-table>
</div>
</div>
</div>
<wave-strategy-quick-scan-progress-dialog
v-model="waveStrategyQuickScanDialogVisible"
:progress="waveStrategyQuickScanResult"
@update:model-value="handleWaveStrategyQuickScanDialogVisibleChange"
/>
</div>
</template>
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import {
waveScanBoxConfig,
fallbackOrderAvailableFields,
fallbackOrderColumns
} from './config/wave-config'
import { safeInvoke } from '@/utils/safe-invoke'
import WaveStrategyQuickScanProgressDialog from './component/WaveStrategyQuickScanProgressDialog.vue'
import * as indexApi from '@/api/index/index'
import {
orderWaveSingleFetchByIds,
orderWaveWaveStrategyFallbackOrderList,
orderWaveWaveStrategyQuickScan,
orderWaveWaveStrategyQuickScanTaskProgress
} from '@/api/order.wave/orderwave'
import type {
WaveStrategyFallbackOrderListResponse,
WaveStrategyFallbackOrderListRow,
WaveStrategyQuickScanResponse,
WaveStrategyQuickScanTaskProgressResponse
} from '@/api/order.wave/orderwave'
const props = withDefaults(defineProps<{
/** 与路由 path 组合,隔离 ScanBox 筛选缓存(波次各标签页须各不相同) */
scanBoxCacheKey?: string
}>(), {
scanBoxCacheKey: 'wave-order-sandan-fallback-orders'
})
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const fallbackOrderListLoading = ref(false)
const singleOrderSubmitting = ref(false)
const waveStrategyQuickScanSubmitting = ref(false)
const waveStrategyQuickScanDialogVisible = ref(false)
const waveStrategyQuickScanTaskPollTimer = ref<ReturnType<typeof setTimeout> | null>(null)
const queryTime = ref(0)
const tableSize = ref('small')
const list = ref<WaveStrategyFallbackOrderListRow[]>([])
const selectionRows = ref<any[]>([])
const pagination = 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 presetTree = ref<any[]>([])
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(fallbackOrderAvailableFields)))
const columns = ref(JSON.parse(JSON.stringify(fallbackOrderColumns)))
const waveStrategyQuickScanResult = reactive({
status: '',
taskId: '',
warehouseId: undefined as number | undefined,
state: '',
message: '',
acceptedAt: '',
totalOrderCount: 0,
processedOrderCount: 0,
matchedOrderCount: 0,
unmatchedOrderCount: 0,
progressPercent: 0,
startTime: '',
endTime: '',
durationMs: 0,
errorMessage: ''
})
const tableListId = computed(() => 'wave-management-fallback-order-list')
const upperPaneFullStyle = computed(() => ({
flex: '1 1 auto',
minHeight: '0',
overflow: 'hidden' as const
}))
const isDragging = ref(false)
const startX = ref(0)
const scrollLeft = ref(0)
const handleToolbarWheel = (e: WheelEvent) => {
if (scrollContainerRef.value) {
e.preventDefault()
scrollContainerRef.value.scrollLeft += e.deltaY
}
}
const handleMouseDown = (e: MouseEvent) => {
if (!scrollContainerRef.value) return
isDragging.value = true
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
scrollLeft.value = scrollContainerRef.value.scrollLeft
}
const handleMouseMove = (e: MouseEvent) => {
if (!isDragging.value || !scrollContainerRef.value) return
e.preventDefault()
const x = e.pageX - scrollContainerRef.value.offsetLeft
const walk = (x - startX.value) * 1.5
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
}
const handleMouseUp = () => {
isDragging.value = false
}
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
function getRowIdentity(row: any) {
return String(row?.id ?? row?.order_id ?? row?.delivery_no ?? '')
}
function buildWhereConditions(rawConditions: Record<string, any>) {
const where: Record<string, any> = {}
Object.keys(rawConditions || {}).forEach((key) => {
const condition = rawConditions[key]
if (condition && typeof condition === 'object' && 'operator' in condition) {
const value = condition.value
if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) {
return
}
where[key] = value
return
}
if (condition !== undefined && condition !== null && condition !== '') {
where[key] = Array.isArray(condition) ? condition[0] ?? '' : condition
}
})
return where
}
function sanitizeFallbackOrderWhere(where: Record<string, any>) {
const allowedFieldMap: Record<string, string> = {
id: 'id',
delivery_no: 'delivery_no',
deliveryNo: 'delivery_no',
tracking_no: 'tracking_no',
trackingNo: 'tracking_no',
items_count_min: 'items_count_min',
items_count_max: 'items_count_max',
items_total_min: 'items_total_min',
items_total_max: 'items_total_max',
sys_logistics_name: 'sys_logistics_name',
store_name: 'store_name',
owner_name: 'owner_name',
province: 'province',
sys_platform_name: 'sys_platform_name'
}
const nextWhere: Record<string, any> = {}
Object.keys(where || {}).forEach((key) => {
if (key === 'warehouse_id' || key === 'warehouseId') return
const normalizedKey = allowedFieldMap[key]
if (!normalizedKey) return
const value = where[key]
if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) return
nextWhere[normalizedKey] = value
})
return nextWhere
}
function buildPayload() {
return {
pagination: {
page: pagination.currentPage,
pageSize: pagination.pageSize
},
where: sanitizeFallbackOrderWhere(buildWhereConditions(scanBox.value?.getConditions?.() || {}))
}
}
async function loadData() {
fallbackOrderListLoading.value = true
const start = Date.now()
try {
const res = await orderWaveWaveStrategyFallbackOrderList(buildPayload()) as
WaveStrategyFallbackOrderListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyFallbackOrderListResponse> }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '获取不符合波次策略订单失败')
}
const responseList = Array.isArray(res.list)
? res.list
: Array.isArray(res.data?.list)
? res.data.list
: []
const responsePagination = res.pagination || res.data?.pagination || {}
list.value = responseList
pagination.currentPage = responsePagination.page || pagination.currentPage
pagination.pageSize = responsePagination.pageSize || pagination.pageSize
pagination.total = responsePagination.total || 0
} catch (error: any) {
console.error('fetch fallback order list failed:', error)
list.value = []
pagination.total = 0
ElMessage.error(error?.message || '获取不符合波次策略订单失败')
} finally {
fallbackOrderListLoading.value = false
queryTime.value = Date.now() - start
}
}
function handlePageChange(page: number) {
pagination.currentPage = page
void loadData()
}
function handlePageSizeChange(size: number) {
pagination.pageSize = size
pagination.currentPage = 1
void loadData()
}
function handleConditionChange() {
pagination.currentPage = 1
void loadData()
}
function handleConditionClear() {
pagination.currentPage = 1
void loadData()
}
function handleConditionReset() {
pagination.currentPage = 1
void loadData()
}
function resetFallbackOrderCondition() {
pagination.currentPage = 1
scanBox.value?.reset?.()
void loadData()
}
function handleSelectionChange(rows: any[]) {
selectionRows.value = rows || []
}
function openColumnConfigPanel() {
upperTable.value?.openColumnConfig?.()
}
function getFallbackOrderItemSnapshotText(row: WaveStrategyFallbackOrderListRow) {
const value = row?.item_snapshot
if (typeof value === 'string' && value.trim()) {
return value
}
return '—'
}
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}`
}
function normalizeCode(value: unknown) {
return String(value ?? '').trim()
}
function mapNameOptions(rawList: any[], nameKeys: string[]) {
const result: Array<{ label: string; value: string }> = []
const seen = new Set<string>()
for (const item of rawList || []) {
const name = normalizeCode(nameKeys.map((key) => item?.[key]).find((v) => v !== undefined && v !== null && v !== ''))
if (!name || seen.has(name)) continue
result.push({ value: name, label: name })
seen.add(name)
}
return result
}
function unwrapIndexListResponse(res: any): any[] {
const payload = res?.data !== undefined ? res.data : res
if (Array.isArray(payload)) return payload
if (payload && typeof payload === 'object') {
if (Array.isArray(payload.list)) return payload.list
if (Array.isArray(payload.items)) return payload.items
if (Array.isArray(payload.records)) return payload.records
}
if (Array.isArray(res?.list)) return res.list
return []
}
function patchFallbackFieldOptions(fieldValue: string, options: Array<{ label: string; value: string }>) {
const targetField = availableFieldsRef.find((field: any) => field.value === fieldValue)
if (targetField) {
targetField.options = options
}
}
async function loadFallbackOrderFilterOptions() {
const hasReadyOptions = fallbackOrderOwnerOptions.value.length > 0
&& fallbackOrderLogisticsOptions.value.length > 0
&& fallbackOrderPlatformOptions.value.length > 0
if (hasReadyOptions) return
try {
const [storesRes, expressRes, platformRes] = await Promise.all([
indexApi.loadStores({ type: 'order' }),
indexApi.getExpressList({}),
indexApi.getPlatformList({})
])
const storesResAny = storesRes as any
const stores = Array.isArray(storesResAny?.stores)
? storesResAny.stores
: Array.isArray(storesResAny?.data?.stores)
? storesResAny.data.stores
: []
const expressRaw = unwrapIndexListResponse(expressRes)
const platformRaw = unwrapIndexListResponse(platformRes)
const ownerNameSet = new Set<string>()
stores.forEach((item: any) => {
const ownerName = String(item?.label || item?.name || '').trim()
if (!ownerName) return
ownerNameSet.add(ownerName)
})
fallbackOrderOwnerOptions.value = Array.from(ownerNameSet).map((name) => ({
label: name,
value: name
}))
fallbackOrderLogisticsOptions.value = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name', 'label'])
fallbackOrderPlatformOptions.value = mapNameOptions(platformRaw, ['name', 'platform_name', 'sys_platform_name', 'label'])
patchFallbackFieldOptions('owner_name', fallbackOrderOwnerOptions.value)
patchFallbackFieldOptions('sys_logistics_name', fallbackOrderLogisticsOptions.value)
patchFallbackFieldOptions('sys_platform_name', fallbackOrderPlatformOptions.value)
} catch (error) {
console.error('load fallback order filter options failed:', error)
}
}
function normalizeAsyncTaskStatus(value: unknown) {
return String(value ?? '').trim().toLowerCase()
}
function isAsyncTaskSuccessStatus(status: string) {
return ['success', 'succeeded', 'completed', 'done', 'fin', 'finished'].includes(status)
}
function isAsyncTaskFailureStatus(status: string) {
return ['failed', 'failure', 'error', 'exception', 'timeout', 'not_found'].includes(status)
}
function resetWaveStrategyQuickScanResult() {
waveStrategyQuickScanResult.status = ''
waveStrategyQuickScanResult.taskId = ''
waveStrategyQuickScanResult.warehouseId = undefined
waveStrategyQuickScanResult.state = ''
waveStrategyQuickScanResult.message = ''
waveStrategyQuickScanResult.acceptedAt = ''
waveStrategyQuickScanResult.totalOrderCount = 0
waveStrategyQuickScanResult.processedOrderCount = 0
waveStrategyQuickScanResult.matchedOrderCount = 0
waveStrategyQuickScanResult.unmatchedOrderCount = 0
waveStrategyQuickScanResult.progressPercent = 0
waveStrategyQuickScanResult.startTime = ''
waveStrategyQuickScanResult.endTime = ''
waveStrategyQuickScanResult.durationMs = 0
waveStrategyQuickScanResult.errorMessage = ''
}
function handleWaveStrategyQuickScanDialogVisibleChange(visible: boolean) {
waveStrategyQuickScanDialogVisible.value = visible
if (!visible) {
resetWaveStrategyQuickScanResult()
}
}
function stopWaveStrategyQuickScanTaskPolling() {
if (waveStrategyQuickScanTaskPollTimer.value) {
clearTimeout(waveStrategyQuickScanTaskPollTimer.value)
waveStrategyQuickScanTaskPollTimer.value = null
}
}
function scheduleWaveStrategyQuickScanTaskPolling(delay = 2000) {
stopWaveStrategyQuickScanTaskPolling()
if (!waveStrategyQuickScanResult.taskId) return
waveStrategyQuickScanTaskPollTimer.value = setTimeout(() => {
void pollWaveStrategyQuickScanTaskProgress()
}, delay)
}
function applyWaveStrategyQuickScanTaskProgress(progress: Partial<WaveStrategyQuickScanTaskProgressResponse> & Record<string, any>) {
waveStrategyQuickScanResult.taskId = String(progress.task_id || waveStrategyQuickScanResult.taskId || '')
waveStrategyQuickScanResult.state = String(progress.state || waveStrategyQuickScanResult.state || 'submitted')
waveStrategyQuickScanResult.warehouseId = Number(progress.warehouse_id ?? waveStrategyQuickScanResult.warehouseId ?? 0) || undefined
waveStrategyQuickScanResult.totalOrderCount = Number(progress.total_order_count ?? waveStrategyQuickScanResult.totalOrderCount ?? 0)
waveStrategyQuickScanResult.processedOrderCount = Number(progress.processed_order_count ?? waveStrategyQuickScanResult.processedOrderCount ?? 0)
waveStrategyQuickScanResult.matchedOrderCount = Number(progress.matched_order_count ?? waveStrategyQuickScanResult.matchedOrderCount ?? 0)
waveStrategyQuickScanResult.unmatchedOrderCount = Number(progress.unmatched_order_count ?? waveStrategyQuickScanResult.unmatchedOrderCount ?? 0)
waveStrategyQuickScanResult.progressPercent = Number(progress.progress_percent ?? waveStrategyQuickScanResult.progressPercent ?? 0)
waveStrategyQuickScanResult.startTime = String(progress.start_time || waveStrategyQuickScanResult.startTime || '')
waveStrategyQuickScanResult.endTime = String(progress.end_time || waveStrategyQuickScanResult.endTime || '')
waveStrategyQuickScanResult.durationMs = Number(progress.duration_ms ?? waveStrategyQuickScanResult.durationMs ?? 0)
waveStrategyQuickScanResult.errorMessage = String(progress.error_message || '')
}
async function pollWaveStrategyQuickScanTaskProgress() {
if (!waveStrategyQuickScanResult.taskId) return
try {
const res = await orderWaveWaveStrategyQuickScanTaskProgress({
task_id: waveStrategyQuickScanResult.taskId
}) as WaveStrategyQuickScanTaskProgressResponse & { code?: number; message?: string }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '查询波次策略快速扫描进度失败')
}
applyWaveStrategyQuickScanTaskProgress(res)
const normalizedStatus = normalizeAsyncTaskStatus(waveStrategyQuickScanResult.state)
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopWaveStrategyQuickScanTaskPolling()
waveStrategyQuickScanResult.message = waveStrategyQuickScanResult.errorMessage || res?.message || '快速扫描任务执行失败'
await loadData()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(waveStrategyQuickScanResult.progressPercent || 0) >= 100) {
stopWaveStrategyQuickScanTaskPolling()
waveStrategyQuickScanResult.message = res?.message || '快速扫描任务已完成'
await loadData()
return
}
scheduleWaveStrategyQuickScanTaskPolling()
} catch (error) {
console.error('poll wave strategy quick scan task progress failed:', error)
scheduleWaveStrategyQuickScanTaskPolling(4000)
}
}
async function submitWaveStrategyQuickScan() {
stopWaveStrategyQuickScanTaskPolling()
waveStrategyQuickScanSubmitting.value = true
waveStrategyQuickScanDialogVisible.value = true
try {
const res = await orderWaveWaveStrategyQuickScan() as WaveStrategyQuickScanResponse & { code?: number; message?: string }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '提交波次策略快速扫描任务失败')
}
waveStrategyQuickScanResult.status = String(res.status || '')
waveStrategyQuickScanResult.taskId = String(res.task_id || '')
waveStrategyQuickScanResult.warehouseId = Number(res.warehouse_id || 0) || undefined
waveStrategyQuickScanResult.state = String(res.state || '')
waveStrategyQuickScanResult.message = String(res.message || '')
waveStrategyQuickScanResult.acceptedAt = String(res.accepted_at || '')
waveStrategyQuickScanResult.progressPercent = 0
waveStrategyQuickScanResult.errorMessage = ''
ElMessage.success((res?.message || '波次策略快速扫描任务已提交') + (res?.task_id ? `(任务ID:${res.task_id})` : ''))
if (waveStrategyQuickScanResult.taskId) {
scheduleWaveStrategyQuickScanTaskPolling(1000)
}
} catch (error: any) {
console.error('submit wave strategy quick scan failed:', error)
resetWaveStrategyQuickScanResult()
waveStrategyQuickScanDialogVisible.value = false
ElMessage.error(error?.message || '提交波次策略快速扫描任务失败')
} finally {
waveStrategyQuickScanSubmitting.value = false
}
}
async function submitFallbackOrderFetchByIds() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选要抓取删单的订单')
return
}
const ids = selectionRows.value
.map((row: any) => Number(row?.id ?? row?.order_id))
.filter((id: number) => Number.isFinite(id) && id > 0)
if (!ids.length) {
ElMessage.warning('当前勾选记录缺少有效订单ID')
return
}
try {
await ElMessageBox.confirm(
`确定将选中的 ${ids.length} 条订单按散单抓取至波次吗?`,
'抓取散单',
{ type: 'warning' }
)
} catch {
return
}
singleOrderSubmitting.value = true
try {
const res: any = await orderWaveSingleFetchByIds({ ids })
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '抓取散单失败')
}
const payload =
res?.data && typeof res.data === 'object' && !Array.isArray(res.data)
? res.data
: res
const waveNo = payload?.wave_no ?? ''
const fetched = Number(payload?.fetched_order_count ?? 0)
const parts = [
res?.message || payload?.message || '抓取散单成功',
waveNo ? `波次:${waveNo}` : '',
Number.isFinite(fetched) && fetched >= 0 ? `已抓取 ${fetched} 单` : ''
]
const excluded = payload?.excluded_existing_wave_order_ids
const skipped = payload?.skipped_order_ids
const notFound = payload?.not_found_order_ids
if (Array.isArray(excluded) && excluded.length) {
parts.push(`已在波次中跳过 ${excluded.length} 单`)
}
if (Array.isArray(skipped) && skipped.length) {
parts.push(`跳过 ${skipped.length} 单`)
}
if (Array.isArray(notFound) && notFound.length) {
parts.push(`未找到 ${notFound.length} 单`)
}
ElMessage.success(parts.filter(Boolean).join(';'))
selectionRows.value = []
await loadData()
} catch (error: any) {
console.error('fetch fallback order by ids failed:', error)
ElMessage.error(error?.message || '抓取散单失败')
} finally {
singleOrderSubmitting.value = false
}
}
onMounted(() => {
safeInvoke(async () => {
await loadFallbackOrderFilterOptions()
await loadData()
})
})
onBeforeUnmount(() => {
stopWaveStrategyQuickScanTaskPolling()
})
</script>
<style scoped lang="scss">
@use "../orderManagement/styles/order-sub.scss";
.empty-tip {
text-align: center;
font-size: 13px;
line-height: 1.5;
}
.order-info-text {
display: inline-block;
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.order-sub-container .main-content {
.toolbar {
display: flex;
align-items: center;
justify-content: space-between;
.toolbar-right {
display: flex;
align-items: center;
gap: 6px;
flex-shrink: 0;
padding-left: 8px;
}
.toolbar-switch-label {
font-size: 12px;
color: var(--el-text-color-regular);
white-space: nowrap;
}
.toolbar-left {
cursor: grab;
&:active {
cursor: grabbing;
}
.toolbar-scroll-container {
display: flex;
align-items: center;
gap: 6px;
overflow-x: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
}
</style>

View File

@ -2,6 +2,7 @@
<div class="order-sub-container">
<scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
:width="waveScanBoxConfig.width"
:tree-props="waveScanBoxConfig.treeProps"
:auto-submit="waveScanBoxConfig.autoSubmit"
@ -172,20 +173,20 @@
</template>
<template #column-storage_assignment_status="{ row }">
<el-tag size="small" :type="getAssignmentTagType(getStorageAssignmentStatusText(row))">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row))">
{{ getStorageAssignmentStatusText(row) }}
</el-tag>
</template>
<template #column-express_assignment_status="{ row }">
<el-tag size="small" :type="getAssignmentTagType(row.express_assignment_status)">
{{ row.express_assignment_status || '—' }}
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.express_assignment_status)">
{{ formatWaveExpressAssignmentStatusLabel(row.express_assignment_status) }}
</el-tag>
</template>
<template #column-print_assignment_status="{ row }">
<el-tag size="small" :type="getAssignmentTagType(row.print_assignment_status)">
{{ row.print_assignment_status || '—' }}
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.print_assignment_status)">
{{ formatWavePrintAssignmentStatusLabel(row.print_assignment_status) }}
</el-tag>
</template>
@ -443,6 +444,7 @@
<div class="single-fallback-layout">
<scan-box
ref="fallbackOrderScanBox"
:cache-key="groupWaveFallbackScanBoxCacheKey"
width="250px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
@ -483,7 +485,6 @@
@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 label="订单号" min-width="180" show-overflow-tooltip>
<template #default="{ row }">
{{ row.delivery_no || row.delivery_order_code || row.order_sn || '—' }}
@ -857,6 +858,13 @@
document-label="波次"
:fetch-print-data="loadWavePrintFormData"
/>
<wave-platform-print-preview-dialog
v-model="platformPrintDialogVisible"
:error-message="platformPrintErrorMessage"
:payload="platformPrintPayload"
:request-meta="platformPrintRequestMeta"
/>
</div>
</template>
@ -881,11 +889,16 @@ import {
waveFetchTaskStatusTextMap,
waveStatusTextMap,
waveTypeTextMap,
waveStorageAssignmentStatusTextMap
waveStorageAssignmentStatusTextMap,
unwrapWavePlatformPrintPayload,
formatWaveExpressAssignmentStatusLabel,
formatWavePrintAssignmentStatusLabel,
getWaveAssignmentAggregateTagType
} from './config/wave-config'
import { safeInvoke } from '@/utils/safe-invoke'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import BatchReceivingPrintDialog from '@/components/BatchReceivingPrintDialog.vue'
import WavePlatformPrintPreviewDialog from './component/WavePlatformPrintPreviewDialog.vue'
import PendingOrderListPanel from './component/PendingOrderListPanel.vue'
import WaveBatchDetailPanel from './component/WaveBatchDetailPanel.vue'
import WaveFetchTaskProgressDialog from './component/WaveFetchTaskProgressDialog.vue'
@ -946,8 +959,22 @@ import type {
WaveStrategyQuickScanTaskProgressResponse
} from '@/api/order.wave/orderwave'
import { useUserStore } from '@/stores/modules/user'
import { getWavePrintData } from '@/api/order.print/orderprint'
import { getWavePrintData, getWavePlatformPrintData } from '@/api/order.print/orderprint'
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
import pcasCodeData from 'china-division/dist/pcas-code.json'
const props = withDefaults(
defineProps<{
/** 与路由 path 组合,隔离 ScanBox 筛选缓存(波次各标签页须各不相同) */
scanBoxCacheKey?: string
}>(),
{
scanBoxCacheKey: 'wave-order-group-wave'
}
)
const groupWaveFallbackScanBoxCacheKey = computed(() => `${props.scanBoxCacheKey}-fallback-orders`)
const WAVE_TYPE = 1 as const
const route = useRoute()
@ -956,7 +983,6 @@ const router = useRouter()
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const groupOrderTableRef = ref<any>(null)
const singleOrderTableRef = ref<any>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const loading = ref(false)
const showInternalSourceWaves = ref(false)
@ -964,6 +990,11 @@ const batchAutoGroupingLoading = ref(false)
const batchFinishAutoGroupingLoading = ref(false)
const batchCancelLoading = ref(false)
const batchPrintLoading = ref(false)
const batchPlatformPrintLoading = ref(false)
const platformPrintDialogVisible = ref(false)
const platformPrintPayload = ref<WavePlatformPrintDataPayload | null>(null)
const platformPrintErrorMessage = ref('')
const platformPrintRequestMeta = ref<{ warehouse_id: number; wave_ids: Array<number | string> } | null>(null)
const batchAllocateExpressLoading = ref(false)
const batchAllocateStorageLoading = ref(false)
const batchRemoveExceptionOrdersLoading = ref(false)
@ -1065,6 +1096,7 @@ const groupOrderPagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }
const singleOrderDialogVisible = ref(false)
const singleOrderActiveTab = ref<'fallback-orders' | 'strategy-api'>('fallback-orders')
const singleOrderSubmitting = ref(false)
const singleOrderTableRef = ref<any>(null)
const fallbackOrderScanBox = ref<any>(null)
const fallbackOrderListLoading = ref(false)
const fallbackOrderList = ref<WaveStrategyFallbackOrderListRow[]>([])
@ -1183,19 +1215,24 @@ const buttonLoadingMap = computed(() => ({
batchFinishAutoGroupingLoading: batchFinishAutoGroupingLoading.value,
batchCancelLoading: batchCancelLoading.value,
batchPrintLoading: batchPrintLoading.value,
batchPlatformPrintLoading: batchPlatformPrintLoading.value,
batchAllocateExpressLoading: batchAllocateExpressLoading.value,
batchAllocateStorageLoading: batchAllocateStorageLoading.value,
batchRemoveExceptionOrdersLoading: batchRemoveExceptionOrdersLoading.value
}))
const batchPlatformPrintDisabled = computed(() => !printableSelectionRows.value.length)
const buttonDisabledMap = computed(() => ({
batchPickingPrintDisabled: batchPrintDisabled.value,
batchPrintDisabled: batchPrintDisabled.value,
batchPlatformPrintDisabled: batchPlatformPrintDisabled.value,
noSelection: !hasSelection.value
}))
const buttonLabelMap = computed(() => ({
batchPrintTotal: `批量打印(${selectedWaveOrderTotal.value})`,
batchPlatformPrintTotal: `批量打印(平台)(${selectedWaveOrderTotal.value})`,
batchPickingPrintTotal: `批量打印拣货单(${selectionRows.value.length})`,
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
@ -1222,6 +1259,9 @@ const toolbarActionMap: Record<string, () => void> = {
openColumnConfigPanel: () => openColumnConfigPanel(),
toggleDetailVisible: () => toggleDetailVisible(),
handleBatchPrint: () => handleBatchPrint(),
handleBatchPlatformPrint: () => {
void handleBatchPlatformPrint()
},
handleBatchPrintPickingList: () => handleBatchPrintPickingList(),
handleBatchAutoGrouping: () => {
void handleBatchAutoGrouping()
@ -1637,16 +1677,6 @@ function getItemSnapshotText(row: any) {
return row?.item_snapshot_key || row?.item_detail_machine || row?.item_detail || '—'
}
function getAssignmentTagType(value: string | undefined) {
const text = String(value || '')
if (text.includes('异常') || text.includes('失败') || text.includes('超时')) return 'danger'
if (text.includes('处理中')) return 'warning'
if (text.includes('已分配') || text.includes('完成')) return 'success'
if (text.includes('部分')) return 'warning'
if (text.includes('未分配')) return 'info'
return 'info'
}
function formatDateTime(value: string | number | null | undefined) {
if (!value) return '—'
let normalizedValue: string | number = value
@ -1900,6 +1930,68 @@ async function handleBatchPrintPickingList() {
await openBatchPrintDialog(rows)
}
async function handleBatchPlatformPrint() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选要打印的波次')
return
}
const autoGroupingRows = [...autoGroupingSelectionRows.value]
const removedCount = autoGroupingRows.length
if (removedCount) {
autoGroupingRows.forEach((row: any) => {
upperTable.value?.toggleRowSelection?.(row, false)
})
}
if (!printableSelectionRows.value.length) {
ElMessage.warning('自动加团中的波次不参与批量打印(平台),已从当前勾选中移除')
return
}
if (removedCount) {
ElMessage.warning(`已自动移除 ${removedCount} 个「自动加团中」波次,不参与批量打印(平台)`)
}
const rows = printableSelectionRows.value
const first = rows[0] as Record<string, unknown>
const warehouseId = Number(first?.warehouse_id ?? userStore.user?.warehouse_id ?? userStore.user?.store_id)
if (!Number.isFinite(warehouseId) || warehouseId <= 0) {
ElMessage.error('无法确定仓库 ID,请确认列表中的仓库字段或当前登录仓库上下文')
return
}
const wave_ids = rows
.map((row: any) => row?.id ?? row?.wave_id ?? row?.batch_id)
.filter((id: unknown) => id !== undefined && id !== null && id !== '')
if (!wave_ids.length) {
ElMessage.warning('当前勾选记录缺少可用的波次 ID')
return
}
platformPrintRequestMeta.value = { warehouse_id: warehouseId, wave_ids }
platformPrintErrorMessage.value = ''
platformPrintPayload.value = null
batchPlatformPrintLoading.value = true
try {
const res: any = await getWavePlatformPrintData({ warehouse_id: warehouseId, wave_ids })
if (res?.code !== undefined && res?.code !== null && !okCode(res.code)) {
throw new Error(res?.message || '获取平台打印数据失败')
}
platformPrintPayload.value = unwrapWavePlatformPrintPayload(res)
platformPrintDialogVisible.value = true
ElMessage.success(res?.message || '已获取平台打印数据')
} catch (error: any) {
platformPrintPayload.value = null
platformPrintErrorMessage.value = error?.message || '获取平台打印数据失败'
platformPrintDialogVisible.value = true
ElMessage.error(platformPrintErrorMessage.value)
} finally {
batchPlatformPrintLoading.value = false
}
}
function stopFetchTaskPolling() {
if (fetchTaskPollTimer.value) {
clearTimeout(fetchTaskPollTimer.value)
@ -2881,12 +2973,13 @@ function sanitizeFallbackOrderWhere(where: Record<string, any>) {
}
function buildFallbackOrderListPayload() {
const scanBox = fallbackOrderScanBox.value
return {
pagination: {
page: fallbackOrderPagination.currentPage,
pageSize: fallbackOrderPagination.pageSize
},
where: sanitizeFallbackOrderWhere(buildWhereConditions(fallbackOrderScanBox.value?.getConditions?.() || {}))
where: sanitizeFallbackOrderWhere(buildWhereConditions(scanBox?.getConditions?.() || {}))
}
}
@ -3240,6 +3333,14 @@ async function submitWaveStrategyQuickScan() {
}
}
function getFallbackOrderItemSnapshotText(row: WaveStrategyFallbackOrderListRow) {
const value = row?.item_snapshot
if (typeof value === 'string' && value.trim()) {
return value
}
return '—'
}
async function fetchFallbackOrderList() {
fallbackOrderListLoading.value = true
try {
@ -3270,14 +3371,6 @@ async function fetchFallbackOrderList() {
}
}
function getFallbackOrderItemSnapshotText(row: WaveStrategyFallbackOrderListRow) {
const value = row?.item_snapshot
if (typeof value === 'string' && value.trim()) {
return value
}
return '—'
}
async function fetchGroupOrderList() {
groupOrderListLoading.value = true
try {
@ -3672,11 +3765,6 @@ async function submitFallbackOrderFetchByIds() {
gap: 10px;
}
.single-order-tabs {
height: 100%;
min-height: 0;
}
.single-fallback-layout {
display: flex;
gap: 10px;
@ -3693,6 +3781,11 @@ async function submitFallbackOrderFetchByIds() {
gap: 10px;
}
.single-order-tabs {
height: 100%;
min-height: 0;
}
.wave-strategy-tab {
display: flex;
flex-direction: column;

File diff suppressed because it is too large Load Diff

View File

@ -2,6 +2,7 @@
<div class="order-sub-container">
<scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
:width="waveScanBoxConfig.width"
:tree-props="waveScanBoxConfig.treeProps"
:auto-submit="waveScanBoxConfig.autoSubmit"
@ -327,6 +328,16 @@ import {
type PickTaskWaveToolbarKey
} from './config/wave-config'
const props = withDefaults(
defineProps<{
/** 与路由 path 组合,隔离 ScanBox 筛选缓存(波次各标签页须各不相同) */
scanBoxCacheKey?: string
}>(),
{
scanBoxCacheKey: 'wave-order-pick-task'
}
)
const userStore = useUserStore()
const loading = ref(false)
const list = ref<Array<Record<string, any>>>([])
@ -446,26 +457,103 @@ const handleMouseUp = () => {
isDragging.value = false
}
/** 将 ScanBox getConditions() 压平为接口入参(与 SandanWaveBatchListPanel 中 buildWhereConditions 一致) */
/**
* 展开 ScanBox 返回结构,兼容:
* - 扁平 { pick_user_id: { value, operator?, type? } }
* - 快照/合并后仅有 { value } 缺少 operator(原先误判为非条件对象,整对象传给 toPositiveId 导致 undefined)
* - { type: 'custom', conditions: { ... } } 包裹
*/
function unwrapScanBoxConditionMap(raw: Record<string, any> | null | undefined): Record<string, any> {
if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return {}
let root: Record<string, any> = raw
const type = root.type
const nested = root.conditions
if (type === 'custom' && nested && typeof nested === 'object' && !Array.isArray(nested)) {
root = nested as Record<string, any>
} else if (
nested
&& typeof nested === 'object'
&& !Array.isArray(nested)
&& Object.keys(root).length === 1
) {
root = nested as Record<string, any>
}
return root
}
/** 将 ScanBox getConditions() 压平为 wavePickTaskList 可用的顶层筛选字段 */
function buildPickTaskScanFilters(rawConditions: Record<string, any>) {
const root = unwrapScanBoxConditionMap(rawConditions)
const out: Record<string, any> = {}
Object.keys(rawConditions || {}).forEach((key) => {
const condition = rawConditions[key]
if (condition && typeof condition === 'object' && 'operator' in condition) {
const value = condition.value
if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) {
const skipKeys = new Set(['type', 'preset', 'field'])
Object.keys(root).forEach((key) => {
if (skipKeys.has(key)) return
const condition = root[key]
if (condition === undefined || condition === null || condition === '') return
if (typeof condition === 'object' && !Array.isArray(condition)) {
if (Object.prototype.hasOwnProperty.call(condition, 'value')) {
const value = condition.value
if (value === undefined || value === null || value === '') return
if (Array.isArray(value) && value.length === 0) return
out[key] = value
return
}
out[key] = value
return
}
if (condition !== undefined && condition !== null && condition !== '') {
out[key] = Array.isArray(condition) ? condition[0] ?? '' : condition
}
out[key] = Array.isArray(condition) ? condition[0] ?? '' : condition
})
return out
}
/** 兼容 ScanBox 多种返回形态,按候选键提取首个有效值 */
function resolveScanFilterValue(
flat: Record<string, any>,
keys: string[],
rawConditions: Record<string, any>
): unknown {
for (const key of keys) {
const v = flat[key]
if (v !== undefined && v !== null && v !== '') return v
}
const root = unwrapScanBoxConditionMap(rawConditions)
const where = root.where && typeof root.where === 'object' ? root.where : {}
for (const key of keys) {
const fromWhere = (where as Record<string, any>)[key]
if (fromWhere && typeof fromWhere === 'object' && Object.prototype.hasOwnProperty.call(fromWhere, 'value')) {
const value = fromWhere.value
if (value !== undefined && value !== null && value !== '') return value
}
if (fromWhere !== undefined && fromWhere !== null && fromWhere !== '') return fromWhere
}
return undefined
}
/** 将 ScanBox 文本输入的 ID 转为正整数;非法/空值返回 undefined(避免向接口发送 NaN/0/字符串) */
function toPositiveId(value: unknown): number | undefined {
if (value === undefined || value === null || value === '') return undefined
const text = String(value).trim()
if (!text) return undefined
const num = Number(text)
if (!Number.isFinite(num) || num <= 0) return undefined
return Math.trunc(num)
}
/** 有输入即透传:纯数字转 number,其余按字符串传递(避免被过滤成空) */
function toIdFilterValue(value: unknown): number | string | undefined {
if (value === undefined || value === null) return undefined
const text = String(value).trim()
if (!text) return undefined
const numeric = toPositiveId(text)
return numeric !== undefined ? numeric : text
}
function resolvePickToolbarDisabled(btn: PickTaskWaveToolbarButton): boolean {
if (btn.key === 'batchCancel') return selectedTaskRows.value.length === 0
return false
@ -708,7 +796,11 @@ async function loadData() {
emptyText.value = pickTaskWaveListDefaults.loadingEmptyText
try {
const flat = buildPickTaskScanFilters(scanBox.value?.getConditions?.() || {})
const rawConditions = scanBox.value?.getConditions?.() || {}
const flat = buildPickTaskScanFilters(rawConditions)
const pickUserId = toIdFilterValue(resolveScanFilterValue(flat, ['pick_user_id', 'picker_id'], rawConditions))
const reviewUserId = toIdFilterValue(resolveScanFilterValue(flat, ['review_user_id', 'recheck_user_id'], rawConditions))
const cartId = toIdFilterValue(resolveScanFilterValue(flat, ['cart_id', 'pick_car_id'], rawConditions))
const startRange = Array.isArray(flat.start_time_range) ? flat.start_time_range : []
const res = await orderWaveWavePickTaskList({
warehouse_id: wid,
@ -719,13 +811,19 @@ async function loadData() {
pick_mode: flat.pick_mode,
source:
flat.source === undefined || flat.source === null || flat.source === '' ? undefined : String(flat.source),
pick_user_id: flat.pick_user_id,
review_user_id: flat.review_user_id,
pick_user_id: pickUserId,
review_user_id: reviewUserId,
task_no: String(flat.task_no || '').trim() || undefined,
cart_id: flat.cart_id,
cart_id: cartId,
keyword: String(flat.keyword || '').trim() || undefined,
start_time_start: startRange[0] || undefined,
start_time_end: startRange[1] || undefined
start_time_end: startRange[1] || undefined,
// 兼容接口历史 where 解析逻辑;顶层参数仍为主路径
where: {
pick_user_id: pickUserId,
review_user_id: reviewUserId,
cart_id: cartId
}
})
if (!res || !okCode(res.code)) {

File diff suppressed because it is too large Load Diff

View File

@ -22,8 +22,8 @@
<div class="section-title">分配状态</div>
<el-descriptions :column="3" border size="small">
<el-descriptions-item label="库位分配状态">{{ getStorageAssignmentStatusText(row) }}</el-descriptions-item>
<el-descriptions-item label="快递分配状态">{{ row.express_assignment_status || '—' }}</el-descriptions-item>
<el-descriptions-item label="打印分配状态">{{ row.print_assignment_status || '—' }}</el-descriptions-item>
<el-descriptions-item label="快递分配状态">{{ formatWaveExpressAssignmentStatusLabel(row.express_assignment_status) }}</el-descriptions-item>
<el-descriptions-item label="打印分配状态">{{ formatWavePrintAssignmentStatusLabel(row.print_assignment_status) }}</el-descriptions-item>
<el-descriptions-item label="库位分配异常" :span="3">{{ getStorageAssignmentError(row) }}</el-descriptions-item>
</el-descriptions>
</div>
@ -48,7 +48,9 @@ import {
waveStorageAssignmentErrorPhraseMap,
waveStorageAssignmentErrorTextMap,
waveStorageAssignmentStatusTextMap,
waveTypeTextMap
waveTypeTextMap,
formatWaveExpressAssignmentStatusLabel,
formatWavePrintAssignmentStatusLabel
} from '../config/wave-config'
defineProps<{

View File

@ -0,0 +1,333 @@
<template>
<el-dialog
v-model="visibleProxy"
title="批量打印(平台数据)"
width="min(1100px, 94vw)"
align-center
destroy-on-close
append-to-body
class="wave-platform-print-dialog"
>
<div v-if="errorMessage" class="wave-print-error">
<el-alert type="error" :closable="false" :title="errorMessage" />
</div>
<div v-else-if="payload" ref="printRootRef" class="wave-print-body">
<p class="wave-print-api-hint">接口:<code>order.print.getWavePlatformPrintData</code></p>
<div class="wave-print-meta">
<span>仓库 ID:<code>{{ requestMeta?.warehouse_id ?? '—' }}</code></span>
<span>请求波次 ID 数:<code>{{ requestMeta?.wave_ids?.length ?? 0 }}</code></span>
<span>返回通过过滤波次数:<code>{{ (payload.wave_ids || []).length }}</code></span>
</div>
<el-alert v-if="filterHint" type="warning" :closable="false" show-icon class="wave-print-hint">
{{ filterHint }}
</el-alert>
<section class="wave-print-section">
<h4 class="wave-print-section__title">汇总 summary</h4>
<el-descriptions v-if="summaryEntries.length" :column="2" border size="small">
<el-descriptions-item v-for="[k, v] in summaryEntries" :key="k" :label="String(k)">
{{ formatPrimitive(v) }}
</el-descriptions-item>
</el-descriptions>
<p v-else class="wave-print-muted">(无 summary 或为空对象)</p>
</section>
<section class="wave-print-section">
<h4 class="wave-print-section__title">通过过滤的波次 ID wave_ids</h4>
<div v-if="waveIdTags.length" class="wave-print-tags">
<el-tag v-for="(id, i) in waveIdTags" :key="`${id}-${i}`" size="small" class="wave-print-tag">
{{ id }}
</el-tag>
</div>
<p v-else class="wave-print-muted">(无 wave_ids)</p>
</section>
<!-- <section class="wave-print-section">
<h4 class="wave-print-section__title">按平台分组 platform_groups</h4>
<pre class="wave-print-json wave-print-json--tall">{{ platformGroupsJson }}</pre>
</section> -->
<section class="wave-print-section wave-print-section--table">
<h4 class="wave-print-section__title">逐单明细 order_list</h4>
<p class="wave-print-muted wave-print-section__sub">列为后端返回首条记录字段动态展开(至多 16 列)。</p>
<el-table v-if="orderListRows.length" :data="orderListRows" border size="small" row-key="__key" max-height="420">
<el-table-column
v-for="col in orderListColumns"
:key="col"
:label="col"
min-width="112"
show-overflow-tooltip
>
<template #default="scope">
{{ formatCell((scope.row as Record<string, unknown>)[col]) }}
</template>
</el-table-column>
</el-table>
<p v-else class="wave-print-muted">(无 order_list)</p>
</section>
<section v-if="payload.ext && Object.keys(payload.ext).length" class="wave-print-section">
<h4 class="wave-print-section__title">扩展 ext</h4>
<pre class="wave-print-json">{{ JSON.stringify(payload.ext, null, 2) }}</pre>
</section>
</div>
<div v-else class="wave-print-muted">(无数据)</div>
<template #footer>
<el-button @click="visibleProxy = false">关闭</el-button>
<el-button :disabled="!payload" @click="copyJson">复制完整 JSON</el-button>
<el-button type="primary" :disabled="!payload" @click="printReport">浏览器打印</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
const props = defineProps<{
modelValue: boolean
errorMessage: string
payload: WavePlatformPrintDataPayload | null
requestMeta: { warehouse_id: number; wave_ids: Array<number | string> } | null
}>()
const emit = defineEmits<{
'update:modelValue': [boolean]
}>()
const printRootRef = ref<HTMLElement | null>(null)
const visibleProxy = computed({
get: () => props.modelValue,
set: (v: boolean) => emit('update:modelValue', v)
})
const summaryEntries = computed(() => {
const s = props.payload?.summary
if (!s || typeof s !== 'object') return [] as [string, unknown][]
return Object.entries(s)
})
const filterHint = computed(() => {
const s = props.payload?.summary
if (!s || typeof s !== 'object') return ''
const o = s as Record<string, unknown>
const parts: string[] = []
const pickStr = (v: unknown) => (typeof v === 'string' && v.trim() ? v.trim() : '')
const msg = pickStr(o.message) || pickStr(o.msg) || pickStr(o.hint)
if (msg) parts.push(msg)
const candidates = [
['requested_wave_count', '请求波次数'],
['accepted_wave_count', '接受波次数'],
['filtered_wave_count', '过滤波次数'],
['skipped_wave_count', '跳过波次数'],
['order_total', '订单合计']
] as const
for (const [key, label] of candidates) {
if (o[key] !== undefined && o[key] !== null && o[key] !== '') {
parts.push(`${label}:${formatPrimitive(o[key])}`)
}
}
if (Array.isArray(o.filtered_wave_ids) && o.filtered_wave_ids.length) {
parts.push(`已过滤波次 ID:${JSON.stringify(o.filtered_wave_ids)}`)
}
if (Array.isArray(o.skipped_wave_ids) && o.skipped_wave_ids.length) {
parts.push(`跳过波次 ID:${JSON.stringify(o.skipped_wave_ids)}`)
}
return parts.filter(Boolean).join(';')
})
const waveIdTags = computed(() => {
const ids = props.payload?.wave_ids
if (!Array.isArray(ids)) return []
return ids.map((x) => String(x))
})
const platformGroupsJson = computed(() => {
const g = props.payload?.platform_groups
try {
return JSON.stringify(g ?? [], null, 2)
} catch {
return String(g)
}
})
const orderListRows = computed(() => {
const list = props.payload?.order_list
if (!Array.isArray(list)) return []
return list.map((raw, idx) => {
const row = raw && typeof raw === 'object' ? (raw as Record<string, unknown>) : {}
return { ...row, __key: `o-${idx}` }
})
})
const orderListColumns = computed(() => {
const first = orderListRows.value[0]
if (!first) return []
return Object.keys(first).filter((k) => k !== '__key').slice(0, 16)
})
function formatPrimitive(v: unknown): string {
if (v === null || v === undefined) return '—'
if (typeof v === 'object') return JSON.stringify(v)
return String(v)
}
function formatCell(v: unknown): string {
if (v === null || v === undefined) return '—'
if (typeof v === 'object') return JSON.stringify(v)
return String(v)
}
function buildExportJson(): string {
const p = props.payload
const body: WavePlatformPrintDataPayload = {
summary: p?.summary,
wave_ids: p?.wave_ids,
platform_groups: p?.platform_groups,
order_list: p?.order_list,
ext: p?.ext
}
return JSON.stringify(body, null, 2)
}
async function copyJson() {
try {
await navigator.clipboard.writeText(buildExportJson())
ElMessage.success('已复制平台打印数据 JSON')
} catch {
ElMessage.error('复制失败,请手动选择内容复制')
}
}
function printReport() {
const el = printRootRef.value
if (!el) {
ElMessage.warning('暂无可打印内容')
return
}
const w = window.open('', '_blank')
if (!w) {
ElMessage.warning('浏览器拦截了新窗口,请允许弹窗后重试')
return
}
const styles = `
body { font-family: system-ui, sans-serif; padding: 16px; color: #303133; }
h1 { font-size: 18px; margin: 0 0 12px; }
.meta { font-size: 13px; margin-bottom: 12px; color: #606266; }
.meta code { background: #f4f4f5; padding: 2px 6px; border-radius: 4px; }
h4 { margin: 16px 0 8px; font-size: 14px; }
pre { background: #f5f7fa; padding: 10px; overflow: auto; font-size: 11px; white-space: pre-wrap; }
.hint { background: #fdf6ec; border: 1px solid #faecd8; padding: 8px 10px; margin-bottom: 12px; font-size: 12px; color: #e6a23c; }
`
const hintHtml = filterHint.value ? `<div class="hint">${escapeHtml(filterHint.value)}</div>` : ''
w.document.write(`<!DOCTYPE html><html><head><meta charset="utf-8"/><title>平台打印数据</title><style>${styles}</style></head><body>`)
w.document.write(`<h1>批量打印(平台数据)</h1>`)
w.document.write(
`<div class="meta">仓库 ID:<code>${escapeHtml(String(props.requestMeta?.warehouse_id ?? ''))}</code>;请求波次 ID 数:<code>${props.requestMeta?.wave_ids?.length ?? 0}</code></div>`
)
w.document.write(hintHtml)
w.document.write(el.innerHTML)
w.document.write('</body></html>')
w.document.close()
w.focus()
w.print()
}
function escapeHtml(s: string) {
return s
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
}
</script>
<style scoped lang="scss">
.wave-print-api-hint {
margin: 0 0 10px;
font-size: 13px;
color: #606266;
code {
font-size: 12px;
background: #f4f4f5;
padding: 2px 6px;
border-radius: 4px;
}
}
.wave-print-error {
padding: 8px 0 16px;
}
.wave-print-meta {
display: flex;
flex-wrap: wrap;
gap: 16px;
margin-bottom: 12px;
font-size: 13px;
color: #606266;
code {
background: #f4f4f5;
padding: 2px 6px;
border-radius: 4px;
font-size: 12px;
}
}
.wave-print-hint {
margin-bottom: 12px;
}
.wave-print-section {
margin-bottom: 18px;
&__title {
margin: 0 0 8px;
font-size: 14px;
font-weight: 600;
color: #303133;
}
&__sub {
margin: 0 0 8px;
}
}
.wave-print-muted {
margin: 0;
font-size: 13px;
color: #909399;
}
.wave-print-tags {
display: flex;
flex-wrap: wrap;
gap: 8px;
}
.wave-print-tag {
margin: 0;
}
.wave-print-json {
margin: 0;
padding: 10px 12px;
background: #f5f7fa;
border-radius: 4px;
font-size: 12px;
line-height: 1.45;
overflow: auto;
max-height: 240px;
&--tall {
max-height: 320px;
}
}
</style>

View File

@ -1,4 +1,5 @@
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
/** 工具栏按钮:可限定仅在对应波次页签显示(1 团购 / 2 散单) */
export type WaveToolbarButtonConfig = ToolbarButtonConfig & {
@ -62,14 +63,14 @@ export const waveAvailableFields = [
{ label: '已分配', value: '已分配' },
]},
{ label:'快递分配', value: 'express_assignment_status', type: 'select', options: [
{ label: '未分配', value: '未分配' },
{ label: '部分分配', value: '部分分配' },
{ label: '已分配', value: '已分配' },
{ label: '未分配', value: 'unassigned' },
{ label: '部分分配', value: 'partially_assigned' },
{ label: '已分配', value: 'assigned' },
]},
{ label:'打印状态', value: 'print_assignment_status', type: 'select', options: [
{ label: '未打印', value: '未打印' },
{ label: '部分打印', value: '部分打印' },
{ label: '已打印', value: '已打印' },
{ label: '未打印', value: 'unprinted' },
{ label: '部分打印', value: 'partially_printed' },
{ label: '已打印', value: 'printed' },
]},
{ label: '创建人', value: 'creator', type: 'text' },
{ label: '快递', value: 'logistics_name', type: 'text' },
@ -102,6 +103,83 @@ export const fallbackOrderAvailableFields = [
// { label: '来源平台', value: 'sys_platform_name', type: 'select', options: [] }
]
/** 不符合波次策略订单列表:UpperTable 列配置 */
export const fallbackOrderColumns = [
{ prop: 'delivery_no', label: '订单号', minWidth: 180, fixed: 'left' },
{ prop: 'tracking_no', label: '物流单号', minWidth: 160 },
{ prop: 'store_name', label: '店铺', minWidth: 140 },
{ prop: 'sys_platform_name', label: '平台', minWidth: 120 },
{ prop: 'sys_logistics_name', label: '物流公司', minWidth: 130 },
{ prop: 'province', label: '省份', minWidth: 100 },
{ prop: 'items_count', label: '商品种数', minWidth: 100, align: 'right' },
{ prop: 'items_total', label: '商品总数', minWidth: 100, align: 'right' },
{ prop: 'item_snapshot', label: '商品快照', minWidth: 260 },
{ prop: 'wave_scan_result', label: '扫描结果', minWidth: 110, align: 'center' },
{ prop: 'updated_at', label: '更新时间', minWidth: 170 }
]
/** 波次策略:左侧筛选可用字段 */
export const waveStrategyAvailableFields = [
{ label: '策略名称', value: 'strategy_name', type: 'text' },
{
label: '策略类型',
value: 'strategy_type',
type: 'select',
options: [
{ label: '散单', value: 1 },
{ label: '团购', value: 2 }
]
},
{
label: '启用状态',
value: 'status',
type: 'select',
options: [
{ label: '启用', value: 1 },
{ label: '停用', value: 0 }
]
},
{
label: '批次模式',
value: 'batch_mode',
type: 'select',
options: [
{ label: '团购', value: 0 },
{ label: '单品单件', value: 1 },
{ label: '先拣后分', value: 2 },
{ label: '边拣边分', value: 3 },
{ label: '边拣边分H型', value: 4 },
{ label: '播种墙', value: 5 },
{ label: '流利架', value: 6 }
]
},
{ label: '波次前缀', value: 'wave_prefix', type: 'text' }
]
/** 波次策略:UpperTable 列配置 */
export const waveStrategyColumns = [
{ prop: 'id', label: 'ID', width: 72, align: 'center', fixed: 'left' },
{ prop: 'strategy_name', label: '策略名称', minWidth: 160, fixed: 'left' },
{ prop: 'wave_prefix', label: '波次前缀', width: 100, align: 'center' },
{ prop: 'matched_order_count_filtered', label: '匹配订单数', width: 110, align: 'center' },
{ prop: 'next_fetch_order_count', label: '下一波抓取数量', width: 130, align: 'center' },
{ prop: 'strategy_type', label: '策略类型', width: 90, align: 'center' },
{ prop: 'status', label: '状态', width: 80, align: 'center' },
{ prop: 'batch_mode', label: '批次模式', width: 110, align: 'center' },
{ prop: 'sku_range', label: 'SKU区间', minWidth: 120, align: 'center' },
{ prop: 'qty_range', label: '件数区间', minWidth: 120, align: 'center' },
{ prop: 'same_structure_range', label: '同结构区间', minWidth: 120, align: 'center' },
{ prop: 'require_same_express', label: '同快递', width: 80, align: 'center' },
{ prop: 'allow_cross_owner', label: '跨货主', width: 80, align: 'center' },
{ prop: 'batch_max_orders', label: '单波最大订单', width: 120, align: 'center' },
{ prop: 'batch_max_skus', label: '单波最大SKU', width: 120, align: 'center' },
{ prop: 'group_batch_max_orders', label: '团购单波最大', width: 120, align: 'center' },
{ prop: 'create_time', label: '创建时间', minWidth: 168 },
{ prop: 'update_time', label: '更新时间', minWidth: 168 },
{ prop: 'description', label: '说明', minWidth: 160 },
{ prop: 'operation', label: '操作', width: 170, fixed: 'right', align: 'center' }
]
/** 主表列配置 */
export const waveBatchColumns = [
// { prop: 'wave_id', label: '波次ID', minWidth: 160, fixed: 'left' },
@ -152,6 +230,52 @@ export const waveWhereAllowedFieldList = [
export const waveWhereAllowedFields = new Set<string>(waveWhereAllowedFieldList)
/** 列表/详情展示:接口可能返回英文枚举或历史中文 */
const waveExpressAssignmentStatusLabelMap: Record<string, string> = {
unassigned: '未分配',
partially_assigned: '部分分配',
assigned: '已分配',
未分配: '未分配',
部分分配: '部分分配',
已分配: '已分配'
}
const wavePrintAssignmentStatusLabelMap: Record<string, string> = {
unprinted: '未打印',
partially_printed: '部分打印',
printed: '已打印',
未打印: '未打印',
部分打印: '部分打印',
已打印: '已打印'
}
export function formatWaveExpressAssignmentStatusLabel(value: string | number | null | undefined): string {
if (value === undefined || value === null || value === '') return '—'
const key = String(value).trim()
return waveExpressAssignmentStatusLabelMap[key] ?? waveExpressAssignmentStatusLabelMap[key.toLowerCase()] ?? key
}
export function formatWavePrintAssignmentStatusLabel(value: string | number | null | undefined): string {
if (value === undefined || value === null || value === '') return '—'
const key = String(value).trim()
return wavePrintAssignmentStatusLabelMap[key] ?? wavePrintAssignmentStatusLabelMap[key.toLowerCase()] ?? key
}
/** 快递分配 / 打印状态 / 库位分配等聚合状态列的 tag 类型(兼容英文枚举与中文文案) */
export function getWaveAssignmentAggregateTagType(value: string | number | null | undefined): 'success' | 'warning' | 'info' | 'danger' {
const v = String(value ?? '').toLowerCase().trim()
if (v === 'unassigned' || v === 'unprinted') return 'info'
if (v === 'partially_assigned' || v === 'partially_printed') return 'warning'
if (v === 'assigned' || v === 'printed') return 'success'
const text = String(value ?? '')
if (text.includes('异常') || text.includes('失败') || text.includes('超时')) return 'danger'
if (text.includes('处理中')) return 'warning'
if (text.includes('已分配') || text.includes('完成') || text.includes('已打印')) return 'success'
if (text.includes('部分')) return 'warning'
if (text.includes('未分配') || text.includes('未打印')) return 'info'
return 'info'
}
/**
* 主工具栏按钮(action 与波次列表页内 toolbarActionMap 键一致)
*/
@ -177,17 +301,28 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
onlyForWaveType: 1
},
{
key: 'batchPrintPickingList',
label: '批量打印拣货单(0)',
dynamicLabelKey: 'batchPickingPrintTotal',
key: 'batchPlatformPrint',
label: '批量打印(平台)(0)',
dynamicLabelKey: 'batchPlatformPrintTotal',
type: 'info',
plain: true,
size: 'small',
disabledKey: 'noSelection',
loadingKey: 'batchPrintLoading',
action: 'handleBatchPrintPickingList',
onlyForWaveType: 1
disabledKey: 'batchPlatformPrintDisabled',
loadingKey: 'batchPlatformPrintLoading',
action: 'handleBatchPlatformPrint'
},
// {
// key: 'batchPrintPickingList',
// label: '批量打印拣货单(0)',
// dynamicLabelKey: 'batchPickingPrintTotal',
// type: 'info',
// plain: true,
// size: 'small',
// disabledKey: 'noSelection',
// loadingKey: 'batchPrintLoading',
// action: 'handleBatchPrintPickingList',
// onlyForWaveType: 1
// },
{
key: 'batchAutoGrouping',
label: '批量改为自动加团',
@ -268,6 +403,32 @@ export function getWaveToolbarButtons(waveType: 1 | 2): WaveToolbarButtonConfig[
)
}
/** 解析 order.print.getWavePlatformPrintData 响应(支持 res.data 包裹) */
export function unwrapWavePlatformPrintPayload(res: unknown): WavePlatformPrintDataPayload {
const r = res as Record<string, unknown> | null | undefined
const inner =
r?.data !== undefined && r?.data !== null && typeof r.data === 'object' && !Array.isArray(r.data)
? (r.data as Record<string, unknown>)
: (r as Record<string, unknown>) || {}
const summaryRaw = inner?.summary
const summary =
summaryRaw !== undefined && summaryRaw !== null && typeof summaryRaw === 'object' && !Array.isArray(summaryRaw)
? (summaryRaw as Record<string, unknown>)
: undefined
const wave_ids = Array.isArray(inner?.wave_ids) ? (inner.wave_ids as Array<number | string>) : undefined
const platform_groups = Array.isArray(inner?.platform_groups) ? inner.platform_groups : undefined
const orderListRaw = inner?.order_list
const order_list = Array.isArray(orderListRaw)
? (orderListRaw.filter((x) => x && typeof x === 'object') as Record<string, unknown>[])
: undefined
const extRaw = inner?.ext
const ext =
extRaw !== undefined && extRaw !== null && typeof extRaw === 'object' && !Array.isArray(extRaw)
? (extRaw as Record<string, unknown>)
: undefined
return { summary, wave_ids, platform_groups, order_list, ext }
}
/** 异步任务状态文案 */
export const waveFetchTaskStatusTextMap: Record<string, string> = {
submitted: '已受理',
@ -476,9 +637,27 @@ export const pickTaskWaveAvailableFields = [
{ label: '后台', value: 2 }
]
},
{ label: '拣货员ID', value: 'pick_user_id', type: 'number' },
{ label: '复核人ID', value: 'review_user_id', type: 'number' },
{ label: '拣货车ID', value: 'cart_id', type: 'number' },
{
label: '拣货员ID',
value: 'pick_user_id',
type: 'text',
operators: ['eq'],
placeholder: '请输入拣货员ID(纯数字)'
},
{
label: '复核人ID',
value: 'review_user_id',
type: 'text',
operators: ['eq'],
placeholder: '请输入复核人ID(纯数字)'
},
{
label: '拣货车ID',
value: 'cart_id',
type: 'text',
operators: ['eq'],
placeholder: '请输入拣货车ID(纯数字)'
},
{ label: '开始时间', value: 'start_time_range', type: 'daterange' }
]

View File

@ -35,6 +35,8 @@ import { useRoute, useRouter } from 'vue-router'
import { useSettingsStore } from '@/stores/modules/settings'
import GroupWaveBatchListPanel from './GroupWaveBatchListPanel.vue'
import SandanWaveBatchListPanel from './SandanWaveBatchListPanel.vue'
import FallbackOrderListPanel from './FallbackOrderListPanel.vue'
import WaveStrategyListPanel from './WaveStrategyListPanel.vue'
import WavePickTaskListPanel from './WavePickTaskListPanel.vue'
import { safeInvoke } from '@/utils/safe-invoke'
@ -55,21 +57,36 @@ type WaveTabItem = {
}
const tabs = ref<WaveTabItem[]>([
{ name: 'groupWave', label: '团购波次', component: markRaw(GroupWaveBatchListPanel) },
{ name: 'sandanWave', label: '散单波次', component: markRaw(SandanWaveBatchListPanel) },
{
name: 'groupWave',
label: '团购波次',
component: markRaw(GroupWaveBatchListPanel),
props: { scanBoxCacheKey: 'wave-order-group-wave' }
},
{
name: 'sandanWave',
label: '散单波次',
component: markRaw(SandanWaveBatchListPanel),
props: { scanBoxCacheKey: 'wave-order-sandan-wave' }
},
{
name: 'sandanFallbackOrders',
label: '不符合波次策略订单列表',
component: markRaw(SandanWaveBatchListPanel),
props: { singleOrderOnlyView: true, initialSingleOrderTab: 'fallback-orders' }
component: markRaw(FallbackOrderListPanel),
props: { scanBoxCacheKey: 'wave-order-sandan-fallback-orders' }
},
{
name: 'sandanWaveStrategy',
label: '波次策略',
component: markRaw(SandanWaveBatchListPanel),
props: { singleOrderOnlyView: true, initialSingleOrderTab: 'strategy-api' }
component: markRaw(WaveStrategyListPanel),
props: { scanBoxCacheKey: 'wave-order-sandan-wave-strategy' }
},
{ name: 'pickTaskWave', label: '拣货中任务', component: markRaw(WavePickTaskListPanel) }
{
name: 'pickTaskWave',
label: '拣货中任务',
component: markRaw(WavePickTaskListPanel),
props: { scanBoxCacheKey: 'wave-order-pick-task' }
}
])
/**

View File

@ -1,11 +1,11 @@
# 接口
- 更新时间: 2026-05-11 09:20:11
- 更新时间: 2026-05-12 09:38:35
- 扫描目录: `src\api`
- 模块数: 35
- API 文件数: 35
- 接口数: 283
- 已启用: 252
- 接口数: 284
- 已启用: 253
- 占位接口: 2
## 模块统计
@ -24,7 +24,7 @@
| order.index | 1 | 6 | 5 | 0 |
| order.outboundorder | 1 | 3 | 3 | 0 |
| order.pendingorder | 1 | 16 | 16 | 0 |
| order.print | 1 | 1 | 1 | 0 |
| order.print | 1 | 2 | 2 | 0 |
| order.revieworder | 1 | 3 | 3 | 0 |
| order.wave | 1 | 30 | 29 | 0 |
| pick | 1 | 2 | 2 | 0 |
@ -114,6 +114,7 @@
| order.pendingorder | orderPendingOrderSyncOrderIds | order.pendingOrder.syncOrderIds | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
| order.pendingorder | orderPendingOrderUpdateOrderExpress | order.pendingOrder.updateOrderExpress | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
| order.pendingorder | orderPendingOrderUpdateOrderPlatform | order.pendingOrder.updateOrderPlatform | POST | 是 | 否 | order.pendingorder/orderpendingOrder.ts | |
| order.print | getWavePlatformPrintData | order.print.getWavePlatformPrintData | POST | 是 | 否 | order.print/orderprint.ts | |
| order.print | getWavePrintData | order.print.getWavePrintData | POST | 是 | 否 | order.print/orderprint.ts | |
| order.revieworder | orderReviewOrderDetail | order.reviewOrder.detail | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |
| order.revieworder | orderReviewOrderList | order.reviewOrder.list | POST | 是 | 否 | order.revieworder/orderreviewOrder.ts | |

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {
@ -12,15 +12,15 @@
"label": "全部"
}
},
"totalInterfaceCount": 247,
"totalInterfaceCount": 248,
"changes": {
"summary": {
"moduleAdded": 0,
"moduleDeleted": 0,
"moduleUpdated": 1,
"interfaceAdded": 0,
"moduleUpdated": 3,
"interfaceAdded": 1,
"interfaceDeleted": 0,
"interfaceParamsUpdated": 2,
"interfaceParamsUpdated": 3,
"interfaceResponseUpdated": 0
},
"moduleUpdates": {
@ -42,11 +42,48 @@
],
"responseUpdatedMethods": []
}
},
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"folder": "order.print",
"previousModuleName": "订单打印模块",
"previousModuleKey": "order.print",
"interfaceChanges": {
"addedMethods": [
"order.print.getWavePlatformPrintData"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": []
}
},
{
"moduleName": "order.wave",
"moduleKey": "order",
"folder": "order",
"previousModuleName": "order.wave",
"previousModuleKey": "order",
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [
"order.wave.batchList"
],
"responseUpdatedMethods": []
}
}
]
},
"interfaceUpdates": {
"added": [],
"added": [
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"folder": "order.print",
"method": "order.print.getWavePlatformPrintData"
}
],
"deleted": [],
"paramsUpdated": [
{
@ -60,6 +97,12 @@
"moduleKey": "order.wave",
"folder": "order.wave",
"method": "order.wave.waveStrategyUpdate"
},
{
"moduleName": "order.wave",
"moduleKey": "order",
"folder": "order",
"method": "order.wave.batchList"
}
],
"responseUpdated": []
@ -3031,6 +3074,75 @@
}
]
},
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"moduleFolder": "order.print",
"method": "order.print.getWavePlatformPrintData",
"title": "按波次 IDs 获取平台打印中间态数据,自动过滤快递未完全分配的波次,返回逐单中间态与按平台分组结果",
"description": "按波次 IDs 获取平台打印中间态数据,自动过滤快递未完全分配的波次,返回逐单中间态与按平台分组结果",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
"status": {
"isUsed": false,
"isPlaceholder": false
},
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "warehouse_id",
"type": "number",
"required": true,
"description": "仓库ID(必须与当前用户上下文 store_id 一致)"
},
{
"name": "wave_ids",
"type": "array",
"required": true,
"description": "波次ID列表(支持数字或字符串,内部自动去重与归一化)"
}
],
"response": [
{
"name": "summary",
"type": "object",
"required": false,
"description": "汇总信息"
},
{
"name": "wave_ids",
"type": "array",
"required": false,
"description": "通过过滤的波次ID数组"
},
{
"name": "platform_groups",
"type": "array",
"required": false,
"description": "按平台分组结果"
},
{
"name": "order_list",
"type": "array",
"required": false,
"description": "逐单平台打印中间态明细"
},
{
"name": "ext",
"type": "object",
"required": false,
"description": "扩展字段"
}
]
},
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
@ -4042,7 +4154,7 @@
"name": "where",
"type": "object",
"required": false,
"description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId: - wave_id(等值) - wave_no(模糊) - wave_type(等值) - wave_status(等值,接口固定叠加状态 0/1) - creator(模糊) - logistics_name(模糊) - item_part_type(等值) - item_part(模糊) - item_snapshot_key(模糊) - item_detail_machine(模糊) - distinguish_express(等值) - total_orders_min / total_orders_max(范围) - processed_orders_min / processed_orders_max(范围) - storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。 - source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。"
"description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId: - wave_id(等值) - wave_no(模糊) - wave_type(等值) - wave_status(等值,接口固定叠加状态 0/1) - creator(模糊) - logistics_name(模糊) - item_part_type(等值) - item_part(模糊) - item_snapshot_key(模糊) - item_detail_machine(模糊) - distinguish_express(等值) - total_orders_min / total_orders_max(范围) - processed_orders_min / processed_orders_max(范围) - express_assignment_status(等值,string,可选,英文枚举,取值:unassigned、partially_assigned、assigned;语义:按快递分配聚合判断,assigned 表示聚合后全部 fin,partially_assigned 表示部分已分配且不含 error,unassigned 表示全 none 或包含 error(异常并入未分配集合))。 - print_assignment_status(等值,string,可选,英文枚举,取值:unprinted、partially_printed、printed;语义:按打印分配聚合判断,printed 表示聚合后全部已打印)。 - storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。 - source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。 说明:express_assignment_status 与 print_assignment_status 要求使用英文枚举值;storage_assignment_status 仍向后兼容中文展示值。若传入的枚举值不在允许集合内,接口会返回 400(参数校验失败),并在 message 中说明错误字段与允许取值。"
}
],
"response": [
@ -5309,12 +5421,6 @@
"type": "array|string",
"required": false,
"description": "允许的快递编码列表(可选,支持数组/JSON/逗号分隔);系统会校验所传编码是否在可用快递列表内,非法值将导致 400 错误。"
},
{
"name": "wave_prefix",
"type": "string",
"required": false,
"description": "策略波次前缀(可选)。优先于仓库前缀;校验:长度 1-5,仅支持 A-Z0-9,保存时转大写;为空时回退仓库前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。"
}
],
"response": [
@ -5511,8 +5617,8 @@
"moduleKey": "order.wave",
"moduleFolder": "order.wave",
"method": "order.wave.waveStrategyFetchPda",
"title": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:任务创建时生成的波次号(wave_no)使用策略的 wave_prefix(若设置)优先;若策略未设置,则根据策略类型回退到仓库级前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。前缀保存为大写;仅允许 A-Z0-9,长度 1-5。 当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"description": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:任务创建时生成的波次号(wave_no)使用策略的 wave_prefix(若设置)优先;若策略未设置,则根据策略类型回退到仓库级前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。前缀保存为大写;仅允许 A-Z0-9,长度 1-5。 当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"title": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"description": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
@ -6019,12 +6125,6 @@
"type": "array|string",
"required": false,
"description": "允许的快递编码列表(可选,支持数组/JSON/逗号分隔);系统会校验所传编码是否在可用快递列表内,非法值将导致 400 错误。"
},
{
"name": "wave_prefix",
"type": "string",
"required": false,
"description": "策略波次前缀(可选)。优先于仓库前缀;校验:长度 1-5,仅支持 A-Z0-9,保存时转大写;为空时回退仓库前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。"
}
],
"response": [

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {
@ -13,15 +13,15 @@
}
},
"moduleCount": 35,
"totalInterfaceCount": 247,
"totalInterfaceCount": 248,
"changes": {
"summary": {
"moduleAdded": 0,
"moduleDeleted": 0,
"moduleUpdated": 1,
"interfaceAdded": 0,
"moduleUpdated": 3,
"interfaceAdded": 1,
"interfaceDeleted": 0,
"interfaceParamsUpdated": 2,
"interfaceParamsUpdated": 3,
"interfaceResponseUpdated": 0
},
"moduleUpdates": {
@ -43,11 +43,48 @@
],
"responseUpdatedMethods": []
}
},
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"folder": "order.print",
"previousModuleName": "订单打印模块",
"previousModuleKey": "order.print",
"interfaceChanges": {
"addedMethods": [
"order.print.getWavePlatformPrintData"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": []
}
},
{
"moduleName": "order.wave",
"moduleKey": "order",
"folder": "order",
"previousModuleName": "order.wave",
"previousModuleKey": "order",
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [
"order.wave.batchList"
],
"responseUpdatedMethods": []
}
}
]
},
"interfaceUpdates": {
"added": [],
"added": [
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"folder": "order.print",
"method": "order.print.getWavePlatformPrintData"
}
],
"deleted": [],
"paramsUpdated": [
{
@ -61,6 +98,12 @@
"moduleKey": "order.wave",
"folder": "order.wave",
"method": "order.wave.waveStrategyUpdate"
},
{
"moduleName": "order.wave",
"moduleKey": "order",
"folder": "order",
"method": "order.wave.batchList"
}
],
"responseUpdated": []
@ -405,10 +448,13 @@
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"folder": "order.print",
"interfaceCount": 1,
"interfaceCount": 2,
"interfaces": [
{
"method": "order.print.getWavePrintData"
},
{
"method": "order.print.getWavePlatformPrintData"
}
]
},

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-05 09:15:19",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {
@ -16,14 +16,16 @@
"name": "订单打印模块",
"key": "order.print",
"folder": "order.print",
"interfaceCount": 1
"interfaceCount": 2
},
"changes": {
"fromPreviousSnapshot": {
"moduleAdded": false,
"moduleRenamed": false,
"interfaceChanges": {
"addedMethods": [],
"addedMethods": [
"order.print.getWavePlatformPrintData"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": []
@ -84,6 +86,72 @@
"description": "扩展字段"
}
]
},
{
"method": "order.print.getWavePlatformPrintData",
"title": "按波次 IDs 获取平台打印中间态数据,自动过滤快递未完全分配的波次,返回逐单中间态与按平台分组结果",
"description": "按波次 IDs 获取平台打印中间态数据,自动过滤快递未完全分配的波次,返回逐单中间态与按平台分组结果",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
"status": {
"isUsed": false,
"isPlaceholder": false
},
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "warehouse_id",
"type": "number",
"required": true,
"description": "仓库ID(必须与当前用户上下文 store_id 一致)"
},
{
"name": "wave_ids",
"type": "array",
"required": true,
"description": "波次ID列表(支持数字或字符串,内部自动去重与归一化)"
}
],
"response": [
{
"name": "summary",
"type": "object",
"required": false,
"description": "汇总信息"
},
{
"name": "wave_ids",
"type": "array",
"required": false,
"description": "通过过滤的波次ID数组"
},
{
"name": "platform_groups",
"type": "array",
"required": false,
"description": "按平台分组结果"
},
{
"name": "order_list",
"type": "array",
"required": false,
"description": "逐单平台打印中间态明细"
},
{
"name": "ext",
"type": "object",
"required": false,
"description": "扩展字段"
}
]
}
]
}

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-04 09:11:04",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {
@ -233,12 +233,6 @@
"type": "array|string",
"required": false,
"description": "允许的快递编码列表(可选,支持数组/JSON/逗号分隔);系统会校验所传编码是否在可用快递列表内,非法值将导致 400 错误。"
},
{
"name": "wave_prefix",
"type": "string",
"required": false,
"description": "策略波次前缀(可选)。优先于仓库前缀;校验:长度 1-5,仅支持 A-Z0-9,保存时转大写;为空时回退仓库前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。"
}
],
"response": [
@ -401,12 +395,6 @@
"type": "array|string",
"required": false,
"description": "允许的快递编码列表(可选,支持数组/JSON/逗号分隔);系统会校验所传编码是否在可用快递列表内,非法值将导致 400 错误。"
},
{
"name": "wave_prefix",
"type": "string",
"required": false,
"description": "策略波次前缀(可选)。优先于仓库前缀;校验:长度 1-5,仅支持 A-Z0-9,保存时转大写;为空时回退仓库前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。"
}
],
"response": [
@ -485,8 +473,8 @@
},
{
"method": "order.wave.waveStrategyFetchPda",
"title": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:任务创建时生成的波次号(wave_no)使用策略的 wave_prefix(若设置)优先;若策略未设置,则根据策略类型回退到仓库级前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。前缀保存为大写;仅允许 A-Z0-9,长度 1-5。 当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"description": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:任务创建时生成的波次号(wave_no)使用策略的 wave_prefix(若设置)优先;若策略未设置,则根据策略类型回退到仓库级前缀(团购->group_wave_prefix,散单->delete_order_wave_prefix)。前缀保存为大写;仅允许 A-Z0-9,长度 1-5。 当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"title": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"description": "按策略提交并创建抓取主流程任务(PDA)。当前为最小主流程:进行入参校验并创建任务记录,返回创建结果与计划预览;后续扫描/执行阶段将扩展为完整执行流。 注意:当存在未完成任务时,接口返回 fetch_state=3 且同时返回 existing task_id/task_no,前端可直接进入拣货流程。",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-09 09:52:14",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {
@ -25,7 +25,9 @@
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"paramsUpdatedMethods": [
"order.wave.batchList"
],
"responseUpdatedMethods": []
}
}
@ -61,7 +63,7 @@
"name": "where",
"type": "object",
"required": false,
"description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId: - wave_id(等值) - wave_no(模糊) - wave_type(等值) - wave_status(等值,接口固定叠加状态 0/1) - creator(模糊) - logistics_name(模糊) - item_part_type(等值) - item_part(模糊) - item_snapshot_key(模糊) - item_detail_machine(模糊) - distinguish_express(等值) - total_orders_min / total_orders_max(范围) - processed_orders_min / processed_orders_max(范围) - storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。 - source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。"
"description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId: - wave_id(等值) - wave_no(模糊) - wave_type(等值) - wave_status(等值,接口固定叠加状态 0/1) - creator(模糊) - logistics_name(模糊) - item_part_type(等值) - item_part(模糊) - item_snapshot_key(模糊) - item_detail_machine(模糊) - distinguish_express(等值) - total_orders_min / total_orders_max(范围) - processed_orders_min / processed_orders_max(范围) - express_assignment_status(等值,string,可选,英文枚举,取值:unassigned、partially_assigned、assigned;语义:按快递分配聚合判断,assigned 表示聚合后全部 fin,partially_assigned 表示部分已分配且不含 error,unassigned 表示全 none 或包含 error(异常并入未分配集合))。 - print_assignment_status(等值,string,可选,英文枚举,取值:unprinted、partially_printed、printed;语义:按打印分配聚合判断,printed 表示聚合后全部已打印)。 - storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。 - source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。 说明:express_assignment_status 与 print_assignment_status 要求使用英文枚举值;storage_assignment_status 仍向后兼容中文展示值。若传入的枚举值不在允许集合内,接口会返回 400(参数校验失败),并在 message 中说明错误字段与允许取值。"
}
],
"response": [

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-04 17:23:48",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-17 19:37:49",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-17 20:21:27",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-17 19:16:50",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-04 09:11:04",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-05-11 16:08:50",
"updatedAt": "2026-05-12 09:13:18",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-05-11 16:08:50",
"generatedAtLocal": "2026-05-11 16:08:50",
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {

View File

@ -1 +1,56 @@
{}
{
"generatedAt": "2026-05-12 09:13:18",
"generatedAtLocal": "2026-05-12 09:13:18",
"source": "remote",
"filter": {
"platform": {
"value": "web",
"label": "网页端"
},
"project": {
"value": "all",
"label": "全部"
}
},
"summary": {
"moduleAdded": 0,
"moduleDeleted": 0,
"interfaceAdded": 1,
"interfaceDeleted": 0,
"interfaceParamsUpdated": 3,
"interfaceResponseUpdated": 0,
"totalChangedItems": 4
},
"interfaceUpdates": {
"added": [
{
"moduleName": "订单打印模块",
"moduleKey": "order.print",
"folder": "order.print",
"method": "order.print.getWavePlatformPrintData"
}
],
"deleted": [],
"paramsUpdated": [
{
"moduleName": "订单波次模块",
"moduleKey": "order.wave",
"folder": "order.wave",
"method": "order.wave.waveStrategyCreate"
},
{
"moduleName": "订单波次模块",
"moduleKey": "order.wave",
"folder": "order.wave",
"method": "order.wave.waveStrategyUpdate"
},
{
"moduleName": "order.wave",
"moduleKey": "order",
"folder": "order",
"method": "order.wave.batchList"
}
],
"responseUpdated": []
}
}