From 8e0b5211e3d85dc8c4fc7883000ac14e3e8094ab Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 19 Jun 2026 16:11:03 +0800 Subject: [PATCH] 1 --- src/api/order.print/orderprint.ts | 20 -- src/components/BatchReceivingPrintDialog.vue | 134 ++++++++- .../waveOrder/GroupWaveBatchListPanel.vue | 218 ++++++++++---- .../waveOrder/SandanWaveBatchListPanel.vue | 271 ++++++++++++++---- .../order/waveOrder/config/wave-config.ts | 128 +++++---- .../system/setting/printTemplate/index.vue | 10 +- 6 files changed, 583 insertions(+), 198 deletions(-) diff --git a/src/api/order.print/orderprint.ts b/src/api/order.print/orderprint.ts index 0d0c000b..fa8c980c 100644 --- a/src/api/order.print/orderprint.ts +++ b/src/api/order.print/orderprint.ts @@ -2,11 +2,6 @@ import request from '@/utils/request' const v = '1.0' -export type GetWavePrintDataParams = { - warehouse_id: number - wave_ids: Array -} - /** 接口文档:summary / wave_list / ext;wave_list 单项结构由后端定义 */ export type WavePrintDataPayload = { summary?: Record @@ -49,21 +44,6 @@ export type WavePlatformPrintDataPayload = { ext?: Record } -/** 按波次 IDs 获取订单打印数据(order.print.getWavePrintData) */ -export function getWavePrintData(data: GetWavePrintDataParams) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'order.print.getWavePrintData', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} - /** 按波次 IDs 获取平台打印中间态数据(order.print.getWavePlatformPrintData) */ export function getWavePlatformPrintData(data: GetWavePlatformPrintDataParams) { return request({ diff --git a/src/components/BatchReceivingPrintDialog.vue b/src/components/BatchReceivingPrintDialog.vue index 4537f543..f72786e2 100644 --- a/src/components/BatchReceivingPrintDialog.vue +++ b/src/components/BatchReceivingPrintDialog.vue @@ -175,9 +175,8 @@ const visible = computed({ }) const dialogTitle = computed(() => props.dialogTitle || '批量打印收货单') const printDialogBodyStyle = { - overflow: 'hidden', - height: 'calc(80vh - 88px)', - boxSizing: 'border-box' + padding: '0', + overflow: 'hidden' } as const const printing = ref(false) @@ -291,10 +290,97 @@ function getStatusLabel(rowId: string | number) { return '待打印' } -function getPreviewValue(item: any): string { - if (item.field_code && printForm[item.field_code] !== undefined && printForm[item.field_code] !== '') { - return String(printForm[item.field_code]) +/** 判断是否为时间相关字段 */ +function _isTimeField(fieldCode: string): boolean { + const timeFields = ['create_at', 'created_at', 'order_create_time', 'print_time', 'update_at', 'updated_at', 'place_order_time', 'pay_time', 'operate_time'] + return timeFields.includes(fieldCode) +} + +/** 判断字符串是否像 ISO 日期格式 */ +function _looksLikeISODate(val: string): boolean { + return /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(val) +} + +/** ISO 日期 → YYYY-MM-DD HH:mm:ss */ +function _fmtISODate(val: string): string { + try { + const d = new Date(val) + if (isNaN(d.getTime())) return val + const pad = (n: number) => String(n).padStart(2, '0') + return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}` + } catch { + return val } +} + +function getPreviewValue(item: any): string { + // 有 field_code 时优先从 printForm 取值 + if (item.field_code) { + + // 处理 suffix_fields:将主字段 + 后缀字段拼接 + if (Array.isArray(item.suffix_fields) && item.suffix_fields.length > 0) { + const parts: string[] = [] + const mainVal = printForm[item.field_code] + if (mainVal !== undefined && mainVal !== null && String(mainVal).trim() !== '') { + parts.push(String(mainVal).trim()) + } + item.suffix_fields.forEach((sf: string) => { + const sv = printForm[sf] + if (sv !== undefined && sv !== null && String(sv).trim() !== '') { + parts.push(String(sv).trim()) + } + }) + if (parts.length > 0) { + const separator = item.separator || '' + return parts.join(separator) + } + } + + // 普通字段取值 + const raw = printForm[item.field_code] + if (raw !== undefined && raw !== null && String(raw).trim() !== '') { + const val = String(raw) + // 时间字段自动格式化 ISO → YYYY-MM-DD HH:mm:ss + if (_isTimeField(item.field_code) && _looksLikeISODate(val)) { + return _fmtISODate(val) + } + return val + } + + // express_code / waybill_code 为空时尝试多来源回退 + if (item.field_code === 'express_code' || item.field_code === 'waybill_code') { + // 1) 交叉回退:express_code ↔ waybill_code(两个字段在 printForm 顶层互换取值) + const peerField = item.field_code === 'express_code' ? 'waybill_code' : 'express_code' + const peerVal = printForm[peerField] + if (peerVal !== undefined && peerVal !== null && String(peerVal).trim() !== '') { + return String(peerVal).trim() + } + console.log("printForm",JSON.stringify(printForm)); + // 2) 先试 expresses 数组 + const expresses = printForm.expresses + if (Array.isArray(expresses) && expresses.length > 0) { + const code = expresses[0]?.waybill_code || expresses[0]?.express_code + if (code) return String(code) + } + // 3) 再试 details 中第一条的 expresses + const details = printForm.details + if (Array.isArray(details) && details.length > 0) { + const firstDetail = details[0] + if (firstDetail) { + const dExpresses = firstDetail.expresses + if (Array.isArray(dExpresses) && dExpresses.length > 0) { + const code = dExpresses[0]?.waybill_code || dExpresses[0]?.express_code + if (code) return String(code) + } + // 直接取运单号字段 + const directCode = firstDetail.express_code || firstDetail.waybill_code || firstDetail.waybill_no + if (directCode && String(directCode).trim()) return String(directCode).trim() + } + } + } + } + + // 回退到模板预设内容 return item.content || '' } @@ -387,6 +473,18 @@ async function loadPrintFormData(index: number) { formData[f] = '' }) + // 从 mainRow 传播 express_code / waybill_code / expresses 到 formData + // 这些字段不在 printFormConfig 中,但打印模板可能需要 + if (mainRow.express_code !== undefined) { + formData.express_code = mainRow.express_code + } + if (mainRow.waybill_code !== undefined) { + formData.waybill_code = mainRow.waybill_code + } + if (Array.isArray(mainRow.expresses)) { + formData.expresses = [...mainRow.expresses] + } + try { const res: any = await receivingApi.getReceivingDetail({ id: mainRow.id, @@ -422,6 +520,18 @@ async function loadPrintFormData(index: number) { }) } } + + // 从 API 响应中传播运单相关信息 + const receiving = res.data.receiving || {} + if (Array.isArray(receiving.expresses)) { + formData.expresses = receiving.expresses + } + if (receiving.express_code !== undefined) { + formData.express_code = receiving.express_code + } + if (receiving.waybill_code !== undefined) { + formData.waybill_code = receiving.waybill_code + } } } catch (e) { console.error('加载打印明细失败', e) @@ -625,7 +735,8 @@ function browserPrint() { diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 1516eb35..03c3ec5b 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -872,7 +872,7 @@ import { formatWaveReviewAssignmentStatusLabel, getWaveAssignmentAggregateTagType, buildOutboundPrintQueue, - unwrapWavePrintPayload as unwrapWavePrintPayloadFromConfig, + fetchOutboundWaveList, resolveOutboundPrintRowKey } from './config/wave-config' import { safeInvoke } from '@/utils/safe-invoke' @@ -943,7 +943,8 @@ import type { WaveStrategyQuickScanTaskProgressResponse } from '@/api/order.wave/orderwave' import { useUserStore } from '@/stores/modules/user' -import { getWavePrintData, getWavePlatformPrintData } from '@/api/order.print/orderprint' +import { getWavePlatformPrintData } from '@/api/order.print/orderprint' +import { orderPendingOrderList, orderPendingOrderDetail } from '@/api/order.pendingorder/orderpendingOrder' import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint' import pcasCodeData from 'china-division/dist/pcas-code.json' @@ -1718,43 +1719,54 @@ async function handleBatchFinishAutoGrouping() { } } -function unwrapWavePrintPayload(res: any) { - const inner = - res?.data !== undefined && res?.data !== null && typeof res.data === 'object' && !Array.isArray(res.data) - ? res.data - : res - const summaryRaw = inner?.summary - const summary = - summaryRaw !== undefined && summaryRaw !== null && typeof summaryRaw === 'object' && !Array.isArray(summaryRaw) - ? (summaryRaw as Record) - : {} - const waveListRaw = inner?.wave_list - const wave_list = Array.isArray(waveListRaw) - ? (waveListRaw.filter((x) => x && typeof x === 'object') as Record[]) - : [] - const extRaw = inner?.ext - const ext = - extRaw !== undefined && extRaw !== null && typeof extRaw === 'object' && !Array.isArray(extRaw) - ? (extRaw as Record) - : undefined - return { summary, wave_list, ext } -} - -function getWaveOrders(wave: Record) { - const keys = ['orders', 'order_list', 'order_details', 'items', 'print_orders', 'order_rows', 'details'] - for (const key of keys) { - const value = wave[key] - if (Array.isArray(value)) return value +/** 格式化 ISO 时间戳为 YYYY-MM-DD HH:mm:ss */ +function formatPrintTime(val: any): string { + if (!val) return '' + try { + const d = new Date(val) + if (isNaN(d.getTime())) return String(val) + const pad = (n: number) => String(n).padStart(2, '0') + return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}` + } catch { + return String(val) } - return [] } -function toWavePrintForm(wave: Record) { - const details = getWaveOrders(wave) +/** 合并省/市/区/镇/详细地址为完整地址 */ +function mergeAddress(order: Record): string { + const parts = [order.province, order.city, order.area, order.town, order.detail_address] + .map((v: any) => (v == null ? '' : String(v).trim())) + .filter(Boolean) + return parts.join('') +} + +/** 处理单条订单的打印字段:补全 address、express_code,格式化时间 */ +function normalizePrintOrder(order: Record): Record { + // 运单号:多来源回退 + let expressCode = '' + const sources = [ + order.express_code, + order.waybill_code, + order.waybill_no, + order.tracking_number, + order.tracking_code + ] + for (const s of sources) { + if (s && String(s).trim()) { expressCode = String(s).trim(); break } + } + // 从 expresses 数组取 + if (!expressCode && Array.isArray(order.expresses) && order.expresses.length > 0) { + expressCode = order.expresses[0]?.waybill_code || order.expresses[0]?.express_code || '' + } + return { - ...wave, - wave_no: String(wave.wave_no ?? wave.batch_no ?? wave.wave_code ?? wave.id ?? '—'), - details + ...order, + address: mergeAddress(order), + express_code: expressCode, + waybill_code: expressCode, // 兼容不同模板 + create_at: formatPrintTime(order.create_at ?? order.created_at ?? order.order_create_time), + order_create_time: formatPrintTime(order.order_create_time ?? order.create_at ?? order.created_at), + print_time: formatPrintTime(new Date().toISOString()) } } @@ -1763,8 +1775,25 @@ function rowWaveKey(row: any) { } async function loadWavePrintFormData(row: any) { - const key = rowWaveKey(row) - return wavePrintDataMap.value[key] || toWavePrintForm(row || {}) + // 尝试多种 key 匹配 + const keys = [ + rowWaveKey(row), + String(row?.wave_id ?? ''), + String(row?.id ?? ''), + String(row?.wave_no ?? ''), + ].filter(k => k) + + const map = wavePrintDataMap.value + for (const k of keys) { + if (map[k]) return map[k] + } + + // 如果 map 只有一条数据,直接返回 + const values = Object.values(map) + if (values.length === 1) return values[0] + + // 最后 fallback:对原始行数据做 normalize 处理 + return normalizePrintOrder({ ...row, details: [], expresses: row.expresses || [] }) } async function openBatchPrintDialog(rows: any[]) { @@ -1786,23 +1815,108 @@ async function openBatchPrintDialog(rows: any[]) { batchPrintLoading.value = true try { - const res: any = await getWavePrintData({ warehouse_id: warehouseId, wave_ids }) - const payload = unwrapWavePrintPayload(res) - const waveList = Array.isArray(payload.wave_list) ? payload.wave_list : [] - const nextMap: Record = {} - waveList.forEach((wave: Record) => { - const key = String(wave.id ?? wave.wave_id ?? wave.batch_id ?? wave.wave_no ?? '') - if (!key) return - nextMap[key] = toWavePrintForm(wave) + // 使用 order.pendingOrder.list 按波次 ID 直接查询订单数据 + const res: any = await orderPendingOrderList({ + pagination: { page: 1, pageSize: 9999 }, + where: { wave_id: { operator: 'in', value: wave_ids, type: 'select' } } }) + + const isSuccess = res && (res.code === 200 || res.code === 0 || res.flag === 'success') + if (!isSuccess) { + ElMessage.error(res?.message || '获取订单数据失败') + return + } + + // 兼容多种 API 响应格式:data.list / data.data / data(数组) / data.detail(单条) + let rawList: any[] = [] + const d = res.data + if (Array.isArray(d?.list)) { + rawList = d.list + } else if (Array.isArray(d?.data)) { + rawList = d.data + } else if (Array.isArray(d)) { + rawList = d + } else if (d?.detail && typeof d.detail === 'object') { + rawList = [d] + } + + if (!rawList.length) { + ElMessage.warning('未获取到波次订单数据') + return + } + + // API 返回每条记录结构可能为 { detail: {...}, items: [...], expresses: [...] } 或直接是 detail 字段 + // 提取 detail 并合并 items/expresses + let orderList = rawList.map((raw: any) => ({ + ...(raw.detail || raw), + items: raw.items || [], + expresses: raw.expresses || [] + })) + console.log('[拣货单打印] rawList[0] keys:', rawList.length > 0 ? Object.keys(rawList[0]) : 'empty') + console.log('[拣货单打印] orderList[0] has expresses:', orderList.length > 0 ? Array.isArray(orderList[0].expresses) && orderList[0].expresses.length : 'empty') + + // 通过 detail API 逐条补全运单号等完整数据(与 fetchPendingOrderDetailById 同样调用方式) + const enrichedMap: Record = {} + for (const order of orderList) { + const oid = order.id + if (oid == null) continue + try { + const detailRes = await orderPendingOrderDetail({ + id: oid, + ids: [oid], + tableType: 'order' + }) + console.log('[拣货单打印] detail API 响应:', JSON.stringify({ oid, code: detailRes?.code, flag: detailRes?.flag, hasDetail: !!detailRes?.data?.detail, hasExpresses: !!detailRes?.data?.expresses, expressCount: detailRes?.data?.expresses?.length })) + if (detailRes && (detailRes.code === 200 || detailRes.code === 0 || detailRes.flag === 'success')) { + const payload = detailRes.data?.detail || detailRes.data || detailRes + if (payload && typeof payload === 'object') { + enrichedMap[String(oid)] = { + ...payload, + items: detailRes.data?.items || payload.items || [], + expresses: detailRes.data?.expresses || payload.expresses || [] + } + } + } + } catch (e) { + console.error('[拣货单打印] detail API 异常:', e) + } + } + console.log('[拣货单打印] enrichedMap keys:', Object.keys(enrichedMap), 'enriched has expresses:', Object.values(enrichedMap).some((v: any) => Array.isArray(v.expresses) && v.expresses.length > 0)) + if (Object.keys(enrichedMap).length > 0) { + orderList = orderList.map((o: any) => { + const enriched = enrichedMap[String(o.id ?? '')] + return enriched ? { ...o, ...enriched } : o + }) + } + + // 按 wave_id 分组 + const waveGroupMap: Record = {} + orderList.forEach((order: any) => { + const wid = String(order.wave_id ?? '') + if (!wid) return + if (!waveGroupMap[wid]) waveGroupMap[wid] = [] + waveGroupMap[wid].push(order) + }) + + // 构建 wavePrintDataMap:key=wave_id, value={ ...firstOrder(已处理地址和时间), details(已处理) } + const nextMap: Record = {} + Object.entries(waveGroupMap).forEach(([wid, orders]) => { + const processedOrders = orders.map(normalizePrintOrder) + const first = processedOrders[0] + nextMap[wid] = { + ...first, + wave_no: String(first.wave_no ?? first.wave_code ?? first.batch_no ?? wid), + details: processedOrders + } + }) + wavePrintRows.value = rows.map((item: any) => ({ ...item, wave_no: String(item?.wave_no ?? item?.batch_no ?? item?.wave_code ?? item?.id ?? '—') })) wavePrintDataMap.value = nextMap wavePrintDialogVisible.value = true - const waveCount = waveList.length - ElMessage.success(res?.message || `已获取打印数据,返回 ${waveCount} 个波次`) + ElMessage.success(`已获取打印数据,共 ${orderList.length} 条订单`) } catch (error: any) { wavePrintRows.value = [] wavePrintDataMap.value = {} @@ -1878,9 +1992,11 @@ async function openBatchOutboundPrintDialog(rows: any[]) { batchOutboundPrintLoading.value = true try { - const res: any = await getWavePrintData({ warehouse_id: warehouseId, wave_ids }) - const payload = unwrapWavePrintPayloadFromConfig(res) - const waveList = Array.isArray(payload.wave_list) ? payload.wave_list : [] + const waveList = await fetchOutboundWaveList(wave_ids) + if (!waveList.length) { + ElMessage.warning('未获取到波次订单数据') + return + } const { printRows, dataMap } = buildOutboundPrintQueue(waveList, rows) if (!printRows.length) { ElMessage.warning('未获取到可打印的出库单明细,请确认波次下存在订单且快递已完全分配') @@ -1889,7 +2005,7 @@ async function openBatchOutboundPrintDialog(rows: any[]) { outboundPrintRows.value = printRows outboundPrintDataMap.value = dataMap outboundPrintDialogVisible.value = true - ElMessage.success(res?.message || `已获取出库单打印数据,共 ${printRows.length} 单`) + ElMessage.success(`已获取出库单打印数据,共 ${printRows.length} 单`) } catch (error: any) { outboundPrintRows.value = [] outboundPrintDataMap.value = {} diff --git a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue index 1e77c2df..3edc1312 100644 --- a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue @@ -465,7 +465,7 @@ import { formatWaveReviewAssignmentStatusLabel, getWaveAssignmentAggregateTagType, fetchOutboundPrintDataFromPendingOrders, - unwrapWavePrintPayload as unwrapWavePrintPayloadFromConfig, + fetchOutboundWaveList, resolveOutboundPrintRowKey } from './config/wave-config' import { safeInvoke } from '@/utils/safe-invoke' @@ -519,7 +519,8 @@ import type { } from '@/api/order.wave/orderwave' import { useUserStore } from '@/stores/modules/user' -import { getWavePrintData, getWavePlatformPrintData } from '@/api/order.print/orderprint' +import { getWavePlatformPrintData } from '@/api/order.print/orderprint' +import { orderPendingOrderList, orderPendingOrderDetail } from '@/api/order.pendingorder/orderpendingOrder' import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint' const props = withDefaults(defineProps<{ /** 与路由 path 组合,隔离 ScanBox 筛选缓存(波次各标签页须各不相同) */ @@ -727,6 +728,9 @@ const toolbarActionMap: Record void> = { openColumnConfigPanel: () => openColumnConfigPanel(), toggleDetailVisible: () => toggleDetailVisible(), handleBatchPrint: () => handleBatchPrint(), + handleBatchPrintPickingList: () => { + void handleBatchPrintPickingList() + }, handleBatchOutboundPrint: () => { void handleBatchOutboundPrint() }, @@ -1149,43 +1153,45 @@ async function handleBatchFinishAutoGrouping() { } } -function unwrapWavePrintPayload(res: any) { - const inner = - res?.data !== undefined && res?.data !== null && typeof res.data === 'object' && !Array.isArray(res.data) - ? res.data - : res - const summaryRaw = inner?.summary - const summary = - summaryRaw !== undefined && summaryRaw !== null && typeof summaryRaw === 'object' && !Array.isArray(summaryRaw) - ? (summaryRaw as Record) - : {} - const waveListRaw = inner?.wave_list - const wave_list = Array.isArray(waveListRaw) - ? (waveListRaw.filter((x) => x && typeof x === 'object') as Record[]) - : [] - const extRaw = inner?.ext - const ext = - extRaw !== undefined && extRaw !== null && typeof extRaw === 'object' && !Array.isArray(extRaw) - ? (extRaw as Record) - : undefined - return { summary, wave_list, ext } -} - -function getWaveOrders(wave: Record) { - const keys = ['orders', 'order_list', 'order_details', 'items', 'print_orders', 'order_rows', 'details'] - for (const key of keys) { - const value = wave[key] - if (Array.isArray(value)) return value +/** 格式化 ISO 时间戳为 YYYY-MM-DD HH:mm:ss */ +function formatPrintTime(val: any): string { + if (!val) return '' + try { + const d = new Date(val) + if (isNaN(d.getTime())) return String(val) + const pad = (n: number) => String(n).padStart(2, '0') + return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}` + } catch { + return String(val) } - return [] } -function toWavePrintForm(wave: Record) { - const details = getWaveOrders(wave) +/** 合并省/市/区/镇/详细地址为完整地址 */ +function mergeAddress(order: Record): string { + const parts = [order.province, order.city, order.area, order.town, order.detail_address] + .map((v: any) => (v == null ? '' : String(v).trim())) + .filter(Boolean) + return parts.join('') +} + +/** 处理单条订单的打印字段:补全 address、express_code,格式化时间 */ +function normalizePrintOrder(order: Record): Record { + let expressCode = '' + const sources = [order.express_code, order.waybill_code, order.waybill_no, order.tracking_number] + for (const s of sources) { + if (s && String(s).trim()) { expressCode = String(s).trim(); break } + } + if (!expressCode && Array.isArray(order.expresses) && order.expresses.length > 0) { + expressCode = order.expresses[0]?.waybill_code || order.expresses[0]?.express_code || '' + } return { - ...wave, - wave_no: String(wave.wave_no ?? wave.batch_no ?? wave.wave_code ?? wave.id ?? '—'), - details + ...order, + address: mergeAddress(order), + express_code: expressCode, + waybill_code: expressCode, + create_at: formatPrintTime(order.create_at ?? order.created_at ?? order.order_create_time), + order_create_time: formatPrintTime(order.order_create_time ?? order.create_at ?? order.created_at), + print_time: formatPrintTime(new Date().toISOString()) } } @@ -1194,8 +1200,14 @@ function rowWaveKey(row: any) { } async function loadWavePrintFormData(row: any) { - const key = rowWaveKey(row) - return wavePrintDataMap.value[key] || toWavePrintForm(row || {}) + const keys = [rowWaveKey(row), String(row?.wave_id ?? ''), String(row?.id ?? ''), String(row?.wave_no ?? '')].filter(k => k) + const map = wavePrintDataMap.value + for (const k of keys) { + if (map[k]) return map[k] + } + const values = Object.values(map) + if (values.length === 1) return values[0] + return normalizePrintOrder({ ...row, details: [], expresses: row.expresses || [] }) } async function handleBatchPlatformPrint() { @@ -1341,23 +1353,178 @@ async function handleBatchPrint() { batchPrintLoading.value = true try { - const res: any = await getWavePrintData({ warehouse_id: warehouseId, wave_ids }) - const payload = unwrapWavePrintPayload(res) - const waveList = Array.isArray(payload.wave_list) ? payload.wave_list : [] - const nextMap: Record = {} - waveList.forEach((wave: Record) => { - const key = String(wave.id ?? wave.wave_id ?? wave.batch_id ?? wave.wave_no ?? '') - if (!key) return - nextMap[key] = toWavePrintForm(wave) + // 使用 order.pendingOrder.list 按波次 ID 直接查询订单数据 + const res: any = await orderPendingOrderList({ + pagination: { page: 1, pageSize: 9999 }, + where: { wave_id: { operator: 'in', value: wave_ids, type: 'select' } } }) + + const isSuccess = res && (res.code === 200 || res.code === 0 || res.flag === 'success') + if (!isSuccess) { + ElMessage.error(res?.message || '获取订单数据失败') + return + } + + let rawList: any[] = [] + const d = res.data + if (Array.isArray(d?.list)) { rawList = d.list } + else if (Array.isArray(d?.data)) { rawList = d.data } + else if (Array.isArray(d)) { rawList = d } + else if (d?.detail && typeof d.detail === 'object') { rawList = [d] } + + if (!rawList.length) { + ElMessage.warning('未获取到波次订单数据') + return + } + + let orderList = rawList.map((raw: any) => ({ + ...(raw.detail || raw), + items: raw.items || [], + expresses: raw.expresses || [] + })) + + // 通过 detail API 逐条补全运单号 + const enrichedMap: Record = {} + for (const order of orderList) { + const oid = order.id + if (oid == null) continue + try { + const detailRes = await orderPendingOrderDetail({ id: oid, ids: [oid], tableType: 'order' }) + if (detailRes && (detailRes.code === 200 || detailRes.code === 0 || detailRes.flag === 'success')) { + const payload = detailRes.data?.detail || detailRes.data || detailRes + if (payload && typeof payload === 'object') { + enrichedMap[String(oid)] = { + ...payload, + items: detailRes.data?.items || payload.items || [], + expresses: detailRes.data?.expresses || payload.expresses || [] + } + } + } + } catch (e) { /* 单条失败不影响其他 */ } + } + if (Object.keys(enrichedMap).length > 0) { + orderList = orderList.map((o: any) => { + const enriched = enrichedMap[String(o.id ?? '')] + return enriched ? { ...o, ...enriched } : o + }) + } + + const waveGroupMap: Record = {} + orderList.forEach((order: any) => { + const wid = String(order.wave_id ?? '') + if (!wid) return + if (!waveGroupMap[wid]) waveGroupMap[wid] = [] + waveGroupMap[wid].push(order) + }) + + const nextMap: Record = {} + Object.entries(waveGroupMap).forEach(([wid, orders]) => { + const processedOrders = orders.map(normalizePrintOrder) + const first = processedOrders[0] + nextMap[wid] = { ...first, wave_no: String(first.wave_no ?? first.wave_code ?? first.batch_no ?? wid), details: processedOrders } + }) + wavePrintRows.value = rows.map((item: any) => ({ ...item, wave_no: String(item?.wave_no ?? item?.batch_no ?? item?.wave_code ?? item?.id ?? '—') })) wavePrintDataMap.value = nextMap wavePrintDialogVisible.value = true - const waveCount = waveList.length - ElMessage.success(res?.message || `已获取打印数据,返回 ${waveCount} 个波次`) + const hasExpress = orderList.some((o: any) => Array.isArray(o.expresses) && o.expresses.length > 0) + ElMessage.success(`已获取打印数据,共 ${orderList.length} 条订单${hasExpress ? '(含运单号)' : '(无运单号)'}`) + } catch (error: any) { + wavePrintRows.value = [] + wavePrintDataMap.value = {} + ElMessage.error(error?.message || '获取波次打印数据失败') + } finally { + batchPrintLoading.value = false + } +} + +async function handleBatchPrintPickingList() { + if (!selectionRows.value.length) { + ElMessage.warning('请先勾选要打印拣货单的波次') + return + } + const rows = [...selectionRows.value] + await handleBatchPrintInternal(rows) +} + +/** 内部打印逻辑(跳过 isGroupWaveTab 检查) */ +async function handleBatchPrintInternal(rows: any[]) { + 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 + } + + batchPrintLoading.value = true + try { + const res: any = await orderPendingOrderList({ + pagination: { page: 1, pageSize: 9999 }, + where: { wave_id: { operator: 'in', value: wave_ids, type: 'select' } } + }) + + const isSuccess = res && (res.code === 200 || res.code === 0 || res.flag === 'success') + if (!isSuccess) { ElMessage.error(res?.message || '获取订单数据失败'); return } + + let rawList: any[] = [] + const d = res.data + if (Array.isArray(d?.list)) { rawList = d.list } + else if (Array.isArray(d?.data)) { rawList = d.data } + else if (Array.isArray(d)) { rawList = d } + else if (d?.detail && typeof d.detail === 'object') { rawList = [d] } + + if (!rawList.length) { ElMessage.warning('未获取到波次订单数据'); return } + + let orderList = rawList.map((raw: any) => ({ + ...(raw.detail || raw), + items: raw.items || [], + expresses: raw.expresses || [] + })) + + const enrichedMap: Record = {} + for (const order of orderList) { + const oid = order.id + if (oid == null) continue + try { + const detailRes = await orderPendingOrderDetail({ id: oid, ids: [oid], tableType: 'order' }) + if (detailRes && (detailRes.code === 200 || detailRes.code === 0 || detailRes.flag === 'success')) { + const payload = detailRes.data?.detail || detailRes.data || detailRes + if (payload && typeof payload === 'object') { + enrichedMap[String(oid)] = { ...payload, items: detailRes.data?.items || payload.items || [], expresses: detailRes.data?.expresses || payload.expresses || [] } + } + } + } catch (e) { } + } + if (Object.keys(enrichedMap).length > 0) { + orderList = orderList.map((o: any) => { const e = enrichedMap[String(o.id ?? '')]; return e ? { ...o, ...e } : o }) + } + + const waveGroupMap: Record = {} + orderList.forEach((order: any) => { + const wid = String(order.wave_id ?? '') + if (!wid) return + if (!waveGroupMap[wid]) waveGroupMap[wid] = [] + waveGroupMap[wid].push(order) + }) + + const nextMap: Record = {} + Object.entries(waveGroupMap).forEach(([wid, orders]) => { + const p = orders.map(normalizePrintOrder) + nextMap[wid] = { ...p[0], wave_no: String(p[0].wave_no ?? p[0].wave_code ?? p[0].batch_no ?? wid), details: p } + }) + + wavePrintRows.value = rows.map((item: any) => ({ + ...item, wave_no: String(item?.wave_no ?? item?.batch_no ?? item?.wave_code ?? item?.id ?? '—') + })) + wavePrintDataMap.value = nextMap + wavePrintDialogVisible.value = true + const hasExpress = orderList.some((o: any) => Array.isArray(o.expresses) && o.expresses.length > 0) + ElMessage.success(`已获取打印数据,共 ${orderList.length} 条订单${hasExpress ? '(含运单号)' : '(无运单号)'}`) } catch (error: any) { wavePrintRows.value = [] wavePrintDataMap.value = {} @@ -1391,9 +1558,11 @@ async function openBatchOutboundPrintDialog(rows: any[]) { batchOutboundPrintLoading.value = true try { - const res: any = await getWavePrintData({ warehouse_id: warehouseId, wave_ids }) - const payload = unwrapWavePrintPayloadFromConfig(res) - const waveList = Array.isArray(payload.wave_list) ? payload.wave_list : [] + const waveList = await fetchOutboundWaveList(wave_ids) + if (!waveList.length) { + ElMessage.warning('未获取到波次订单数据') + return + } const { printRows, dataMap, missingDeliveryCodes } = await fetchOutboundPrintDataFromPendingOrders( waveList, rows, @@ -1410,7 +1579,7 @@ async function openBatchOutboundPrintDialog(rows: any[]) { `${missingDeliveryCodes.length} 个发货单号未匹配到待处理订单,已使用波次原始数据填充:${missingDeliveryCodes.slice(0, 3).join('、')}${missingDeliveryCodes.length > 3 ? '…' : ''}`, ) } - ElMessage.success(res?.message || `已获取出库单打印数据,共 ${printRows.length} 单`) + ElMessage.success(`已获取出库单打印数据,共 ${printRows.length} 单`) } catch (error: any) { outboundPrintRows.value = [] outboundPrintDataMap.value = {} diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 3533d74b..6935cb29 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -402,18 +402,18 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [ action: 'openPrinterComponentConnectionDialog', onlyForWaveType: 2 }, - // { - // key: 'batchPrintPickingList', - // label: '批量打印拣货单(0)', - // dynamicLabelKey: 'batchPickingPrintTotal', - // type: 'info', - // plain: true, - // size: 'small', - // disabledKey: 'noSelection', - // loadingKey: 'batchPrintLoading', - // action: 'handleBatchPrintPickingList', - // onlyForWaveType: 1 - // }, + { + key: 'batchPrintPickingList', + label: '批量打印拣货单(0)', + dynamicLabelKey: 'batchPickingPrintTotal', + type: 'info', + plain: true, + size: 'small', + disabledKey: 'noSelection', + loadingKey: 'batchPrintLoading', + action: 'handleBatchPrintPickingList', + onlyForWaveType: 2 + }, { key: 'batchAutoGrouping', label: '批量改为自动加团', @@ -1023,7 +1023,6 @@ export function buildOutboundPrintQueue( return { printRows, dataMap } } -const OUTBOUND_DELIVERY_CODE_QUERY_BATCH_SIZE = 20 const OUTBOUND_DETAIL_FETCH_CONCURRENCY = 8 function formatOutboundPrintDateTime(date: Date): string { @@ -1055,34 +1054,6 @@ async function runWithConcurrencyLimit( ) } -/** 按发货单号批量查询待处理订单(order.pendingOrder.list) */ -async function queryPendingOrdersByDeliveryCodes(codes: string[]): Promise[]> { - const normalizedCodes = [...new Set(codes.map((code) => String(code || '').trim()).filter(Boolean))] - if (!normalizedCodes.length) return [] - - const res: any = await orderPendingOrder.list({ - pagination: { page: 1, pageSize: Math.max(50, normalizedCodes.length * 10) }, - where: { - delivery_order_code: { - operator: 'contains', - value: normalizedCodes, - type: 'text', - }, - }, - sort: { - sortField: 'updated_at', - sortOrder: 'DESC', - }, - }) - if (!isOrderIndexApiSuccess(res)) return [] - - const targetSet = new Set(normalizedCodes) - return parseOrderListResponse(res).list.filter((order) => { - const existingCode = resolvePendingOrderDeliveryCode(order) - return existingCode && targetSet.has(existingCode) - }) -} - /** 查询单个订单详情(order.pendingOrder.detail) */ async function fetchPendingOrderDetailById(orderId: number | string): Promise | null> { const res: any = await orderPendingOrder.detail({ @@ -1186,6 +1157,8 @@ export function mapPendingOrderToOutboundPrintForm( logistics_name: order.logistics_name ?? '', express_code: String(order.express_code ?? waybillStr).trim(), waybill_codes: waybillStr, + // 传播 expresses 数组,确保打印模板能从 expresses 获取运单号 + expresses: Array.isArray(detailPayload.expresses) ? detailPayload.expresses : [], name: order.name ?? '', mobile: order.mobile ?? order.tel ?? '', tel: order.tel ?? '', @@ -1202,7 +1175,51 @@ export function mapPendingOrderToOutboundPrintForm( } /** - * 从波次打印数据提取发货单号,再通过 order.pendingOrder.list + detail 补全出库单字段与商品明细。 + * 替换 order.print.getWavePrintData: + * 通过 order.pendingOrder.list 按 wave_id 查询订单,按波次分组后返回 waveList 结构, + * 供 buildOutboundPrintQueue / fetchOutboundPrintDataFromPendingOrders 使用。 + */ +export async function fetchOutboundWaveList(wave_ids: Array): Promise[]> { + if (!wave_ids.length) return [] + + const res: any = await orderPendingOrder.list({ + pagination: { page: 1, pageSize: 9999 }, + where: { wave_id: { operator: 'in', value: wave_ids, type: 'select' } }, + }) + + if (!isOrderIndexApiSuccess(res)) return [] + + const { list: rawList } = parseOrderListResponse(res) + if (!rawList.length) return [] + + // 将列表项展开(raw.detail 合并到顶层),按 wave_id 分组 + const waveGroupMap = new Map[]>() + rawList.forEach((raw: any) => { + const order = { ...(raw.detail || raw), items: raw.items || [], expresses: raw.expresses || [] } + const wid = String(order.wave_id ?? '') + if (!wid) return + if (!waveGroupMap.has(wid)) waveGroupMap.set(wid, []) + waveGroupMap.get(wid)!.push(order) + }) + + // 构造 waveList 格式:每个 wave 对象包含 id / wave_no / orders 等字段 + const waveList: Record[] = [] + waveGroupMap.forEach((orders, wid) => { + const first = orders[0] + waveList.push({ + id: wid, + wave_id: wid, + wave_no: String(first?.wave_no ?? ''), + orders, + }) + }) + + return waveList +} + +/** + * 从 waveList 中已加载的订单直接构建 delivery_order_code → order_id 映射, + * 避免重复调用 order.pendingOrder.list。 */ export async function fetchOutboundPrintDataFromPendingOrders( waveList: Record[], @@ -1213,27 +1230,16 @@ export async function fetchOutboundPrintDataFromPendingOrders( return { ...skeleton, missingDeliveryCodes: [] } } - const deliveryCodes = [ - ...new Set( - skeleton.printRows - .map((row) => String(row.delivery_order_code ?? '').trim()) - .filter(Boolean), - ), - ] - + // 从 waveList 的 orders 中直接构建 code → orderId 映射(无需再调 list 接口) const codeToOrderId = new Map() - const batches: string[][] = [] - for (let i = 0; i < deliveryCodes.length; i += OUTBOUND_DELIVERY_CODE_QUERY_BATCH_SIZE) { - batches.push(deliveryCodes.slice(i, i + OUTBOUND_DELIVERY_CODE_QUERY_BATCH_SIZE)) - } - - await runWithConcurrencyLimit(batches, 3, async (batch) => { - const orders = await queryPendingOrdersByDeliveryCodes(batch) - orders.forEach((order) => { + waveList.forEach((wave) => { + const orders = getWaveOrders(wave) + orders.forEach((order: any) => { + if (!order || typeof order !== 'object') return const code = resolvePendingOrderDeliveryCode(order) - const orderId = order.id ?? order.order_id - if (code && orderId != null && orderId !== '') { - codeToOrderId.set(code, orderId as number | string) + const oid = order.id ?? order.order_id + if (code && oid != null && oid !== '') { + codeToOrderId.set(code, oid as number | string) } }) }) diff --git a/src/views/system/setting/printTemplate/index.vue b/src/views/system/setting/printTemplate/index.vue index 5b141c27..714faa2a 100644 --- a/src/views/system/setting/printTemplate/index.vue +++ b/src/views/system/setting/printTemplate/index.vue @@ -7,6 +7,9 @@ 模板列表 + + 刷新 + 新建 @@ -178,7 +181,7 @@ import { ref, computed, onMounted } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus' -import { Document, Folder, Plus, Delete } from '@element-plus/icons-vue' +import { Document, Folder, Plus, Delete, Refresh } from '@element-plus/icons-vue' import TemplateEditor from './components/TemplateEditor.vue' import * as TemplatesApi from '@/api/setting.printtemplate/printTemplate' import { usePrintTemplateStore } from '@/stores/modules/printTemplate' @@ -331,6 +334,11 @@ const loadTemplates = async () => { } } +const handleRefresh = async () => { + await loadTemplates() + ElMessage.success('模板列表已刷新') +} + const runTypeQuery = async () => { const bt = String(typeQueryForm.value.businessType || '').trim() if (!bt) {