diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index e0469f2b..ca31b726 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -248,6 +248,72 @@ export function orderDeliveryOrderDetail(data: DeliveryOrderDetailParams): Promi * order.deliveryOrder.quickSearch:按关键词跨表联合搜索(运单号/发货单号/外部订单号/平台交易单号) * 工单页「发起售后单-关联订单-选择订单」使用;联合查询较慢,超时时间延长至 20 秒(axios 默认 10 秒) */ +/** + * order.deliveryOrder.summary:配送订单每日汇总 + * + * - 以自然日为维度统计订单量 / 迁入配送表订单量 / 发货量 / 拦截 / 取消 + * - 仓库取自登录上下文;可选 store_id 按货主过滤 + * - 默认最近 7 个自然日(含今天),单次最多 90 天,区间内无数据的日期补 0 + */ +export type DeliveryOrderSummaryParams = { + /** 开始日期 yyyy-MM-dd,缺省为结束日往前 6 天 */ + start_date?: string + /** 结束日期 yyyy-MM-dd,缺省为今天 */ + end_date?: string + /** 货主ID过滤,不传或 <=0 表示不按货主过滤 */ + store_id?: number +} + +/** 每日汇总中的一天统计行 */ +export type DeliveryOrderSummaryItem = { + /** 统计日期 yyyy-MM-dd */ + date: string + /** 当日订单量 */ + order_count: number + /** 当日迁入配送表订单量 */ + dispatch_count: number + /** 当日发货订单数 */ + shipped_count: number + /** 当日发货商品件数 */ + shipped_items_total: number + /** 当日发货金额 */ + shipped_amount: number + /** 当日拦截数量 */ + intercepted_count: number + /** 当日库内确定拦截数量 */ + intercepted_at_warehouse_count: number + /** 当日取消数量 */ + cancelled_count: number +} + +/** 区间合计(字段口径与 list 中对应字段相同) */ +export type DeliveryOrderSummaryTotals = Omit + +/** order.deliveryOrder.summary 响应(data 位于顶层) */ +export type DeliveryOrderSummaryPayload = { + warehouse_id: number + store_id: number | null + start_date: string + end_date: string + day_count: number + list: DeliveryOrderSummaryItem[] + summary: DeliveryOrderSummaryTotals +} + +export function orderDeliveryOrderSummary(data: DeliveryOrderSummaryParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.deliveryOrder.summary', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export function orderDeliveryOrderQuickSearch(keyword: string): Promise { return request({ url: '/system', @@ -268,4 +334,5 @@ export const orderDeliveryOrder = { list: orderDeliveryOrderList, detail: orderDeliveryOrderDetail, quickSearch: orderDeliveryOrderQuickSearch, + summary: orderDeliveryOrderSummary, } diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index e717458f..74f8a61b 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -58,6 +58,12 @@ export type WavePickTaskListParams = { keyword?: string start_time_start?: string start_time_end?: string + /** 完成时间范围(时间筛选模式为「完成时间」时传递) */ + finish_time_start?: string + finish_time_end?: string + /** 创建时间范围(时间筛选模式为「创建时间」时传递) */ + create_time_start?: string + create_time_end?: string /** 兼容历史 where 结构(当存在顶层同名参数时顶层优先);本页仅用于承载文档未列出的 operator_name(操作人) */ where?: Record /** 接口文档标注:当前主表未存该字段、会被忽略,建议勿使用 */ diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index ac2e7c25..76e1ed40 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -38,7 +38,7 @@
-