1
This commit is contained in:
parent
afe4298997
commit
cf119f7ff3
@ -2,68 +2,164 @@ import request from '@/utils/request'
|
||||
|
||||
const v = '1.0'
|
||||
|
||||
/** order.packing.list 查询参数 */
|
||||
/** 打包任务列表分页参数 */
|
||||
export type PackingListPagination = {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}
|
||||
|
||||
export type PackingListWhere = Record<string, unknown> & {
|
||||
status?: number
|
||||
pack_mode?: number
|
||||
waybill_code?: string
|
||||
wave_no?: string
|
||||
order_id?: number
|
||||
workbench_id?: number
|
||||
quickWhere?: string
|
||||
start_time_start?: string
|
||||
start_time_end?: string
|
||||
}
|
||||
|
||||
export type PackingListSort = {
|
||||
sortField?: string
|
||||
sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC'
|
||||
}
|
||||
|
||||
/** 打包任务列表查询参数 */
|
||||
export type PackingListParams = {
|
||||
/** 仓库ID(按仓库维度查询;后端会从登录态注入,前端可不传) */
|
||||
warehouse_id?: number | string
|
||||
pagination?: PackingListPagination
|
||||
where?: PackingListWhere
|
||||
sort?: PackingListSort
|
||||
}
|
||||
|
||||
/** order.packing.list:打包任务列表查询(仓库侧) */
|
||||
export function packingList(data: PackingListParams = {}): Promise<any> {
|
||||
/** 打包任务列表 where 条件 */
|
||||
export type PackingListWhere = {
|
||||
/** 任务状态:0=待处理 1=打包中 2=已完成 3=异常 */
|
||||
status?: number | string
|
||||
/** 打包模式:1=散单 2=团购 */
|
||||
pack_mode?: number | string
|
||||
/** 运单号(模糊匹配) */
|
||||
waybill_code?: string
|
||||
/** 波次号(模糊匹配) */
|
||||
wave_no?: string
|
||||
/** 订单ID(精确匹配) */
|
||||
order_id?: number | string
|
||||
/** 打包员名称(对应响应 operator_text,支持模糊/包含/精确) */
|
||||
operator_text?: string
|
||||
/** 工作台ID(精确匹配) */
|
||||
workbench_id?: number | string
|
||||
/** 快捷搜索:运单号/波次号模糊匹配 */
|
||||
quickWhere?: string
|
||||
/** 开始打包时间范围-起始 */
|
||||
start_time_start?: string
|
||||
/** 开始打包时间范围-结束 */
|
||||
start_time_end?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务列表排序 */
|
||||
export type PackingListSort = {
|
||||
sortField?: string
|
||||
sortOrder?: 'ASC' | 'DESC' | 'asc' | 'desc'
|
||||
}
|
||||
|
||||
/** 打包任务录像项 */
|
||||
export type PackingVideoItem = {
|
||||
id?: number
|
||||
video_url?: string
|
||||
status?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务运单关联项 */
|
||||
export type PackingExpressItem = {
|
||||
id?: number
|
||||
express_id?: number
|
||||
waybill_code?: string
|
||||
logistics_name?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务列表项 / 详情对象(get/list 同构,字段以最新接口为准) */
|
||||
export type PackingTaskItem = {
|
||||
id?: number
|
||||
order_id?: number | string
|
||||
warehouse_id?: number | string
|
||||
workbench_id?: number | string
|
||||
wave_id?: number | string
|
||||
wave_no?: string
|
||||
waybill_code?: string
|
||||
/** 打包数量 */
|
||||
pack_quantity?: number
|
||||
/** 商品数量 */
|
||||
item_quantity?: number
|
||||
/** SKU 数 */
|
||||
sku_count?: number
|
||||
/** 打包模式:1=散单 2=团购 */
|
||||
pack_mode?: number | string
|
||||
/** 任务状态:0=待处理 1=打包中 2=已完成 3=异常 */
|
||||
status?: number | string
|
||||
start_time?: string
|
||||
end_time?: string
|
||||
/** 打包员(展示文本) */
|
||||
operator_text?: string
|
||||
/** 关联设备ID列表 */
|
||||
device_ids?: number[]
|
||||
remark?: string
|
||||
/** 扩展元信息 */
|
||||
meta?: Record<string, unknown> | null
|
||||
create_time?: string
|
||||
update_time?: string
|
||||
/** 工作台名称(关联展示) */
|
||||
workbench_name?: string
|
||||
/** 工作台类型 */
|
||||
workbench_type?: string
|
||||
/** 是否含录像 */
|
||||
has_video?: boolean | number
|
||||
/** 录像是否可用 */
|
||||
video_enable?: boolean | number
|
||||
/** 录像列表 */
|
||||
videos?: PackingVideoItem[]
|
||||
/** 关联运单列表 */
|
||||
expresses?: PackingExpressItem[]
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务列表响应 */
|
||||
export type PackingListResponse = {
|
||||
list: PackingTaskItem[]
|
||||
pagination: PackingListPagination & {
|
||||
total?: number
|
||||
totalPages?: number
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 打包任务列表查询(仓库侧)
|
||||
* 按仓库维度查询 wms_pack_task 表,支持分页、筛选、排序
|
||||
*/
|
||||
export function packingList(data: PackingListParams = {}): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingListResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.list',
|
||||
v,
|
||||
timestamp: new Date().getTime(),
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.packing.get 请求参数 */
|
||||
export type PackingDetailParams = {
|
||||
/** 打包任务ID(必填) */
|
||||
id: number
|
||||
}
|
||||
|
||||
/** order.packing.get:打包任务详情查询(仓库侧) */
|
||||
export function packingDetail(data: PackingDetailParams): Promise<any> {
|
||||
/**
|
||||
* 打包任务详情查询(仓库侧)
|
||||
* 按打包任务ID + 仓库维度查询单条打包任务记录
|
||||
*/
|
||||
export function packingGet(id: number): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingTaskItem
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.get',
|
||||
v,
|
||||
timestamp: new Date().getTime(),
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
data: { id },
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
@ -71,7 +167,7 @@ export function packingDetail(data: PackingDetailParams): Promise<any> {
|
||||
export type PackingSetEndTimeParams = {
|
||||
/** 打包任务ID(必填) */
|
||||
id: number
|
||||
/** 结束时间 ISO 8601 格式(必填)。前端默认值:若任务已有结束时间→当前时间;无结束时间→开始时间+5分钟 */
|
||||
/** 结束时间(ISO 8601 格式,如 2026-07-27T11:00:00.000Z,必填) */
|
||||
end_time: string
|
||||
}
|
||||
|
||||
@ -82,18 +178,25 @@ export type PackingSetEndTimeResponse = {
|
||||
status: number
|
||||
}
|
||||
|
||||
/** order.packing.setEndTime:设置打包任务结束时间。若任务状态不是已完成则同步更新状态。 */
|
||||
export function packingSetEndTime(data: PackingSetEndTimeParams): Promise<PackingSetEndTimeResponse> {
|
||||
/**
|
||||
* 设置打包任务结束时间
|
||||
* 若任务状态不是已完成(2),则同步更新状态为已完成
|
||||
*/
|
||||
export function packingSetEndTime(data: PackingSetEndTimeParams): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingSetEndTimeResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.setEndTime',
|
||||
v,
|
||||
timestamp: new Date().getTime(),
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
@ -107,36 +210,48 @@ export type PackingForceRecordParams = {
|
||||
export type PackingForceRecordResponse = {
|
||||
pack_task_id: number
|
||||
computer_id: number
|
||||
print_service_url: string
|
||||
print_service_request: { pack_task_id: number }
|
||||
print_service_response: { status: number; headers: Record<string, unknown>; data: unknown }
|
||||
/** 录制电脑的打印服务地址(后端返回,便于排查) */
|
||||
print_service_url?: string
|
||||
/** 推送给打印服务的请求体 */
|
||||
print_service_request?: { pack_task_id: number }
|
||||
/** 打印服务响应 */
|
||||
print_service_response?: {
|
||||
status: number
|
||||
headers: Record<string, unknown>
|
||||
data: unknown
|
||||
}
|
||||
/** 打印服务调用失败时的错误信息 */
|
||||
print_service_error?: string | null
|
||||
}
|
||||
|
||||
/** order.packing.forceRecord:强制重新录制打包任务视频。将任务推送到录制电脑,通过打印服务触发重新录制。 */
|
||||
export function packingForceRecord(data: PackingForceRecordParams): Promise<PackingForceRecordResponse> {
|
||||
/**
|
||||
* 强制重新录制打包任务视频
|
||||
* 将任务推送到录制电脑,通过打印服务触发重新录制
|
||||
*/
|
||||
export function packingForceRecord(data: PackingForceRecordParams): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingForceRecordResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.forceRecord',
|
||||
v,
|
||||
timestamp: new Date().getTime(),
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.packing.export 请求参数(where/sort 语义与 order.packing.list 一致;warehouse_id 由服务端从 ctx.user.store_id 注入,禁止前端传入) */
|
||||
/** order.packing.export 请求参数(where/sort 语义与 order.packing.list 一致;warehouse_id 由服务端注入,禁止前端传入) */
|
||||
export type PackingExportParams = {
|
||||
/** 查询条件,语义与 order.packing.list 的 where 一致(支持 {operator,value,type} 标准结构或直接值;字段含 status/pack_mode/waybill_code/wave_no/order_id/workbench_id/quickWhere/has_video/video_enable/start_time/end_time/create_time 等);禁止传 warehouse_id/warehouseId(服务端注入) */
|
||||
where?: Record<string, unknown>
|
||||
/** 排序参数,语义与 order.packing.list 的 sort 一致:sortField 白名单 id/order_id/warehouse_id/workbench_id/wave_id/pack_quantity/pack_mode/status/start_time/end_time/create_time/update_time,sortOrder asc/desc,默认 create_time desc */
|
||||
sort?: {
|
||||
sortField?: string
|
||||
sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC'
|
||||
}
|
||||
/** 查询条件,语义与 order.packing.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入) */
|
||||
where?: Record<string, any>
|
||||
/** 排序参数:sortField + sortOrder(asc/desc) */
|
||||
sort?: PackingListSort
|
||||
}
|
||||
|
||||
/** order.packing.export 响应(提交成功即返回任务受理信息) */
|
||||
@ -149,31 +264,37 @@ export type PackingExportResponse = {
|
||||
progress: number
|
||||
/** 当前已处理记录数(打包任务条数) */
|
||||
current_count: number
|
||||
/** 总记录数(若有) */
|
||||
/** 总记录数 */
|
||||
total_count: number
|
||||
/** 任务提示信息 */
|
||||
message: string
|
||||
/** 任务执行结果(提交时为 null;后台完成后为上传信息对象,含 filename/url/fileKey/cdnUrl/cosUrl/current_count/total_count/sheet_count) */
|
||||
/** 任务执行结果(提交时为 null;完成后为上传信息对象) */
|
||||
result: Record<string, unknown> | null
|
||||
/** 失败时的错误信息(非失败时为空字符串) */
|
||||
/** 失败时的错误信息 */
|
||||
error: string
|
||||
/** 任务更新时间(Unix 毫秒时间戳) */
|
||||
update_time: number
|
||||
code?: number
|
||||
}
|
||||
|
||||
/** order.packing.export:提交打包任务导出任务(异步,返回 task_id;导出进度/下载经 order.packing.exportTaskProgress 查询)。免权限免日志免鉴权口径与 order.export 一致。 */
|
||||
export function packingExport(data: PackingExportParams = {}): Promise<PackingExportResponse> {
|
||||
/**
|
||||
* order.packing.export:提交打包任务导出任务(异步,立即返回 task_id)
|
||||
* 后台异步生成单 Sheet Excel 并上传,导出进度/下载经 order.packing.exportTaskProgress 查询;免权限免日志口径与 order.export 一致
|
||||
*/
|
||||
export function packingExport(data: PackingExportParams = {}): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingExportResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.export',
|
||||
v,
|
||||
timestamp: new Date().getTime(),
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
@ -185,42 +306,31 @@ export type PackingExportTaskProgressParams = {
|
||||
taskId?: string
|
||||
}
|
||||
|
||||
/** order.packing.exportTaskProgress 响应 */
|
||||
export type PackingExportTaskProgressResponse = {
|
||||
/** 任务 ID(缺失时为空字符串,status=not_found) */
|
||||
task_id: string
|
||||
/** 任务状态:submitted/running/success/failed/not_found */
|
||||
status: string
|
||||
/** 进度百分比(0-100) */
|
||||
progress: number
|
||||
/** 当前已处理记录数(打包任务条数) */
|
||||
current_count: number
|
||||
/** 总记录数 */
|
||||
total_count: number
|
||||
/** 任务提示信息 */
|
||||
message: string
|
||||
/** 任务执行结果对象(完成后含 filename/url/fileKey/cdnUrl/cosUrl 等;未完成或 not_found 时为 null) */
|
||||
result: Record<string, unknown> | null
|
||||
/** 失败时的错误信息(非失败时为空字符串) */
|
||||
error: string
|
||||
/** order.packing.exportTaskProgress 响应(提交态字段 + 上传完成后的 download_url) */
|
||||
export type PackingExportTaskProgressResponse = PackingExportResponse & {
|
||||
/** 任务完成后下载链接(从 result.url/cdnUrl/cosUrl/fileKey 兜底取);未完成或不存在时为空字符串 */
|
||||
download_url: string
|
||||
/** 最近一次状态更新时间(Unix 毫秒时间戳) */
|
||||
update_time: number
|
||||
code?: number
|
||||
}
|
||||
|
||||
/** order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度。免权限免日志口径与 order.exportTaskProgress 一致。 */
|
||||
export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise<PackingExportTaskProgressResponse> {
|
||||
/**
|
||||
* order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度
|
||||
* 上传完成后返回 download_url;task_id 缺失或缓存未命中时 status=not_found(正常响应);免权限免日志口径与 order.exportTaskProgress 一致
|
||||
* 状态口径 submitted → running → 数据拉取(10~30) → 关联拉取(30~55) → Excel(55~90) → 上传(92) → success(100),失败 failed + error
|
||||
*/
|
||||
export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingExportTaskProgressResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.exportTaskProgress',
|
||||
v,
|
||||
timestamp: new Date().getTime(),
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
@ -243,6 +243,52 @@ export type WaveSingleOrderFetchListParams = WaveGroupOrderFetchListParams
|
||||
|
||||
export type WaveSingleOrderFetchListResponse = WaveGroupOrderFetchListResponse
|
||||
|
||||
/**
|
||||
* order.wave.fetchableOrderCount 请求参数。
|
||||
* 统计口径与 order.wave.groupOrderFetchList 完全一致(同一候选条件 + items_hash 粗分组 + 团购阈值过滤),
|
||||
* 但**入参不同**:本接口用 stock_query 做商品模糊筛选,没有 include_sku / return_order_ids。
|
||||
*/
|
||||
export type WaveFetchableOrderCountParams = {
|
||||
/** 是否区分快递(影响分组粒度):开启后按「结构(items_hash) + 快递编码」分组,关闭(默认)仅按结构分组 */
|
||||
distinguish_express?: boolean
|
||||
/** 货主ID(仅作为筛选条件,需为非负整数) */
|
||||
store_id?: number
|
||||
/**
|
||||
* 最小同组订单数量阈值(>=)。显式传入有效非负整数且大于 0 时按传入值使用;
|
||||
* 未传入或为 0 时使用仓库配置 min_group_order_fetch_quantity(默认 13)
|
||||
*/
|
||||
same_order_quantity?: number
|
||||
/** 店铺名称(shop_nick 模糊匹配) */
|
||||
shop_name?: string
|
||||
/**
|
||||
* 商品模糊筛选:经 stock_warehouse / stock_barcodes → order_items 限定候选订单范围;
|
||||
* 未匹配到任何商品时直接返回 group_count=0 / order_count=0
|
||||
*/
|
||||
stock_query?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* order.wave.fetchableOrderCount 响应。
|
||||
* ⚠️ 与 groupOrderFetchList 的口径差异:其 pagination.total 是**分组数**,本接口 order_count 是**命中分组的订单数合计**。
|
||||
*/
|
||||
export type WaveFetchableOrderCountResponse = {
|
||||
/** 达到团购阈值的分组数(同组订单数 >= same_order_quantity) */
|
||||
group_count: number
|
||||
/**
|
||||
* 可抓取订单数合计(命中分组内订单数之和;不含未达阈值分组的订单,
|
||||
* 也不含 items_hash/items 均为空无法分组的订单)
|
||||
*/
|
||||
order_count: number
|
||||
/** 本次统计实际使用的团购阈值(入参值或仓库配置值) */
|
||||
same_order_quantity: number
|
||||
/** 参与分组统计的候选订单总数(过滤团购阈值之前,便于核对口径) */
|
||||
raw_order_count: number
|
||||
/** 当前仓库ID(取自登录上下文 ctx.user.store_id) */
|
||||
warehouse_id: number
|
||||
/** 是否区分快递(回显本次分组粒度) */
|
||||
distinguish_express: boolean
|
||||
}
|
||||
|
||||
export type WaveStrategyListParams = {
|
||||
pagination?: {
|
||||
page?: number
|
||||
@ -885,6 +931,28 @@ export function orderWaveSingleOrderFetchList(
|
||||
} as any)
|
||||
}
|
||||
|
||||
/**
|
||||
* order.wave.fetchableOrderCount:统计当前仓库团购可抓取订单数。
|
||||
* 口径与 order.wave.groupOrderFetchList 完全一致(同一候选条件 + items_hash 粗分组 + 团购阈值过滤),
|
||||
* 但不分页、不查订单明细,仅返回达到团购阈值分组的数量与组内订单数合计。
|
||||
* 用途:抓取前预检「当前可抓取订单数」,避免先拉列表才知道有没有货。
|
||||
*/
|
||||
export function orderWaveFetchableOrderCount(
|
||||
data: WaveFetchableOrderCountParams = {}
|
||||
): Promise<WaveFetchableOrderCountResponse & { code?: number; message?: string; data?: Partial<WaveFetchableOrderCountResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.wave.fetchableOrderCount',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
export function orderWaveWaveStrategyList(
|
||||
data: WaveStrategyListParams = {}
|
||||
): Promise<WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }> {
|
||||
@ -1272,6 +1340,7 @@ export const orderWave = {
|
||||
wavePickTaskCancelSelf: orderWaveWavePickTaskCancelSelf,
|
||||
groupOrderFetchList: orderWaveGroupOrderFetchList,
|
||||
singleOrderFetchList: orderWaveSingleOrderFetchList,
|
||||
fetchableOrderCount: orderWaveFetchableOrderCount,
|
||||
waveStrategyList: orderWaveWaveStrategyList,
|
||||
waveStrategyCreate: orderWaveWaveStrategyCreate,
|
||||
waveStrategyUpdate: orderWaveWaveStrategyUpdate,
|
||||
|
||||
@ -1,316 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
const v = '1.0'
|
||||
|
||||
/** 打包任务列表查询参数 */
|
||||
export type PackingListParams = {
|
||||
/** 仓库ID(按仓库维度查询,必填) */
|
||||
warehouse_id?: number | string
|
||||
pagination?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}
|
||||
where?: PackingListWhere
|
||||
sort?: PackingListSort
|
||||
}
|
||||
|
||||
/** 打包任务列表 where 条件 */
|
||||
export type PackingListWhere = {
|
||||
/** 任务状态:0=待处理 1=打包中 2=已完成 3=异常 */
|
||||
status?: number | string
|
||||
/** 打包模式:1=散单 2=团购 */
|
||||
pack_mode?: number | string
|
||||
/** 运单号(模糊匹配) */
|
||||
waybill_code?: string
|
||||
/** 波次号(模糊匹配) */
|
||||
wave_no?: string
|
||||
/** 订单ID(精确匹配) */
|
||||
order_id?: number | string
|
||||
/** 打包员名称(对应响应 operator_text,支持模糊/包含/精确) */
|
||||
operator_text?: string
|
||||
/** 工作台ID(精确匹配) */
|
||||
workbench_id?: number | string
|
||||
/** 快捷搜索:运单号/波次号模糊匹配 */
|
||||
quickWhere?: string
|
||||
/** 开始打包时间范围-起始 */
|
||||
start_time_start?: string
|
||||
/** 开始打包时间范围-结束 */
|
||||
start_time_end?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务列表排序 */
|
||||
export type PackingListSort = {
|
||||
sortField?: string
|
||||
sortOrder?: 'ASC' | 'DESC' | 'asc' | 'desc'
|
||||
}
|
||||
|
||||
/** 打包任务录像项 */
|
||||
export type PackingVideoItem = {
|
||||
id?: number
|
||||
video_url?: string
|
||||
status?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务运单关联项 */
|
||||
export type PackingExpressItem = {
|
||||
id?: number
|
||||
express_id?: number
|
||||
waybill_code?: string
|
||||
logistics_name?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务列表项 / 详情对象(get/list 同构,字段以最新接口为准) */
|
||||
export type PackingTaskItem = {
|
||||
id?: number
|
||||
order_id?: number | string
|
||||
warehouse_id?: number | string
|
||||
workbench_id?: number | string
|
||||
wave_id?: number | string
|
||||
wave_no?: string
|
||||
waybill_code?: string
|
||||
/** 打包数量 */
|
||||
pack_quantity?: number
|
||||
/** 商品数量 */
|
||||
item_quantity?: number
|
||||
/** SKU 数 */
|
||||
sku_count?: number
|
||||
/** 打包模式:1=散单 2=团购 */
|
||||
pack_mode?: number | string
|
||||
/** 任务状态:0=待处理 1=打包中 2=已完成 3=异常 */
|
||||
status?: number | string
|
||||
start_time?: string
|
||||
end_time?: string
|
||||
/** 打包员(展示文本) */
|
||||
operator_text?: string
|
||||
/** 关联设备ID列表 */
|
||||
device_ids?: number[]
|
||||
remark?: string
|
||||
/** 扩展元信息 */
|
||||
meta?: Record<string, unknown> | null
|
||||
create_time?: string
|
||||
update_time?: string
|
||||
/** 工作台名称(关联展示) */
|
||||
workbench_name?: string
|
||||
/** 工作台类型 */
|
||||
workbench_type?: string
|
||||
/** 是否含录像 */
|
||||
has_video?: boolean | number
|
||||
/** 录像是否可用 */
|
||||
video_enable?: boolean | number
|
||||
/** 录像列表 */
|
||||
videos?: PackingVideoItem[]
|
||||
/** 关联运单列表 */
|
||||
expresses?: PackingExpressItem[]
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 打包任务列表响应 */
|
||||
export type PackingListResponse = {
|
||||
list: PackingTaskItem[]
|
||||
pagination: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
total?: number
|
||||
totalPages?: number
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 打包任务列表查询(仓库侧)
|
||||
* 按仓库维度查询 wms_pack_task 表,支持分页、筛选、排序
|
||||
*/
|
||||
export function packingList(data: PackingListParams = {}): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingListResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.list',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/**
|
||||
* 打包任务详情查询(仓库侧)
|
||||
* 按打包任务ID + 仓库维度查询单条打包任务记录
|
||||
*/
|
||||
export function packingGet(id: number): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingTaskItem
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.get',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data: { id },
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.packing.setEndTime 请求参数 */
|
||||
export type PackingSetEndTimeParams = {
|
||||
/** 打包任务ID(必填) */
|
||||
id: number
|
||||
/** 结束时间(ISO 8601 格式,如 2026-07-27T11:00:00.000Z,必填) */
|
||||
end_time: string
|
||||
}
|
||||
|
||||
/** order.packing.setEndTime 响应 */
|
||||
export type PackingSetEndTimeResponse = {
|
||||
id: number
|
||||
end_time: string
|
||||
status: number
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置打包任务结束时间
|
||||
* 若任务状态不是已完成(2),则同步更新状态为已完成
|
||||
*/
|
||||
export function packingSetEndTime(data: PackingSetEndTimeParams): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingSetEndTimeResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.setEndTime',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.packing.forceRecord 请求参数 */
|
||||
export type PackingForceRecordParams = {
|
||||
/** 打包任务ID(必填) */
|
||||
id: number
|
||||
}
|
||||
|
||||
/** order.packing.forceRecord 响应 */
|
||||
export type PackingForceRecordResponse = {
|
||||
pack_task_id: number
|
||||
computer_id: number
|
||||
}
|
||||
|
||||
/**
|
||||
* 强制重新录制打包任务视频
|
||||
* 将任务推送到录制电脑,通过打印服务触发重新录制
|
||||
*/
|
||||
export function packingForceRecord(data: PackingForceRecordParams): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingForceRecordResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.forceRecord',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.packing.export 请求参数(where/sort 语义与 order.packing.list 一致;warehouse_id 由服务端注入,禁止前端传入) */
|
||||
export type PackingExportParams = {
|
||||
/** 查询条件,语义与 order.packing.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入) */
|
||||
where?: Record<string, any>
|
||||
/** 排序参数:sortField + sortOrder(asc/desc) */
|
||||
sort?: PackingListSort
|
||||
}
|
||||
|
||||
/** order.packing.export 响应(提交成功即返回任务受理信息) */
|
||||
export type PackingExportResponse = {
|
||||
/** 任务 ID(后端生成,格式 packing_export_{warehouseId}_{timestamp}_{random}) */
|
||||
task_id: string
|
||||
/** 任务状态:submitted/running/success/failed/not_found(提交成功时为 submitted) */
|
||||
status: string
|
||||
/** 当前进度百分比(0-100),提交时返回 0 */
|
||||
progress: number
|
||||
/** 当前已处理记录数(打包任务条数) */
|
||||
current_count: number
|
||||
/** 总记录数 */
|
||||
total_count: number
|
||||
/** 任务提示信息 */
|
||||
message: string
|
||||
/** 任务执行结果(提交时为 null;完成后为上传信息对象) */
|
||||
result: Record<string, unknown> | null
|
||||
/** 失败时的错误信息 */
|
||||
error: string
|
||||
/** 任务更新时间(Unix 毫秒时间戳) */
|
||||
update_time: number
|
||||
}
|
||||
|
||||
/**
|
||||
* order.packing.export:提交打包任务导出任务(异步,立即返回 task_id)
|
||||
* 后台异步生成单 Sheet Excel 并上传,导出进度/下载经 order.packing.exportTaskProgress 查询;免权限免日志口径与 order.export 一致
|
||||
*/
|
||||
export function packingExport(data: PackingExportParams = {}): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingExportResponse
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.export',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/** order.packing.exportTaskProgress 请求参数 */
|
||||
export type PackingExportTaskProgressParams = {
|
||||
/** 任务 ID(下划线写法,兼容) */
|
||||
task_id?: string
|
||||
/** 任务 ID(驼峰写法,兼容) */
|
||||
taskId?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度
|
||||
* 上传完成后返回 download_url;task_id 缺失或缓存未命中时 status=not_found(正常响应);免权限免日志口径与 order.exportTaskProgress 一致
|
||||
*/
|
||||
export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise<{
|
||||
code: number
|
||||
message: string
|
||||
data: PackingExportResponse & { download_url: string }
|
||||
}> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'order.packing.exportTaskProgress',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
@ -372,6 +372,12 @@ export type ReturnUnpackListWhere = {
|
||||
detail_status?: 'none_recognized' | 'partial_recognized' | 'all_recognized'
|
||||
/** 拆包人员工号ID(等值) */
|
||||
unpacker_id?: number
|
||||
/**
|
||||
* 拆包人筛选:目标列 wms_return_unpack.unpacker_name(拆包人员工号名称快照)。
|
||||
* 传 {operator:'like',value} 或直接值 → 模糊 LIKE '%值%';value 为数组时多值 LIKE 取并集;
|
||||
* 也支持 eq/ne/in/notin/between 等既有操作符
|
||||
*/
|
||||
unpacker_name?: string | string[] | { operator: string; value: any }
|
||||
/** 关联退回收到单ID(等值) */
|
||||
return_received_id?: number
|
||||
/** 货主ID(等值) */
|
||||
@ -398,7 +404,7 @@ export type ReturnUnpackListSort = {
|
||||
| 'end_time'
|
||||
| 'unpack_no'
|
||||
| 'waybill_code'
|
||||
/** 排序方向:asc / desc */
|
||||
/** 排序方向:asc / desc;默认 created_at desc */
|
||||
sortOrder?: 'asc' | 'desc'
|
||||
}
|
||||
|
||||
|
||||
@ -138,6 +138,11 @@ export type SettingWarehouseSubjectConfig = SettingWarehouseSenderConfig & {
|
||||
* 单位:秒/单,默认 3,**必须大于 0**(用于 workbench 大团购波次打包时长闸门与倒计时)
|
||||
*/
|
||||
big_group_pack_coefficient?: number
|
||||
/**
|
||||
* 散单称重是否需要打包(flag,默认 false 关闭):开启后散单称重(订单波次范围 wave_scope 非 1 大团购/3 小团购)
|
||||
* 前必须已打包完成(pack_status=fin),未打包时拒绝称重并返回错误
|
||||
*/
|
||||
single_weigh_require_pack?: boolean
|
||||
/** 拆包最大录制时长,单位:分钟,默认 5,min 1;超过上限时拆包提交的结束时间自动截断为开始时间+上限 */
|
||||
return_unpack_max_record_minutes?: number
|
||||
max_wave_quantity?: number
|
||||
@ -419,6 +424,11 @@ export function normalizeWarehouseSubjectConfig(
|
||||
? bigGroupPackCoefficient
|
||||
: 3
|
||||
|
||||
// 散单称重是否需要打包(flag,默认 false 关闭;兼容 boolean / 数字 / 字符串输入)
|
||||
const weighRequirePack = base.single_weigh_require_pack
|
||||
base.single_weigh_require_pack =
|
||||
weighRequirePack === true || weighRequirePack === 1 || weighRequirePack === '1'
|
||||
|
||||
// 默认库位(库位ID,未配置时为 null)
|
||||
const locIdRaw = base.default_location_id
|
||||
if (locIdRaw === undefined || locIdRaw === null || locIdRaw === '') {
|
||||
|
||||
@ -614,7 +614,10 @@ export type StoreWarehouseExportParams = {
|
||||
use_status?: number
|
||||
/** 仓库侧启用状态过滤(use_status 的别名,两者传一即可) */
|
||||
warehouse_use_status?: number
|
||||
/** 签约关系ID,兼容 contract_id/relation_id;导出时仅导出该签约关系 */
|
||||
/**
|
||||
* 签约关系ID,兼容 contract_id/relation_id;导出时仅导出该签约关系
|
||||
* ⚠️ 文档只声明 `number`(单条);页面「导出选中」多选时会传**数组**(前端扩展,未文档化)→ 待确认后端是否支持数组
|
||||
*/
|
||||
id?: number
|
||||
}
|
||||
|
||||
@ -638,7 +641,9 @@ export type StoreWarehouseExportResponse = {
|
||||
}
|
||||
|
||||
/** 提交货主签约列表导出任务(异步,全量导出,返回 task_id) */
|
||||
export function storeWarehouseExport(data: StoreWarehouseExportParams = {}) {
|
||||
export function storeWarehouseExport(
|
||||
data: StoreWarehouseExportParams = {}
|
||||
): Promise<StoreWarehouseExportResponse & { code?: number; data?: Partial<StoreWarehouseExportResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
@ -684,7 +689,9 @@ export type StoreWarehouseExportTaskProgressResponse = {
|
||||
}
|
||||
|
||||
/** 按 task_id 查询货主签约列表导出任务进度 */
|
||||
export function storeWarehouseExportTaskProgress(data: StoreWarehouseExportTaskProgressParams) {
|
||||
export function storeWarehouseExportTaskProgress(
|
||||
data: StoreWarehouseExportTaskProgressParams
|
||||
): Promise<StoreWarehouseExportTaskProgressResponse & { code?: number; data?: Partial<StoreWarehouseExportTaskProgressResponse> }> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
|
||||
@ -16,7 +16,8 @@ export type AsyncExportPayload = Record<string, unknown> & {
|
||||
export function useAsyncExportTask(options: {
|
||||
storageKey?: string
|
||||
submitExport: (payload: AsyncExportPayload) => Promise<unknown>
|
||||
queryProgress: (params: { task_id: string; taskId?: string }) => Promise<unknown>
|
||||
/** 进度查询入参:只传下划线写法 task_id(所有导出进度接口文档均为「task_id / taskId 二选一」,无需双写) */
|
||||
queryProgress: (params: { task_id: string }) => Promise<unknown>
|
||||
isSuccess?: (res: unknown) => boolean
|
||||
}) {
|
||||
const isSuccess = options.isSuccess || isExportApiSuccess
|
||||
@ -115,9 +116,10 @@ export function useAsyncExportTask(options: {
|
||||
async function refreshExportTaskProgress() {
|
||||
if (!exportTaskProgress.taskId) return
|
||||
try {
|
||||
// 只传下划线写法 task_id:所有 exportTaskProgress 类接口的文档均为
|
||||
// 「task_id / taskId 二选一、语义等价」,无需双写(useOrderAsyncExport 同样只传 task_id)
|
||||
const res = await options.queryProgress({
|
||||
task_id: exportTaskProgress.taskId,
|
||||
taskId: exportTaskProgress.taskId
|
||||
task_id: exportTaskProgress.taskId
|
||||
})
|
||||
if (!isSuccess(res)) {
|
||||
pollFailCount += 1
|
||||
|
||||
@ -134,7 +134,7 @@
|
||||
import { computed, nextTick, ref, watch } from 'vue'
|
||||
import { Loading, VideoCameraFilled, VideoPlay, WarningFilled } from '@element-plus/icons-vue'
|
||||
import type { VideoItem } from './VideoButton.vue'
|
||||
import type { PackingTaskItem } from '@/api/order/packing/index'
|
||||
import type { PackingTaskItem } from '@/api/order.packing/packing'
|
||||
import { getWaybill } from '../packingflow-config'
|
||||
|
||||
const props = defineProps<{
|
||||
|
||||
@ -341,7 +341,7 @@
|
||||
import { ref, reactive, computed, onMounted } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import dayjs from 'dayjs'
|
||||
import { packingList, packingGet, packingSetEndTime, packingForceRecord, packingExport, packingExportTaskProgress, type PackingTaskItem, type PackingListSort } from '@/api/order/packing/index'
|
||||
import { packingList, packingGet, packingSetEndTime, packingForceRecord, packingExport, packingExportTaskProgress, type PackingTaskItem, type PackingListSort } from '@/api/order.packing/packing'
|
||||
import {
|
||||
packingColumns,
|
||||
createAvailableFields,
|
||||
|
||||
@ -692,16 +692,32 @@ function buildWhereFromConditions(conditions: Record<string, any>) {
|
||||
const where: Record<string, any> = {}
|
||||
for (const [key, cond] of Object.entries(conditions || {})) {
|
||||
if (cond === undefined || cond === null || cond === '') continue
|
||||
// ScanBox 条件形状:{ value, operator, type };保留 operator 以免用户选的等值/多值被当成模糊
|
||||
const rawOperator = cond && typeof cond === 'object' && 'operator' in cond ? String((cond as any).operator || '') : ''
|
||||
const value = cond && typeof cond === 'object' && 'value' in cond ? cond.value : cond
|
||||
if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) continue
|
||||
|
||||
switch (key) {
|
||||
// 文本筛选:拆包单号 / 退回运单号 / 拆包人姓名
|
||||
// 文档(returnUnpack.list where):传 {operator:'like',value} 或直接值 → 模糊 LIKE '%值%';
|
||||
// value 为数组时多值 LIKE 取并集;unpacker_name 另支持 eq/ne/in/notin/between
|
||||
case 'unpack_no':
|
||||
case 'waybill_code':
|
||||
// 拆包人按姓名模糊筛选(接口文档未列 unpacker_name,待后端确认;不支持时该条件会被忽略)
|
||||
case 'unpacker_name':
|
||||
where[key] = { operator: 'like', value: String(value) }
|
||||
case 'unpacker_name': {
|
||||
// ScanBox 的「包含(contains)」= 多值输入框(换行/逗号分隔 → 数组),
|
||||
// 其在文档中对应的多值口径就是 like + 数组(多值 LIKE 取并集)
|
||||
const normalizedOp = rawOperator === 'contains' ? 'like' : rawOperator
|
||||
const operator = ['like', 'eq', 'ne', 'in', 'notin', 'between', 'notbetween'].includes(normalizedOp)
|
||||
? normalizedOp
|
||||
: 'like'
|
||||
where[key] = {
|
||||
operator,
|
||||
value: Array.isArray(value)
|
||||
? value.map((v: any) => String(v).trim()).filter((v: string) => v !== '')
|
||||
: String(value)
|
||||
}
|
||||
break
|
||||
}
|
||||
case 'unpack_date':
|
||||
where.unpack_date = { operator: 'between', value }
|
||||
break
|
||||
|
||||
@ -43,14 +43,16 @@ export const returnUnpackAvailableFields = [
|
||||
{ label: '未识别', value: 'none_recognized' },
|
||||
],
|
||||
},
|
||||
// 拆包人:按姓名模糊筛选(发送 where.unpacker_name)
|
||||
// ⚠️ 接口文档 where 仅列出 unpacker_id(工号ID,等值),unpacker_name 为响应字段,筛选键待后端确认支持
|
||||
// 拆包人:目标列 wms_return_unpack.unpacker_name(拆包人员工号名称快照)
|
||||
// 文档(returnUnpack.list where):{operator:'like',value} 或直接值 → 模糊 LIKE '%值%';
|
||||
// value 为数组时多值 LIKE 取并集;另支持 eq/ne/in/notin/between
|
||||
// 「包含」= 多值输入框(换行/逗号分隔),提交时归一为 {operator:'like', value:[...]}
|
||||
{
|
||||
value: 'unpacker_name',
|
||||
label: '拆包人',
|
||||
type: 'text',
|
||||
placeholder: '拆包人姓名模糊搜索',
|
||||
operators: ['like', 'eq'],
|
||||
operators: ['like', 'contains', 'eq'],
|
||||
defaultOperator: 'like',
|
||||
},
|
||||
{
|
||||
|
||||
@ -300,7 +300,7 @@
|
||||
v-model="groupOrderFilters.shopName"
|
||||
clearable
|
||||
placeholder="模糊匹配店铺名称"
|
||||
@keyup.enter="fetchGroupOrderList"
|
||||
@keyup.enter="searchGroupOrders"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="包含 SKU">
|
||||
@ -308,7 +308,7 @@
|
||||
v-model="groupOrderFilters.includeSku"
|
||||
clearable
|
||||
placeholder="仅保留包含该 SKU 的分组"
|
||||
@keyup.enter="fetchGroupOrderList"
|
||||
@keyup.enter="searchGroupOrders"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="区分快递" class="group-order-filters__switch">
|
||||
@ -318,12 +318,43 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item class="group-order-filters__actions">
|
||||
<el-button type="primary" :loading="groupOrderListLoading" @click="fetchGroupOrderList">查询</el-button>
|
||||
<el-button type="primary" :loading="groupOrderListLoading" @click="searchGroupOrders">查询</el-button>
|
||||
<el-button @click="resetGroupOrderFilters">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<div class="group-order-toolbar group-order-toolbar--end">
|
||||
<div class="group-order-toolbar">
|
||||
<!-- 可抓取订单数统计(order.wave.fetchableOrderCount):与下方列表同一口径,但不分页、不查明细 -->
|
||||
<div class="fetchable-order-summary">
|
||||
<el-tooltip
|
||||
placement="top"
|
||||
content="统计口径与下方列表一致(同一候选条件 + 结构分组 + 团购阈值过滤),但只统计达到团购阈值的分组;不含「包含 SKU」的分组过滤"
|
||||
>
|
||||
<span class="fetchable-order-summary__title">
|
||||
<span class="label">可抓取订单</span>
|
||||
<em v-if="fetchableOrderCountLoading" class="value is-muted">统计中…</em>
|
||||
<em v-else-if="fetchableOrderCount" class="value">{{ fetchableOrderCount.order_count }}</em>
|
||||
<em v-else class="value is-muted">—</em>
|
||||
<span class="unit">单</span>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
<span v-if="fetchableOrderCount" class="fetchable-order-summary__meta">
|
||||
命中 {{ fetchableOrderCount.group_count }} 组 · 阈值 {{ fetchableOrderCount.same_order_quantity }} · 候选 {{ fetchableOrderCount.raw_order_count }} 单
|
||||
</span>
|
||||
<span v-else-if="fetchableOrderCountError" class="fetchable-order-summary__meta is-error">
|
||||
{{ fetchableOrderCountError }}
|
||||
</span>
|
||||
<el-button
|
||||
class="fetchable-order-summary__refresh"
|
||||
size="small"
|
||||
link
|
||||
type="primary"
|
||||
:loading="fetchableOrderCountLoading"
|
||||
@click="fetchFetchableOrderCount"
|
||||
>
|
||||
刷新统计
|
||||
</el-button>
|
||||
</div>
|
||||
<el-checkbox v-model="groupOrderFilters.returnOrderIds">返回订单 ID 列表</el-checkbox>
|
||||
</div>
|
||||
|
||||
@ -970,7 +1001,8 @@ import {
|
||||
orderWaveWaveStrategyUpdate,
|
||||
orderWaveWaveStrategyList,
|
||||
orderWaveFetchTaskProgress,
|
||||
orderWaveGroupOrderFetchList
|
||||
orderWaveGroupOrderFetchList,
|
||||
orderWaveFetchableOrderCount
|
||||
} from '@/api/order.wave/orderwave'
|
||||
import { batchQuickRecheckByWave } from '@/api/order.recheckorder/recheckOrder'
|
||||
import { markWavePrintStatus } from '@/api/print/print'
|
||||
@ -987,6 +1019,7 @@ import type {
|
||||
WaveBatchRemoveExceptionOrdersResponse,
|
||||
WaveBatchRemoveExceptionOrdersTaskProgressResponse,
|
||||
WaveGroupOrderFetchListResponse,
|
||||
WaveFetchableOrderCountResponse,
|
||||
WaveFetchParams,
|
||||
WaveFetchResponse,
|
||||
WaveFetchTaskProgressResponse,
|
||||
@ -3092,10 +3125,9 @@ async function handleToggleWavePrintStatus(row: any) {
|
||||
function openGroupOrderDialog() {
|
||||
groupOrderDialogVisible.value = true
|
||||
groupOrderFilters.distinguishExpress = true
|
||||
groupOrderPagination.currentPage = 1
|
||||
groupOrderSelectionRows.value = []
|
||||
loadGroupOrderStoreOptions()
|
||||
fetchGroupOrderList()
|
||||
searchGroupOrders()
|
||||
}
|
||||
|
||||
function openSingleOrderDialog() {
|
||||
@ -3771,6 +3803,71 @@ async function fetchFallbackOrderList() {
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 可抓取订单数统计(order.wave.fetchableOrderCount) ───────────────
|
||||
// 与「可抓取团购单」列表同一口径的汇总:同一候选条件 + items_hash 粗分组 + 团购阈值过滤,
|
||||
// 但不分页、不查明细,仅返回达到闵值分组的数量与组内订单数合计。
|
||||
// ⚠️ 入参与 groupOrderFetchList 不同:没有 include_sku / return_order_ids,商品筛选走 stock_query,
|
||||
// 故本统计不含「包含 SKU」的分组过滤。
|
||||
const fetchableOrderCountLoading = ref(false)
|
||||
const fetchableOrderCount = ref<WaveFetchableOrderCountResponse | null>(null)
|
||||
const fetchableOrderCountError = ref('')
|
||||
|
||||
/** 构造 fetchableOrderCount 入参(与列表筛选共用 store_id / same_order_quantity / shop_name / distinguish_express) */
|
||||
function buildFetchableOrderCountPayload() {
|
||||
const payload: Record<string, any> = {
|
||||
distinguish_express: groupOrderFilters.distinguishExpress
|
||||
}
|
||||
|
||||
if (
|
||||
groupOrderFilters.storeId !== undefined &&
|
||||
groupOrderFilters.storeId !== null &&
|
||||
groupOrderFilters.storeId !== ''
|
||||
) {
|
||||
payload.store_id = Number(groupOrderFilters.storeId)
|
||||
}
|
||||
if (groupOrderFilters.sameOrderQuantity !== undefined && groupOrderFilters.sameOrderQuantity !== null) {
|
||||
payload.same_order_quantity = Number(groupOrderFilters.sameOrderQuantity)
|
||||
}
|
||||
if (groupOrderFilters.shopName.trim()) {
|
||||
payload.shop_name = groupOrderFilters.shopName.trim()
|
||||
}
|
||||
|
||||
return payload
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计当前仓库团购可抓取订单数(不分页、不查明细)。
|
||||
* 失败不影响列表,仅在统计条内提示,不弹 toast。
|
||||
*/
|
||||
async function fetchFetchableOrderCount() {
|
||||
fetchableOrderCountLoading.value = true
|
||||
fetchableOrderCountError.value = ''
|
||||
try {
|
||||
const res = await orderWaveFetchableOrderCount(buildFetchableOrderCountPayload()) as
|
||||
WaveFetchableOrderCountResponse & { code?: number; message?: string; data?: Partial<WaveFetchableOrderCountResponse> }
|
||||
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
|
||||
) as WaveFetchableOrderCountResponse
|
||||
fetchableOrderCount.value = payload
|
||||
} catch (error: any) {
|
||||
console.error('fetch fetchable order count failed:', error)
|
||||
fetchableOrderCount.value = null
|
||||
fetchableOrderCountError.value = error?.message || '统计可抓取订单数失败'
|
||||
} finally {
|
||||
fetchableOrderCountLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 筛选变化统一入口:回到第 1 页重查列表,并同步刷新可抓取订单数统计 */
|
||||
function searchGroupOrders() {
|
||||
groupOrderPagination.currentPage = 1
|
||||
fetchGroupOrderList()
|
||||
fetchFetchableOrderCount()
|
||||
}
|
||||
|
||||
async function fetchGroupOrderList() {
|
||||
groupOrderListLoading.value = true
|
||||
try {
|
||||
@ -3804,8 +3901,7 @@ function handleGroupOrderSelectionChange(rows: any[]) {
|
||||
}
|
||||
|
||||
function handleGroupOrderFilterChange() {
|
||||
groupOrderPagination.currentPage = 1
|
||||
fetchGroupOrderList()
|
||||
searchGroupOrders()
|
||||
}
|
||||
|
||||
function resetGroupOrderFilters() {
|
||||
@ -3815,8 +3911,7 @@ function resetGroupOrderFilters() {
|
||||
groupOrderFilters.shopName = ''
|
||||
groupOrderFilters.includeSku = ''
|
||||
groupOrderFilters.returnOrderIds = false
|
||||
groupOrderPagination.currentPage = 1
|
||||
fetchGroupOrderList()
|
||||
searchGroupOrders()
|
||||
}
|
||||
|
||||
function handleGroupOrderPageChange(page: number) {
|
||||
@ -4262,6 +4357,62 @@ async function submitFallbackOrderFetchByIds() {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
/* 可抓取订单数统计条(order.wave.fetchableOrderCount) */
|
||||
.fetchable-order-summary {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
|
||||
&__title {
|
||||
display: inline-flex;
|
||||
align-items: baseline;
|
||||
gap: 4px;
|
||||
cursor: help;
|
||||
|
||||
.label {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.value {
|
||||
font-size: 18px;
|
||||
font-style: normal;
|
||||
font-weight: 600;
|
||||
line-height: 1;
|
||||
color: var(--el-color-primary);
|
||||
|
||||
&.is-muted {
|
||||
font-size: 13px;
|
||||
font-weight: 400;
|
||||
color: #909399;
|
||||
}
|
||||
}
|
||||
|
||||
.unit {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
}
|
||||
|
||||
&__meta {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-error {
|
||||
color: var(--el-color-danger);
|
||||
}
|
||||
}
|
||||
|
||||
&__refresh {
|
||||
margin-left: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
.group-order-pagination {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
@ -1329,6 +1329,8 @@ async function handleExportSelected() {
|
||||
}
|
||||
await listExportSubmit({
|
||||
...(currentCondition.value || {}),
|
||||
// ⚠️ 文档(storeWarehouse.store.export)的 id 只声明 number(“仅导出该签约关系”);
|
||||
// 多选时传数组属前端扩展,若后端不支持可能被忽略(退化为按筛选条件全量导出)→ 待后端确认
|
||||
id: ids.length === 1 ? ids[0] : ids
|
||||
})
|
||||
}
|
||||
|
||||
@ -320,6 +320,22 @@ const FALLBACK_FIELDS: NormalizedField[] = [
|
||||
required: false,
|
||||
description: '订单备注命中任一关键字时,跳过自动分配快递,默认 [](不排除任何订单)'
|
||||
},
|
||||
{
|
||||
key: 'single_weigh_require_pack',
|
||||
label: '散单称重需要打包',
|
||||
type: 'boolean',
|
||||
default: false,
|
||||
description: '默认关闭;开启后散单称重(订单波次范围 wave_scope 非 1 大团购/3 小团购)前必须已打包完成(pack_status=fin),未打包时拒绝称重并返回错误'
|
||||
},
|
||||
{
|
||||
key: 'big_group_pack_coefficient',
|
||||
label: '大团购打包系数(秒/单)',
|
||||
type: 'number',
|
||||
min: 0.1,
|
||||
step: 0.1,
|
||||
default: 3,
|
||||
description: '大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒;默认 3,必须大于 0,允许小数'
|
||||
},
|
||||
{
|
||||
key: 'default_location_id',
|
||||
label: '默认库位ID',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user