diff --git a/dist.tar.gz b/dist.tar.gz index daaa0240..2e774db0 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index f0f9c5ae..4226a3e5 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -57,12 +57,73 @@ export type QueryOrderLogListParams = { orderId?: string | number } +/** order.updateExpressWeighingWeight 请求参数 */ export type UpdateExpressWeighingWeightParams = { + /** 订单 ID;正整数为订单模式,0 为运单号模式(需配合 waybill_code) */ order_id: number | string + /** 运单号;多运单订单必填,运单号模式(order_id=0)必填 */ waybill_code?: string + /** 称重重量(kg),必须大于 0,最多 3 位小数 */ weighing_weight: number | string } +/** order.updateExpressWeighingWeight 团购拆单明细项 */ +export type UpdateExpressWeighingWeightSplitItem = { + business_key: string + weighing_weight: number + waybill_code: string +} + +/** order.updateExpressWeighingWeight 响应 data */ +export type UpdateExpressWeighingWeightResponse = { + order_id?: number + waybill_code?: string + weighing_weight: number + wave_no?: string + business_key?: string + wave_id?: number + total_weight?: number + split_count?: number + splits?: UpdateExpressWeighingWeightSplitItem[] + store_name?: string + sys_logistics_name?: string +} + +/** order.detail 请求参数 */ +export type OrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + +/** order.detail 运单信息项 */ +export type OrderDetailExpressItem = { + waybill_code?: string + weighing_weight?: number | null + sys_logistics_code?: string + sys_logistics_name?: string + logistics_code?: string + logistics_name?: string + logistics_interface_id?: number | null + business_key?: string + created_at?: number | null +} + +/** order.detail 响应 data */ +export type OrderDetailPayload = { + order?: Record + detail?: Record + orderItems?: any[] + items?: any[] + expresses?: OrderDetailExpressItem[] + waybill_codes?: string[] +} + export type BindExpressPackageMaterialParams = { order_id: number | string waybill_code: string @@ -224,8 +285,8 @@ export function orderExportTaskProgress(data: OrderExportTaskProgressParams): Pr } as any) } -/** 订单明细行(历史接口 order.detail,未纳入远端 module 清单) */ -export function orderDetail(data: Record = {}): Promise { +/** order.detail:查询单个订单详情,返回订单头、商品明细和运单信息 */ +export function orderDetail(data: OrderDetailParams = {}): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/order.recheckorder/recheckOrder.ts b/src/api/order.recheckorder/recheckOrder.ts index e235a071..8373ec05 100644 --- a/src/api/order.recheckorder/recheckOrder.ts +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -1,4 +1,8 @@ import request from '@/utils/request' +import { + orderUpdateExpressWeighingWeight, + type UpdateExpressWeighingWeightParams +} from '@/api/order.index/orderindex' const v = '1.0' @@ -167,21 +171,9 @@ export const orderRecheckOrder = { confirmIntercept } -/** order.updateExpressWeighingWeight:更新订单运单称重重量 */ -export function updateExpressWeighingWeight(data: { - order_id: number | string - waybill_code?: string - weighing_weight: number | string -}) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'order.updateExpressWeighingWeight', - v, - timestamp: Date.now() - }, - data, - isSystemApi: true - } as any) +export type { UpdateExpressWeighingWeightParams } + +/** @deprecated 请使用 orderUpdateExpressWeighingWeight from @/api/order.index/orderindex */ +export function updateExpressWeighingWeight(data: UpdateExpressWeighingWeightParams) { + return orderUpdateExpressWeighingWeight(data) } diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 0cdfa494..a591adc0 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -29,7 +29,13 @@
-