diff --git a/app/lib/printer_data_builder.js b/app/lib/printer_data_builder.js new file mode 100644 index 0000000..f12ecb0 --- /dev/null +++ b/app/lib/printer_data_builder.js @@ -0,0 +1,1073 @@ +'use strict'; + +/** + * 打印数据中间态组装器。 + * + * 入参说明(buildPlatformRequestSkeleton): + * - input.platform: 平台标识,支持 cainiao、douyin、jd、kuaishou、pdd、sph、xhs 及其常见别名。 + * - input.order_express: 订单快递对象(建议来自 wms_order_express)。 + * - input.order_delivery: 订单对象(建议来自 wms_order_delivery_xxxxxx 分表模型查询结果)。 + * - input.store_contract / input.policy_config: 货主-仓库签约配置,至少应包含 policy_config。 + * - input.template_sample: 平台模板样例对象(建议读取 printer_data_template/*.json 后传入)。 + * - input.options: 可选配置,如 requestId/taskId/documentId/printer/preview。 + * + * 出参说明: + * - platform: 归一化后的平台编码。 + * - platform_meta: 平台映射元信息(名称、别名、模板文件名等)。 + * - base_data: 通用打印基础数据(sender/receiver/items/channel/template)。 + * - request_skeleton: 平台请求骨架(中间态,不直接可发)。 + * - missing_fields: 缺失字段列表(按 path 标注)。 + * - warnings: 风险与提示信息列表。 + * + * 哪些信息“足够”: + * - 收发件人基础字段、订单商品、运单号、平台编码、模板 URL(若样例里存在)通常足够构建中间态骨架。 + * + * 哪些信息“不足”: + * - encryptedData / signature / sign / encryptedtoken / encryptprintinfo 等平台私有密文或签名字段, + * 无法仅靠订单与模板样例安全生成,必须由上游平台适配器(持有密钥/签名算法)补齐。 + */ + +/** + * 平台硬编码映射。 + * @type {Object} + */ +const PLATFORM_MAP = Object.freeze({ + cainiao: Object.freeze({ + name: '菜鸟', + aliases: [ 'cn', 'cainiao', 'taobao', 'tb' ], + template_file: 'cainiao.json', + }), + douyin: Object.freeze({ + name: '抖音', + aliases: [ 'douyin', 'dy', 'tiktok' ], + template_file: 'douyin.json', + }), + jd: Object.freeze({ + name: '京东', + aliases: [ 'jd', 'jingdong' ], + template_file: 'jd.json', + }), + kuaishou: Object.freeze({ + name: '快手', + aliases: [ 'kuaishou', 'ks' ], + template_file: 'kuaishou.json', + }), + pdd: Object.freeze({ + name: '拼多多', + aliases: [ 'pdd', 'pinduoduo' ], + template_file: 'pdd.json', + }), + sph: Object.freeze({ + name: '视频号', + aliases: [ 'sph', 'shipinhao', 'wechatvideo' ], + template_file: 'sph.json', + }), + xhs: Object.freeze({ + name: '小红书', + aliases: [ 'xhs', 'xiaohongshu', 'red' ], + template_file: 'xhs.json', + }), +}); + +const PRIVATE_PAYLOAD_FIELDS = Object.freeze([ + 'encryptedData', + 'signature', + 'sign', + 'encryptedtoken', + 'encryptprintinfo', +]); + +/** + * 换行符映射,供不同平台分支复用。 + * @type {Object} + */ +const LINE_BREAK_MAP = Object.freeze({ + LF: '\n', + CR: '\r', + CRLF: '\r\n', +}); + +/** + * 拼多多自定义区默认模板地址。 + * @type {string} + */ +const DEFAULT_PDD_CUSTOM_TEMPLATE_URL = 'http://www.ye4s.com/mb/pdd.xml'; +const WAYBILL_CUSTOM_DISPLAY_FIELD = 'waybill_custom_display_type'; +const WAYBILL_CUSTOM_DISPLAY_TYPES = Object.freeze({ + HIDE: '1', + ITEM_NAME_QTY: '2', + PICK_LOCATION_BARCODE_QTY: '3', + PICK_LOCATION_BARCODE_LAST5_QTY: '4', + PICK_LOCATION_NAME_BARCODE_QTY: '5', +}); + +const ARRAY_STYLE_KEYS = new Set([ + 'documents', + 'taskList', + 'contents', +]); + +const TEMPLATE_LEAF_KEEP_KEYS = Object.freeze(new Set([ + 'cmd', + 'command', + 'orderType', + 'requestID', + 'requetID', + 'version', + 'taskID', + 'documentID', + 'printer', + 'preview', + 'templateURL', + 'templateUrl', + 'tempUrl', + 'customTempUrl', + 'templateId', + 'templateID', + 'key', + 'ERPId', + 'userid', + 'userId', + 'ver', + 'printType', +])); + +/** + * 判断值是否为普通对象。 + * @param {any} value 待判断值。 + * @return {boolean} 是否普通对象。 + */ +function isPlainObject(value) { + return Object.prototype.toString.call(value) === '[object Object]'; +} + +/** + * 统一换行符表示。 + * + * @param {any} value 原始值。 + * @param {string} [lineBreak=LINE_BREAK_MAP.LF] 目标换行符。 + * @return {string} 规范化后的字符串。 + */ +function normalizeLineBreak(value, lineBreak = LINE_BREAK_MAP.LF) { + const text = String(value === undefined || value === null ? '' : value); + + if (lineBreak === LINE_BREAK_MAP.CRLF) { + return text.replace(/\r\n|\r|\n/g, LINE_BREAK_MAP.CRLF); + } + + if (lineBreak === LINE_BREAK_MAP.CR) { + return text.replace(/\r\n|\r|\n/g, LINE_BREAK_MAP.CR); + } + + return text.replace(/\r\n|\r/g, LINE_BREAK_MAP.LF); +} + +/** + * 安全转换字符串并去空白。 + * @param {any} value 原始值。 + * @return {string} 转换后的字符串。 + */ +function toTrimmedString(value) { + return normalizeLineBreak(value).trim(); +} + +/** + * 安全转换数值。 + * @param {any} value 原始值。 + * @param {number} fallback 默认值。 + * @return {number} 转换后的数值。 + */ +function toNumber(value, fallback = 0) { + const parsed = Number(value); + return Number.isFinite(parsed) ? parsed : fallback; +} + +/** + * 规范化平台别名。 + * @param {string} inputPlatform 入参平台。 + * @return {{platform: string, meta: Object|null, raw: string}} 规范化结果。 + */ +function normalizePlatformAlias(inputPlatform) { + const raw = toTrimmedString(inputPlatform).toLowerCase(); + + if (!raw) { + return { platform: '', meta: null, raw }; + } + + for (const platform of Object.keys(PLATFORM_MAP)) { + const meta = PLATFORM_MAP[platform]; + if (platform === raw || meta.aliases.includes(raw)) { + return { platform, meta, raw }; + } + } + + return { platform: raw, meta: null, raw }; +} + +/** + * 解析订单商品数据。 + * @param {any} rawItems 原始 items 字段(字符串或数组)。 + * @return {Array} 商品列表。 + */ +function parseItems(rawItems) { + if (Array.isArray(rawItems)) { + return rawItems; + } + + if (typeof rawItems === 'string') { + const text = rawItems.trim(); + if (!text) { + return []; + } + + try { + const parsed = JSON.parse(text); + return Array.isArray(parsed) ? parsed : []; + } catch (error) { + return []; + } + } + + return []; +} + +/** + * 在候选键中读取首个非空字段。 + * @param {Object} item 商品对象。 + * @param {Array} keyList 候选键列表。 + * @return {string} 文本值。 + */ +function getFirstNonEmptyText(item, keyList = []) { + if (!isPlainObject(item)) { + return ''; + } + + for (const key of keyList) { + const value = item[key]; + if (value === undefined || value === null) { + continue; + } + + const text = String(value).trim(); + if (text) { + return text; + } + } + + return ''; +} + +/** + * 读取条码文本,支持数组与多种命名。 + * @param {Object} item 商品对象。 + * @return {string} 条码文本。 + */ +function resolveItemBarcodeText(item) { + if (!isPlainObject(item)) { + return ''; + } + + const barcodeList = []; + const arrayBarcodes = [ item.barcodes, item.barcode_list ]; + for (const barcodes of arrayBarcodes) { + if (!Array.isArray(barcodes)) { + continue; + } + + for (const code of barcodes) { + const codeText = String(code === undefined || code === null ? '' : code).trim(); + if (codeText) { + barcodeList.push(codeText); + } + } + } + + if (barcodeList.length > 0) { + return barcodeList.join(';'); + } + + return getFirstNonEmptyText(item, [ + 'barcode', + 'bar_code', + 'item_barcode', + 'item_code', + 'sku_code', + ]); +} + +/** + * 读取数量文本。 + * @param {Object} item 商品对象。 + * @return {{qtyText: string, qtyNumber: number}} 数量文本与数值。 + */ +function resolveItemQuantity(item) { + if (!isPlainObject(item)) { + return { qtyText: '0', qtyNumber: 0 }; + } + + const qtyKeyList = [ + 'quantity', + 'qty', + 'num', + 'plan_qty', + 'actual_quantity', + 'buy_amount', + ]; + + for (const key of qtyKeyList) { + if (!Object.prototype.hasOwnProperty.call(item, key)) { + continue; + } + + const rawValue = item[key]; + const qtyText = String(rawValue === undefined || rawValue === null ? '' : rawValue).trim(); + if (!qtyText) { + continue; + } + + const qtyNumber = Number(qtyText); + return { + qtyText, + qtyNumber: Number.isFinite(qtyNumber) ? qtyNumber : 0, + }; + } + + return { qtyText: '0', qtyNumber: 0 }; +} + +/** + * 根据货主配置构建面单自定义区商品信息。 + * @param {Array} items 商品列表。 + * @param {Object} policyConfig 策略配置。 + * @param {string} lineBreak 换行符。 + * @return {string} 自定义区文本。 + */ +function buildWaybillCustomProductInfo(items, policyConfig, lineBreak = LINE_BREAK_MAP.LF) { + const safeItems = Array.isArray(items) ? items : []; + const safePolicyConfig = isPlainObject(policyConfig) ? policyConfig : {}; + const displayType = String( + safePolicyConfig[WAYBILL_CUSTOM_DISPLAY_FIELD] || WAYBILL_CUSTOM_DISPLAY_TYPES.HIDE + ).trim(); + + if (displayType === WAYBILL_CUSTOM_DISPLAY_TYPES.HIDE || safeItems.length === 0) { + return ''; + } + + const lines = []; + let totalQty = 0; + + for (const item of safeItems) { + if (!isPlainObject(item)) { + continue; + } + + const itemName = getFirstNonEmptyText(item, [ 'item_name', 'product_name', 'name', 'title' ]); + const pickLocation = getFirstNonEmptyText(item, [ + 'pick_location', + 'pick_location_code', + 'location_code', + 'space_code', + 'bin_code', + 'storage_code', + ]); + const barcode = resolveItemBarcodeText(item); + const { qtyText, qtyNumber } = resolveItemQuantity(item); + totalQty += qtyNumber; + + let line = ''; + switch (displayType) { + case WAYBILL_CUSTOM_DISPLAY_TYPES.ITEM_NAME_QTY: + line = `${itemName} 【${qtyText}】`.trim(); + break; + case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_BARCODE_QTY: + line = `${pickLocation} ${barcode} 【${qtyText}】`.trim(); + break; + case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_BARCODE_LAST5_QTY: { + const barcodeLast5 = barcode ? barcode.slice(-5) : ''; + line = `${pickLocation} ${barcodeLast5} 【${qtyText}】`.trim(); + break; + } + case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_NAME_BARCODE_QTY: + line = `${pickLocation} ${itemName} ${barcode} 【${qtyText}】`.trim(); + break; + default: + line = ''; + break; + } + + if (line) { + lines.push(line.replace(/\s{2,}/g, ' ')); + } + } + + if (lines.length === 0) { + return ''; + } + + const header = `商品总数 【${Number.isFinite(totalQty) ? totalQty : 0}】`; + return normalizeLineBreak([ header, ...lines ].join(LINE_BREAK_MAP.LF), lineBreak); +} + +/** + * 构建数组字段的精简骨架。 + * + * @param {any} value 原始字段值。 + * @param {string[]} warnings 警告列表。 + * @param {string} currentKey 当前字段名。 + * @return {Array<*>} 数组骨架。 + */ +function buildArraySkeleton(value, warnings, currentKey) { + if (Array.isArray(value)) { + if (!value.length) { + return []; + } + + return [ sanitizeTemplatePrivateFields(value[0], warnings, currentKey) ]; + } + + if (value === undefined || value === null) { + return []; + } + + return [ sanitizeTemplatePrivateFields(value, warnings, currentKey) ]; +} + +/** + * 从快手模板样例中提取自定义区默认模板地址。 + * + * 优先扫描 template_sample.task.documents,其次扫描 template_sample.documents 和 template_sample.taskList, + * 找到第一个同时包含 customData 与 templateURL 的内容对象后返回其 templateURL。 + * + * @param {Object} templateSample 模板样例对象。 + * @return {string} 默认模板地址。 + */ +function resolveKuaishouCustomDataTemplateURL(templateSample) { + const sample = isPlainObject(templateSample) ? templateSample : {}; + const documentGroups = [ + sample.task && sample.task.documents, + sample.documents, + sample.taskList, + ]; + + for (const documents of documentGroups) { + if (!Array.isArray(documents) || documents.length === 0) { + continue; + } + + for (const document of documents) { + if (!isPlainObject(document) || !Array.isArray(document.contents)) { + continue; + } + + for (const content of document.contents) { + if (!isPlainObject(content) || !isPlainObject(content.customData)) { + continue; + } + + if (Object.prototype.hasOwnProperty.call(content, 'templateURL')) { + return toTrimmedString(content.templateURL); + } + } + } + } + + return ''; +} + +/** + * 归一化签约策略配置。 + * @param {Object} input 入参对象。 + * @return {Object} 统一 policy_config 对象。 + */ +function resolvePolicyConfig(input) { + if (isPlainObject(input.policy_config)) { + return input.policy_config; + } + + if (isPlainObject(input.store_contract) && isPlainObject(input.store_contract.policy_config)) { + return input.store_contract.policy_config; + } + + return {}; +} + +/** + * 构建基础数据中间态。 + * @param {Object} input 输入对象。 + * @param {string} platform 归一化平台。 + * @param {Object|null} platformMeta 平台元信息。 + * @return {{base_data: Object, missing_fields: Array, warnings: string[]}} 组装结果。 + */ +function buildBaseData(input, platform, platformMeta) { + const orderExpress = isPlainObject(input.order_express) ? input.order_express : {}; + const orderDelivery = isPlainObject(input.order_delivery) ? input.order_delivery : {}; + const policyConfig = resolvePolicyConfig(input); + const templateSample = isPlainObject(input.template_sample) ? input.template_sample : {}; + + const sender = { + name: toTrimmedString(policyConfig.sender_name), + tel: toTrimmedString(policyConfig.sender_tel), + province: toTrimmedString(policyConfig.province_name), + city: toTrimmedString(policyConfig.city_name), + district: toTrimmedString(policyConfig.district_name), + town: toTrimmedString(policyConfig.town_name), + address: toTrimmedString(policyConfig.address), + }; + + const receiver = { + name: toTrimmedString(orderDelivery.name), + mobile: toTrimmedString(orderDelivery.mobile), + tel: toTrimmedString(orderDelivery.tel), + province: toTrimmedString(orderDelivery.province), + city: toTrimmedString(orderDelivery.city), + district: toTrimmedString(orderDelivery.area), + town: toTrimmedString(orderDelivery.town), + address: toTrimmedString(orderDelivery.detail_address), + zip_code: toTrimmedString(orderDelivery.zip_code), + }; + + const items = parseItems(orderDelivery.items); + const channel = { + platform, + source_platform_code: toTrimmedString(orderDelivery.source_platform_code || orderExpress.platform_code), + sys_platform_code: toTrimmedString(orderDelivery.sys_platform_code), + logistics_code: toTrimmedString(orderExpress.logistics_code || orderDelivery.logistics_code), + logistics_name: toTrimmedString(orderExpress.logistics_name || orderDelivery.logistics_name), + waybill_code: toTrimmedString(orderExpress.waybill_code), + business_key: toNumber(orderExpress.business_key, 0), + }; + + const template = { + file: platformMeta ? platformMeta.template_file : '', + cmd: toTrimmedString(templateSample.cmd), + version: toTrimmedString(templateSample.version), + request_id: toTrimmedString(templateSample.requetID || templateSample.requestID), + }; + + const missingFields = []; + const warnings = []; + + const requiredChecks = [ + { path: 'sender.name', value: sender.name, reason: '缺少发件人姓名(policy_config.sender_name)' }, + { path: 'sender.tel', value: sender.tel, reason: '缺少发件人电话(policy_config.sender_tel)' }, + { path: 'sender.address', value: sender.address, reason: '缺少发件详细地址(policy_config.address)' }, + { path: 'receiver.name', value: receiver.name, reason: '缺少收件人姓名(order_delivery.name)' }, + { path: 'receiver.mobile|tel', value: receiver.mobile || receiver.tel, reason: '缺少收件联系方式(order_delivery.mobile/tel)' }, + { path: 'receiver.address', value: receiver.address, reason: '缺少收件详细地址(order_delivery.detail_address)' }, + { path: 'channel.waybill_code', value: channel.waybill_code, reason: '缺少运单号(order_express.waybill_code)' }, + ]; + + for (const check of requiredChecks) { + if (!check.value) { + missingFields.push({ path: check.path, reason: check.reason }); + } + } + + if (!items.length) { + warnings.push('order_delivery.items 为空或解析失败,已输出空商品列表'); + } + + if (!platformMeta) { + warnings.push(`平台 ${platform || '(empty)'} 未命中硬编码映射,已按原值输出`); + } + + return { + base_data: { + sender, + receiver, + items, + channel, + template, + }, + missing_fields: missingFields, + warnings, + }; +} + +/** + * 清洗模板样例,保留结构并裁切样例噪声。 + * @param {any} value 原始对象。 + * @param {string[]} warnings 警告列表。 + * @return {any} 清洗后的对象。 + */ +function sanitizeTemplatePrivateFields(value, warnings, currentKey = '') { + if (Array.isArray(value)) { + if (ARRAY_STYLE_KEYS.has(currentKey)) { + return buildArraySkeleton(value, warnings, currentKey); + } + + return value.map(item => sanitizeTemplatePrivateFields(item, warnings, currentKey)); + } + + if (!isPlainObject(value)) { + if (ARRAY_STYLE_KEYS.has(currentKey)) { + return buildArraySkeleton(value, warnings, currentKey); + } + + if (TEMPLATE_LEAF_KEEP_KEYS.has(currentKey)) { + if (typeof value === 'string') { + return toTrimmedString(value); + } + + return value; + } + + if (typeof value === 'string') { + const text = toTrimmedString(value); + return text ? '__SAMPLE__' : ''; + } + + if (typeof value === 'number') { + return Number.isFinite(value) ? 0 : value; + } + + if (typeof value === 'boolean') { + return value; + } + + return value; + } + + const result = {}; + for (const key of Object.keys(value)) { + const current = value[key]; + if (PRIVATE_PAYLOAD_FIELDS.includes(key)) { + result[key] = '__UPSTREAM_REQUIRED__'; + warnings.push(`模板字段 ${key} 为平台私有密文字段,已替换为占位符`); + continue; + } + + result[key] = sanitizeTemplatePrivateFields(current, warnings, key); + } + + return result; +} + +/** + * 快手平台密文字段回填。 + * + * 规则: + * - wms_order_express.printinfo -> encryptedData + * - wms_order_express.signature -> signature + * - wms_order_express.encryptprintinfo -> key + * + * 仅在平台为 kuaishou 时生效,避免影响其他平台。 + * + * @param {string} platform 归一化平台编码。 + * @param {Object} skeleton 打印请求骨架。 + * @param {Object} orderExpress 快递单对象。 + * @param {string[]} warnings 风险提示列表。 + * @param {Object} policyConfig 策略配置对象。 + * @param {string} customDataTemplateURL 自定义区模板地址默认值。 + */ +function applyKuaishouExpressFieldMapping(platform, skeleton, orderExpress, warnings, policyConfig, customDataTemplateURL) { + if (platform !== 'kuaishou') { + return; + } + + const safeSkeleton = isPlainObject(skeleton) ? skeleton : {}; + const safeOrderExpress = isPlainObject(orderExpress) ? orderExpress : {}; + const safePolicyConfig = isPlainObject(policyConfig) ? policyConfig : {}; + const documents = safeSkeleton.task && Array.isArray(safeSkeleton.task.documents) + ? safeSkeleton.task.documents + : []; + + if (documents.length === 0) { + return; + } + + const encryptedData = toTrimmedString(safeOrderExpress.printinfo); + const signature = toTrimmedString(safeOrderExpress.signature); + const key = toTrimmedString(safeOrderExpress.encryptprintinfo); + const waybillCode = toTrimmedString(safeOrderExpress.waybill_code); + const customProductInfo = buildWaybillCustomProductInfo( + parseItems(safeOrderExpress.items), + safePolicyConfig, + LINE_BREAK_MAP.LF + ); + + for (const document of documents) { + if (!isPlainObject(document)) { + continue; + } + + if (waybillCode) { + document.documentID = waybillCode; + document.waybillCode = waybillCode; + } + + if (!Array.isArray(document.contents)) { + document.contents = []; + } + const contents = document.contents; + + for (const content of contents) { + if (!isPlainObject(content)) { + continue; + } + + // 快手发件信息回填,确保对象结构存在后再覆盖策略字段。 + content.addData = isPlainObject(content.addData) ? content.addData : {}; + content.addData.senderInfo = isPlainObject(content.addData.senderInfo) ? content.addData.senderInfo : {}; + content.addData.senderInfo.address = isPlainObject(content.addData.senderInfo.address) + ? content.addData.senderInfo.address + : {}; + content.addData.senderInfo.contact = isPlainObject(content.addData.senderInfo.contact) + ? content.addData.senderInfo.contact + : {}; + + content.addData.senderInfo.address.provinceName = toTrimmedString(safePolicyConfig.province_name); + content.addData.senderInfo.address.cityName = toTrimmedString(safePolicyConfig.city_name); + content.addData.senderInfo.address.districtName = toTrimmedString(safePolicyConfig.district_name); + content.addData.senderInfo.address.detailAddress = toTrimmedString(safePolicyConfig.address); + content.addData.senderInfo.address.countryCode = 'CHN'; + content.addData.senderInfo.contact.name = toTrimmedString(safePolicyConfig.sender_name); + content.addData.senderInfo.contact.mobile = toTrimmedString(safePolicyConfig.sender_tel); + + const hasKuaishouEncryptedPayloadField = ( + Object.prototype.hasOwnProperty.call(content, 'encryptedData') + || Object.prototype.hasOwnProperty.call(content, 'signature') + || Object.prototype.hasOwnProperty.call(content, 'key') + ); + if (!hasKuaishouEncryptedPayloadField) { + continue; + } + + content.encryptedData = encryptedData || '__UPSTREAM_REQUIRED__'; + content.signature = signature || '__UPSTREAM_REQUIRED__'; + content.key = key || '__UPSTREAM_REQUIRED__'; + } + + const customDataContent = contents.find(content => { + return isPlainObject(content) && isPlainObject(content.customData); + }); + if (customDataContent) { + if (!Object.prototype.hasOwnProperty.call(customDataContent, 'templateURL')) { + customDataContent.templateURL = customDataTemplateURL || ''; + } + customDataContent.customData.productInfo = customProductInfo; + } else { + contents.push({ + templateURL: customDataTemplateURL || '', + customData: { + productInfo: customProductInfo, + }, + }); + } + } + + if (!encryptedData) { + warnings.push('快手模板字段 encryptedData 缺失映射源(order_express.printinfo)'); + } + if (!signature) { + warnings.push('快手模板字段 signature 缺失映射源(order_express.signature)'); + } + if (!key) { + warnings.push('快手模板字段 key 缺失映射源(order_express.encryptprintinfo)'); + } +} + +/** + * 拼多多平台密文字段回填。 + * + * 规则: + * - wms_order_express.printinfo -> encryptedData + * - wms_order_express.signature -> signature + * - policy_config 面单发货信息 -> content.addData.sender + * + * 仅在平台为 pdd 时生效,避免影响其他平台。 + * + * @param {string} platform 归一化平台编码。 + * @param {Object} skeleton 打印请求骨架。 + * @param {Object} orderExpress 快递单对象。 + * @param {Object} policyConfig 策略配置对象。 + */ +function applyPddExpressFieldMapping(platform, skeleton, orderExpress, policyConfig) { + if (platform !== 'pdd') { + return; + } + + const safeSkeleton = isPlainObject(skeleton) ? skeleton : {}; + const safeOrderExpress = isPlainObject(orderExpress) ? orderExpress : {}; + const safePolicyConfig = isPlainObject(policyConfig) ? policyConfig : {}; + const documents = safeSkeleton.task && Array.isArray(safeSkeleton.task.documents) + ? safeSkeleton.task.documents + : []; + + if (documents.length === 0) { + return; + } + + const encryptedData = toTrimmedString(safeOrderExpress.printinfo); + const signature = toTrimmedString(safeOrderExpress.signature); + const waybillCode = toTrimmedString(safeOrderExpress.waybill_code); + const customProductInfo = buildWaybillCustomProductInfo( + parseItems(safeOrderExpress.items), + safePolicyConfig, + LINE_BREAK_MAP.CR + ); + + /** + * 判断内容对象是否属于拼多多自定义区。 + * + * @param {Object} content 内容对象。 + * @return {boolean} 是否为自定义区内容对象。 + */ + function isPddCustomContent(content) { + if (!isPlainObject(content)) { + return false; + } + + return Boolean( + isPlainObject(content.customData) + || (isPlainObject(content.data) && Array.isArray(content.data.list)) + ); + } + + /** + * 构建拼多多默认自定义区内容对象。 + * + * @param {string} templateURL 自定义模板地址。 + * @return {Object} 默认自定义区内容对象。 + */ + function buildPddDefaultCustomContent(templateURL) { + return { + templateURL: toTrimmedString(templateURL || DEFAULT_PDD_CUSTOM_TEMPLATE_URL), + data: { + height: 240, + list: [ { + fontSize: 28, + left: 2.08, + text: customProductInfo, + top: 2.08, + width: 550, + } ], + waterdata: { + text: '', + }, + width: 560, + }, + }; + } + + for (const document of documents) { + if (!isPlainObject(document)) { + continue; + } + + document.documentID = waybillCode; + + if (!Array.isArray(document.contents)) { + document.contents = []; + } + + for (const content of document.contents) { + if (!isPlainObject(content)) { + continue; + } + + content.addData = isPlainObject(content.addData) ? content.addData : {}; + content.addData.sender = isPlainObject(content.addData.sender) ? content.addData.sender : {}; + content.addData.sender.address = isPlainObject(content.addData.sender.address) + ? content.addData.sender.address + : {}; + + content.addData.sender.address.province = toTrimmedString(safePolicyConfig.province_name); + content.addData.sender.address.city = toTrimmedString(safePolicyConfig.city_name); + content.addData.sender.address.district = toTrimmedString(safePolicyConfig.district_name); + content.addData.sender.address.detail = toTrimmedString(safePolicyConfig.address); + content.addData.sender.mobile = toTrimmedString(safePolicyConfig.sender_tel); + content.addData.sender.name = toTrimmedString(safePolicyConfig.sender_name); + content.encryptedData = encryptedData; + content.signature = signature; + } + + const customContent = document.contents.find(isPddCustomContent); + if (customContent) { + if (!toTrimmedString(customContent.templateURL)) { + customContent.templateURL = DEFAULT_PDD_CUSTOM_TEMPLATE_URL; + } + + if (isPlainObject(customContent.data) && Array.isArray(customContent.data.list) && customContent.data.list[0]) { + customContent.data.list[0].text = customProductInfo; + } + } else { + document.contents.push(buildPddDefaultCustomContent()); + } + } +} + +/** + * 构建平台请求骨架。 + * @param {Object} input 输入对象。 + * @return {{platform: string, platform_meta: Object|null, base_data: Object, request_skeleton: Object, missing_fields: Array, warnings: string[]}} 中间态结果。 + */ +function buildPlatformRequestSkeleton(input = {}) { + const normalized = normalizePlatformAlias( + input.platform + || (isPlainObject(input.order_express) ? input.order_express.platform_code : '') + || (isPlainObject(input.order_delivery) ? input.order_delivery.source_platform_code : '') + ); + + const baseResult = buildBaseData(input, normalized.platform, normalized.meta); + const options = isPlainObject(input.options) ? input.options : {}; + const policyConfig = resolvePolicyConfig(input); + const orderExpressForCompose = isPlainObject(input.order_express) + ? { ...input.order_express } + : {}; + const orderDeliveryForCompose = isPlainObject(input.order_delivery) ? input.order_delivery : {}; + if (!orderExpressForCompose.items && orderDeliveryForCompose.items) { + orderExpressForCompose.items = orderDeliveryForCompose.items; + } + const templateSample = isPlainObject(input.template_sample) ? input.template_sample : {}; + + const warnings = [ ...baseResult.warnings ]; + const cleanedTemplateSample = sanitizeTemplatePrivateFields(templateSample, warnings); + const customDataTemplateURL = resolveKuaishouCustomDataTemplateURL(templateSample); + + const requestId = toTrimmedString(options.requestId || templateSample.requetID || templateSample.requestID); + const taskId = toTrimmedString(options.taskId || requestId); + const sampleDocumentSources = [ + templateSample.task && templateSample.task.documents, + templateSample.documents, + templateSample.taskList, + ]; + let sampleDocumentId = ''; + + for (const documents of sampleDocumentSources) { + if (!Array.isArray(documents) || documents.length === 0) { + continue; + } + + const firstDocument = documents[0]; + if (isPlainObject(firstDocument) && firstDocument.documentID) { + sampleDocumentId = firstDocument.documentID; + break; + } + } + + const documentId = toTrimmedString( + options.documentId || sampleDocumentId + ); + + const sampleTaskDocuments = cleanedTemplateSample.task && Object.prototype.hasOwnProperty.call(cleanedTemplateSample.task, 'documents') + ? buildArraySkeleton(cleanedTemplateSample.task.documents, warnings, 'documents') + : []; + + const skeleton = { + cmd: toTrimmedString(templateSample.cmd || 'print'), + requestID: requestId, + version: toTrimmedString(templateSample.version || '1.0'), + task: { + taskID: taskId, + preview: options.preview === undefined ? false : !!options.preview, + printer: toTrimmedString(options.printer), + }, + }; + + if (sampleTaskDocuments.length > 0) { + skeleton.task.documents = sampleTaskDocuments; + + if (skeleton.task.documents[0] && isPlainObject(skeleton.task.documents[0])) { + if (documentId) { + skeleton.task.documents[0].documentID = toTrimmedString(documentId); + } + + if (!Array.isArray(skeleton.task.documents[0].contents)) { + skeleton.task.documents[0].contents = []; + } + } + } else if (cleanedTemplateSample.task && Object.prototype.hasOwnProperty.call(cleanedTemplateSample.task, 'documents')) { + skeleton.task.documents = []; + } + + if (Object.prototype.hasOwnProperty.call(cleanedTemplateSample, 'documents')) { + skeleton.documents = buildArraySkeleton(cleanedTemplateSample.documents, warnings, 'documents'); + } + + if (Object.prototype.hasOwnProperty.call(cleanedTemplateSample, 'taskList')) { + skeleton.taskList = buildArraySkeleton(cleanedTemplateSample.taskList, warnings, 'taskList'); + } + + if (cleanedTemplateSample.task && Object.prototype.hasOwnProperty.call(cleanedTemplateSample.task, 'documents') && sampleTaskDocuments.length === 0) { + warnings.push('template_sample.task.documents 为空或未能解析,已输出空 documents 数组'); + } + + applyKuaishouExpressFieldMapping( + normalized.platform, + skeleton, + orderExpressForCompose, + warnings, + policyConfig, + customDataTemplateURL + ); + + applyPddExpressFieldMapping( + normalized.platform, + skeleton, + orderExpressForCompose, + policyConfig + ); + + return { + platform: normalized.platform, + platform_meta: normalized.meta, + base_data: baseResult.base_data, + request_skeleton: skeleton, + missing_fields: baseResult.missing_fields, + warnings, + }; +} + +class PrinterDataBuilder { + /** + * 获取平台硬编码映射。 + * @return {Object} 平台映射对象。 + */ + static getPlatformMap() { + return PLATFORM_MAP; + } + + /** + * 获取换行符映射。 + * @return {Object} 换行符映射对象。 + */ + static getLineBreakMap() { + return LINE_BREAK_MAP; + } + + /** + * 平台别名归一化。 + * @param {string} platform 平台别名。 + * @return {{platform: string, meta: Object|null, raw: string}} 归一化结果。 + */ + static normalizePlatformAlias(platform) { + return normalizePlatformAlias(platform); + } + + /** + * 组装基础打印数据。 + * @param {Object} input 输入对象。 + * @return {{base_data: Object, missing_fields: Array, warnings: string[]}} 组装结果。 + */ + static buildBaseData(input = {}) { + const normalized = normalizePlatformAlias( + input.platform + || (isPlainObject(input.order_express) ? input.order_express.platform_code : '') + || (isPlainObject(input.order_delivery) ? input.order_delivery.source_platform_code : '') + ); + + return buildBaseData(input, normalized.platform, normalized.meta); + } + + /** + * 组装平台请求骨架(中间态)。 + * @param {Object} input 输入对象。 + * @return {{platform: string, platform_meta: Object|null, base_data: Object, request_skeleton: Object, missing_fields: Array, warnings: string[]}} 组装结果。 + */ + static buildPlatformRequestSkeleton(input = {}) { + return buildPlatformRequestSkeleton(input); + } +} + +module.exports = PrinterDataBuilder; diff --git a/app/model/picking_strategy.js b/app/model/picking_strategy.js index aa56ef4..4115436 100644 --- a/app/model/picking_strategy.js +++ b/app/model/picking_strategy.js @@ -109,6 +109,11 @@ module.exports = app => { defaultValue: 1, comment: '团购批次最大订单数(相同结构)', }, + wave_prefix: { + type: STRING(5), + allowNull: true, + comment: '波次前缀(为空时回退仓库前缀)', + }, allowed_owners: { type: JSON, allowNull: true, diff --git a/app/model/print_computer.js b/app/model/print_computer.js index c7a1e5f..5f7ec6e 100644 --- a/app/model/print_computer.js +++ b/app/model/print_computer.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = app => { - const { INTEGER, BIGINT, STRING } = app.Sequelize; + const { INTEGER, BIGINT, STRING, DATE } = app.Sequelize; const PrintComputer = app.model.define('print_computer', { id: { @@ -27,6 +27,11 @@ module.exports = app => { defaultValue: 1, comment: '状态,1-已激活,0-未激活', }, + last_login_time: { + type: DATE, + allowNull: true, + comment: '上次登录时间', + }, }, { tableName: 'wms_print_computer', freezeTableName: true, diff --git a/app/model/print_item.js b/app/model/print_item.js index d9659a1..178c9bb 100644 --- a/app/model/print_item.js +++ b/app/model/print_item.js @@ -1,6 +1,7 @@ // app/model/print_item.js module.exports = app => { const { STRING, INTEGER, BOOLEAN, JSON, DATE } = app.Sequelize; + const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ]; const PrintItem = app.model.define('print_item', { id: { @@ -15,6 +16,7 @@ module.exports = app => { comment: '业务类型', validate: { notEmpty: true, + isIn: [ SUPPORTED_BUSINESS_TYPES ], }, }, platform: { diff --git a/app/model/print_template.js b/app/model/print_template.js index fdf4ace..a7f40b7 100644 --- a/app/model/print_template.js +++ b/app/model/print_template.js @@ -3,6 +3,7 @@ module.exports = app => { const { BIGINT, STRING, INTEGER, BOOLEAN, JSON, DATE, DATEONLY } = app.Sequelize; + const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ]; const PrintTemplate = app.model.define('print_template', { id: { @@ -75,6 +76,10 @@ module.exports = app => { type: STRING(10), allowNull: false, comment: '类型', + validate: { + notEmpty: true, + isIn: [ SUPPORTED_BUSINESS_TYPES ], + }, }, delete_at: { type: DATEONLY, diff --git a/app/model/store_warehouse.js b/app/model/store_warehouse.js index 0ef7363..c473018 100644 --- a/app/model/store_warehouse.js +++ b/app/model/store_warehouse.js @@ -146,30 +146,13 @@ module.exports = app => { description: '补充说明该货主在仓库内的特殊约束', maxLength: 200, }), - Object.freeze({ - key: 'use_store_sender_info', - name: '是否使用货主发货信息', - type: 'flag', - default: 1, - required: false, - description: '控制面单分配时是否优先使用货主在当前仓下配置的发件信息', - }), - Object.freeze({ - key: 'shop_name', - name: '店铺名称', - type: 'string', - default: '', - required: false, - description: '货主在当前仓下的店铺名称', - maxLength: 100, - }), Object.freeze({ key: 'sender_name', name: '发件人姓名', type: 'string', default: '', required: false, - description: '货主在当前仓下的默认发件人姓名', + description: '货主在当前仓下面单的默认发件人姓名', maxLength: 50, }), Object.freeze({ @@ -178,7 +161,7 @@ module.exports = app => { type: 'string', default: '', required: false, - description: '货主在当前仓下的默认发件人联系电话', + description: '货主在当前仓下面单的默认发件人联系电话', maxLength: 20, }), Object.freeze({ @@ -187,7 +170,7 @@ module.exports = app => { type: 'string', default: '', required: false, - description: '货主在当前仓下的发件省份', + description: '货主在当前仓下面单的发件省份', maxLength: 50, }), Object.freeze({ @@ -196,7 +179,7 @@ module.exports = app => { type: 'string', default: '', required: false, - description: '货主在当前仓下的发件城市', + description: '货主在当前仓下面单的发件城市', maxLength: 50, }), Object.freeze({ @@ -205,7 +188,7 @@ module.exports = app => { type: 'string', default: '', required: false, - description: '货主在当前仓下的发件区/县', + description: '货主在当前仓下面单的发件区/县', maxLength: 50, }), Object.freeze({ @@ -214,7 +197,7 @@ module.exports = app => { type: 'string', default: '', required: false, - description: '货主在当前仓下的发件镇/街道', + description: '货主在当前仓下面单的发件镇/街道', maxLength: 50, }), Object.freeze({ @@ -223,9 +206,24 @@ module.exports = app => { type: 'string', default: '', required: false, - description: '货主在当前仓下的发件详细地址', + description: '货主在当前仓下面单的发件详细地址', maxLength: 200, }), + Object.freeze({ + key: 'waybill_custom_display_type', + name: '面单自定义显示类型', + type: 'enum', + default: '1', + required: false, + description: '控制面单自定义区商品信息展示内容', + options: [ + Object.freeze({ value: '1', label: '隐藏' }), + Object.freeze({ value: '2', label: '商品名称和数量' }), + Object.freeze({ value: '3', label: '拣货库位和条码和数量' }), + Object.freeze({ value: '4', label: '拣货库位和条码后5位和数量' }), + Object.freeze({ value: '5', label: '拣货库位商品名称条码和数量' }), + ], + }), ]); const POLICY_CONFIG_FIELD_MAP = Object.freeze(POLICY_CONFIG_FIELDS.reduce((result, field) => { result[field.key] = field; diff --git a/app/schedule/wave_strategy_quick_scan_fallback.js b/app/schedule/wave_strategy_quick_scan_fallback.js index 4a4bd10..15ac52e 100644 --- a/app/schedule/wave_strategy_quick_scan_fallback.js +++ b/app/schedule/wave_strategy_quick_scan_fallback.js @@ -47,7 +47,7 @@ module.exports = { for (const warehouseId of warehouseIds) { try { - const submitPayload = await ctx.service.systemMethods.order.wave.submitWaveStrategyQuickScanForWarehouse(warehouseId); + const submitPayload = await ctx.service.systemMethods.order.wave.submitWaveStrategyQuickScanForWarehouse(warehouseId, { wait: true }); const submitMessage = String(submitPayload && submitPayload.message || '').trim(); const submitState = String(submitPayload && submitPayload.state || '').trim(); const isReusedRunningTask = submitMessage.includes('已有快速扫描任务在运行中') diff --git a/app/service/systemMethods/order/archiveOrder.js b/app/service/systemMethods/order/archiveOrder.js index c242284..26b5aa8 100644 --- a/app/service/systemMethods/order/archiveOrder.js +++ b/app/service/systemMethods/order/archiveOrder.js @@ -21,6 +21,35 @@ class ArchiveOrderService extends OrderBaseService { async list(data = {}) { return await this.listByModule('archiveOrder', data); } + + /** + * 查询归档订单详情。 + * + * 默认使用 history 表查询; + * 若调用方显式传入表位参数,则保持调用方指定值。 + * + * @param {Object} data 请求体。 + * @return {Promise} 订单头、商品明细、运单与日志信息。 + */ + async detail(data = {}) { + const requestData = this.isPlainObject(data) ? data : {}; + const tableTypeFields = [ 'tableType', 'tablePosition', 'type', 'moduleName' ]; + const hasTableTypeInput = tableTypeFields.some(field => { + if (!Object.prototype.hasOwnProperty.call(requestData, field)) { + return false; + } + return String(requestData[field] ?? '').trim() !== ''; + }); + + const detailParams = hasTableTypeInput + ? requestData + : { + ...requestData, + tableType: 'history', + }; + + return await super.detail(detailParams); + } } module.exports = ArchiveOrderService; diff --git a/app/service/systemMethods/order/deliveryExpectionOrder.js b/app/service/systemMethods/order/deliveryExpectionOrder.js index 5600de0..a2570a4 100644 --- a/app/service/systemMethods/order/deliveryExpectionOrder.js +++ b/app/service/systemMethods/order/deliveryExpectionOrder.js @@ -21,6 +21,35 @@ class DeliveryExpectionOrderService extends OrderBaseService { return await this.listByModule('deliveryExpectionOrder', data); } + /** + * 查询配送异常订单详情。 + * + * 默认使用 dispatch 表查询; + * 若调用方显式传入表位参数,则保持调用方指定值。 + * + * @param {Object} data 请求体。 + * @return {Promise} 订单头、商品明细、运单与日志信息。 + */ + async detail(data = {}) { + const requestData = this.isPlainObject(data) ? data : {}; + const tableTypeFields = [ 'tableType', 'tablePosition', 'type', 'moduleName' ]; + const hasTableTypeInput = tableTypeFields.some(field => { + if (!Object.prototype.hasOwnProperty.call(requestData, field)) { + return false; + } + return String(requestData[field] ?? '').trim() !== ''; + }); + + const detailParams = hasTableTypeInput + ? requestData + : { + ...requestData, + tableType: 'dispatch', + }; + + return await super.detail(detailParams); + } + } module.exports = DeliveryExpectionOrderService; diff --git a/app/service/systemMethods/order/deliveryOrder.js b/app/service/systemMethods/order/deliveryOrder.js index 2139260..c0c59bc 100644 --- a/app/service/systemMethods/order/deliveryOrder.js +++ b/app/service/systemMethods/order/deliveryOrder.js @@ -21,6 +21,35 @@ class DeliveryOrderService extends OrderBaseService { return await this.listByModule('deliveryOrder', data); } + /** + * 查询配送订单详情。 + * + * 默认使用 dispatch 表查询; + * 若调用方显式传入表位参数,则保持调用方指定值。 + * + * @param {Object} data 请求体。 + * @return {Promise} 订单头、商品明细、运单与日志信息。 + */ + async detail(data = {}) { + const requestData = this.isPlainObject(data) ? data : {}; + const tableTypeFields = [ 'tableType', 'tablePosition', 'type', 'moduleName' ]; + const hasTableTypeInput = tableTypeFields.some(field => { + if (!Object.prototype.hasOwnProperty.call(requestData, field)) { + return false; + } + return String(requestData[field] ?? '').trim() !== ''; + }); + + const detailParams = hasTableTypeInput + ? requestData + : { + ...requestData, + tableType: 'dispatch', + }; + + return await super.detail(detailParams); + } + } module.exports = DeliveryOrderService; diff --git a/app/service/systemMethods/order/entrustOrder.js b/app/service/systemMethods/order/entrustOrder.js index 9a05e48..e2a6f2c 100644 --- a/app/service/systemMethods/order/entrustOrder.js +++ b/app/service/systemMethods/order/entrustOrder.js @@ -21,6 +21,35 @@ class EntrustOrderService extends OrderBaseService { return await this.listByModule('entrustOrder', data); } + /** + * 查询委托外仓订单详情。 + * + * 默认使用 outsourced 表查询; + * 若调用方显式传入表位参数,则保持调用方指定值。 + * + * @param {Object} data 请求体。 + * @return {Promise} 订单头、商品明细、运单与日志信息。 + */ + async detail(data = {}) { + const requestData = this.isPlainObject(data) ? data : {}; + const tableTypeFields = [ 'tableType', 'tablePosition', 'type', 'moduleName' ]; + const hasTableTypeInput = tableTypeFields.some(field => { + if (!Object.prototype.hasOwnProperty.call(requestData, field)) { + return false; + } + return String(requestData[field] ?? '').trim() !== ''; + }); + + const detailParams = hasTableTypeInput + ? requestData + : { + ...requestData, + tableType: 'outsourced', + }; + + return await super.detail(detailParams); + } + } module.exports = EntrustOrderService; diff --git a/app/service/systemMethods/order/print.js b/app/service/systemMethods/order/print.js index 7c38aac..1c81be7 100644 --- a/app/service/systemMethods/order/print.js +++ b/app/service/systemMethods/order/print.js @@ -11,9 +11,9 @@ class OrderPrintService extends OrderBaseService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = 'getWavePrintData'; - const _noNeedLog = 'getWavePrintData'; - const _noNeedAuth = 'getWavePrintData'; + const _noNeedRight = 'getWavePrintData,getWavePlatformPrintData'; + const _noNeedLog = 'getWavePrintData,getWavePlatformPrintData'; + const _noNeedAuth = 'getWavePrintData,getWavePlatformPrintData'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); } @@ -53,6 +53,42 @@ class OrderPrintService extends OrderBaseService { code: 200, }); } + + /** + * 获取波次平台打印中间态数据。 + * + * method 层仅负责参数解构与边界校验,具体业务查询与打印数据组装由 systems 层实现。 + * + * @param {Object} data 请求体。 + * @param {Array} data.wave_ids 波次ID数组。 + * @param {number|string} data.warehouse_id 仓库ID。 + * @return {Promise} 统一 success 包装的平台打印中间态结果。 + */ + async getWavePlatformPrintData(data = {}) { + const requestData = this.isPlainObject(data) ? data : {}; + const { + wave_ids: waveIds, + warehouse_id: warehouseId, + } = requestData; + + if (!Array.isArray(waveIds) || waveIds.length === 0) { + throw new Error('wave_ids 必填,且必须为非空数组'); + } + + if (warehouseId === undefined || warehouseId === null || String(warehouseId).trim() === '') { + throw new Error('warehouse_id 必填'); + } + + const result = await this.service.systems.orderPrint.getWavePlatformPrintData({ + waveIds, + warehouseId, + }); + + return this.success('ok', { + data: result, + code: 200, + }); + } } module.exports = OrderPrintService; diff --git a/app/service/systemMethods/order/wave.js b/app/service/systemMethods/order/wave.js index 0a14c4d..8650894 100644 --- a/app/service/systemMethods/order/wave.js +++ b/app/service/systemMethods/order/wave.js @@ -48,6 +48,41 @@ const WAVE_STRATEGY_FALLBACK_WHERE_FIELD_MAP = Object.freeze({ province: 'province', sys_platform_name: 'sys_platform_name', }); +const BATCH_LIST_ASSIGNMENT_FILTER_SCHEMAS = Object.freeze({ + storage: Object.freeze({ + fieldName: 'storage_assignment_status', + enumMap: Object.freeze({ + 未分配: 'none', + 部分分配: 'partial', + 已分配: 'finished', + }), + caseInsensitive: false, + statsColumnPrefix: 'storage', + withErrorStatus: true, + }), + express: Object.freeze({ + fieldName: 'express_assignment_status', + enumMap: Object.freeze({ + unassigned: 'none', + partially_assigned: 'partial', + assigned: 'finished', + }), + caseInsensitive: true, + statsColumnPrefix: 'post', + withErrorStatus: true, + }), + print: Object.freeze({ + fieldName: 'print_assignment_status', + enumMap: Object.freeze({ + unprinted: 'none', + partially_printed: 'partial', + printed: 'finished', + }), + caseInsensitive: true, + statsColumnPrefix: 'print', + withErrorStatus: false, + }), +}); class WaveService extends OrderBaseService { /** @@ -58,7 +93,7 @@ class WaveService extends OrderBaseService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = 'groupOrderFetchList,singleOrderFetchList,waveStrategyList,waveStrategyFallbackOrderList,waveStrategyFetchPda,waveStrategyFetchAdmin,groupFetch,singleFetch,fetch,fetchTaskProgress,batchList,wavePickTaskList,batchCancel,batchCancelTaskProgress,batchRemoveExceptionOrders,batchRemoveExceptionOrdersTaskProgress,batchAllocateExpress,batchAllocateExpressTaskProgress,batchAllocateStorage,batchAllocateStorageTaskProgress,batchAutoGrouping,batchFinishAutoGrouping,batchRemoveOrders,singleFetchByIds,waveStrategyQuickScan,waveStrategyQuickScanTaskProgress'; + const _noNeedRight = 'wavePickTaskCancelSelf,groupOrderFetchList,singleOrderFetchList,waveStrategyList,waveStrategyFallbackOrderList,waveStrategyFetchPda,waveStrategyFetchAdmin,groupFetch,singleFetch,fetch,fetchTaskProgress,batchList,wavePickTaskList,batchCancel,batchCancelTaskProgress,batchRemoveExceptionOrders,batchRemoveExceptionOrdersTaskProgress,batchAllocateExpress,batchAllocateExpressTaskProgress,batchAllocateStorage,batchAllocateStorageTaskProgress,batchAutoGrouping,batchFinishAutoGrouping,batchRemoveOrders,singleFetchByIds,waveStrategyQuickScan,waveStrategyQuickScanTaskProgress'; const _noNeedLog = 'groupOrderFetchList,singleOrderFetchList,waveStrategyList,waveStrategyFallbackOrderList,waveStrategyFetchPda,waveStrategyFetchAdmin,groupFetch,singleFetch,fetch,fetchTaskProgress,batchList,wavePickTaskList,batchCancel,batchCancelTaskProgress,batchRemoveExceptionOrders,batchRemoveExceptionOrdersTaskProgress,batchAllocateExpress,batchAllocateExpressTaskProgress,batchAllocateStorage,batchAllocateStorageTaskProgress,batchAutoGrouping,batchFinishAutoGrouping,batchRemoveOrders,singleFetchByIds,waveStrategyQuickScan,waveStrategyQuickScanTaskProgress'; const _noNeedAuth = 'groupOrderFetchList,singleOrderFetchList,waveStrategyList,waveStrategyFallbackOrderList,waveStrategyFetchPda,waveStrategyFetchAdmin,groupFetch,singleFetch,fetch,fetchTaskProgress,batchList,wavePickTaskList,batchCancel,batchCancelTaskProgress,batchRemoveExceptionOrders,batchRemoveExceptionOrdersTaskProgress,batchAllocateExpress,batchAllocateExpressTaskProgress,batchAllocateStorage,batchAllocateStorageTaskProgress,batchAutoGrouping,batchFinishAutoGrouping,batchRemoveOrders,singleFetchByIds,waveStrategyQuickScan,waveStrategyQuickScanTaskProgress'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); @@ -1177,6 +1212,64 @@ class WaveService extends OrderBaseService { * @return {string} 规范化后的筛选值,未传时返回空字符串。 */ normalizeBatchListStorageAssignmentStatusFilter(value) { + return this.normalizeBatchListAssignmentStatusFilterByType(value, 'storage'); + } + + /** + * 规范化波次列表快递分配状态筛选值(英文枚举)。 + * + * @param {string} value 入参筛选值。 + * @return {string} 规范化后的筛选值,未传时返回空字符串。 + */ + normalizeBatchListExpressAssignmentStatusFilter(value) { + return this.normalizeBatchListAssignmentStatusFilterByType(value, 'express'); + } + + /** + * 规范化波次列表打印状态筛选值(英文枚举)。 + * + * @param {string} value 入参筛选值。 + * @return {string} 规范化后的筛选值,未传时返回空字符串。 + */ + normalizeBatchListPrintAssignmentStatusFilter(value) { + return this.normalizeBatchListAssignmentStatusFilterByType(value, 'print'); + } + + /** + * 根据类型获取波次分配状态筛选配置。 + * + * @param {'storage'|'express'|'print'} type 筛选类型。 + * @return {{ fieldName: string, enumMap: Object, caseInsensitive: boolean, statsColumnPrefix: string, withErrorStatus: boolean }} 筛选配置。 + */ + getBatchListAssignmentFilterSchema(type) { + const normalizedType = String(type || '').trim(); + const schema = BATCH_LIST_ASSIGNMENT_FILTER_SCHEMAS[normalizedType]; + if (!schema) { + throw new Error(`不支持的分配状态筛选类型: ${normalizedType}`); + } + return schema; + } + + /** + * 按类型规范化波次列表分配状态筛选值。 + * + * @param {string} value 入参筛选值。 + * @param {'storage'|'express'|'print'} type 筛选类型。 + * @return {string} 规范化后的筛选值,未传时返回空字符串。 + */ + normalizeBatchListAssignmentStatusFilterByType(value, type) { + const schema = this.getBatchListAssignmentFilterSchema(type); + return this.normalizeBatchListAssignmentStatusFilter(value, schema); + } + + /** + * 规范化波次列表分配状态筛选值。 + * + * @param {string} value 入参筛选值。 + * @param {{ fieldName: string, enumMap: Object, caseInsensitive: boolean }} schema 筛选配置。 + * @return {string} 规范化后的筛选标识(none/partial/finished)。 + */ + normalizeBatchListAssignmentStatusFilter(value, schema) { if (value === undefined || value === null || value === '') { return ''; } @@ -1186,12 +1279,23 @@ class WaveService extends OrderBaseService { return ''; } - const allowedValues = [ '未分配', '部分分配', '已分配' ]; - if (!allowedValues.includes(normalizedValue)) { - throw new Error(`storage_assignment_status 参数不合法,仅支持: ${allowedValues.join('、')}`); + const enumMap = this.isPlainObject(schema && schema.enumMap) ? schema.enumMap : {}; + const allowedValues = Object.keys(enumMap); + const isCaseInsensitive = Boolean(schema && schema.caseInsensitive); + const lookupValue = isCaseInsensitive ? normalizedValue.toLowerCase() : normalizedValue; + const normalizedEnumMap = isCaseInsensitive + ? Object.fromEntries( + Object.entries(enumMap).map(([ key, mappedValue ]) => [ String(key).toLowerCase(), mappedValue ]) + ) + : enumMap; + const matchedValue = normalizedEnumMap[lookupValue]; + + if (!matchedValue) { + const fieldName = String(schema && schema.fieldName || 'assignment_status'); + throw new Error(`${fieldName} 参数不合法,仅支持: ${allowedValues.join('、')}`); } - return normalizedValue; + return matchedValue; } /** @@ -1235,7 +1339,50 @@ class WaveService extends OrderBaseService { * @return {{ sql: string, replacements: Object }} SQL 条件片段与参数。 */ buildBatchListStorageAssignmentFilterClause(statusFilter = '') { - const normalizedStatusFilter = this.normalizeBatchListStorageAssignmentStatusFilter(statusFilter); + return this.buildBatchListAssignmentStatusFilterClauseByType(statusFilter, 'storage'); + } + + /** + * 构建波次列表快递分配状态筛选 SQL 条件。 + * + * @param {string} statusFilter 快递分配状态筛选值(none/partial/finished)。 + * @return {{ sql: string, replacements: Object }} SQL 条件片段与参数。 + */ + buildBatchListExpressAssignmentFilterClause(statusFilter = '') { + return this.buildBatchListAssignmentStatusFilterClauseByType(statusFilter, 'express'); + } + + /** + * 构建波次列表打印状态筛选 SQL 条件。 + * + * @param {string} statusFilter 打印状态筛选值(none/partial/finished)。 + * @return {{ sql: string, replacements: Object }} SQL 条件片段与参数。 + */ + buildBatchListPrintAssignmentFilterClause(statusFilter = '') { + return this.buildBatchListAssignmentStatusFilterClauseByType(statusFilter, 'print'); + } + + /** + * 按类型构建波次列表分配状态筛选 SQL 条件。 + * + * @param {string} statusFilter 分配状态筛选值(none/partial/finished)。 + * @param {'storage'|'express'|'print'} type 筛选类型。 + * @return {{ sql: string, replacements: Object }} SQL 条件片段与参数。 + */ + buildBatchListAssignmentStatusFilterClauseByType(statusFilter = '', type = 'storage') { + const schema = this.getBatchListAssignmentFilterSchema(type); + return this.buildBatchListAssignmentStatusFilterClause(statusFilter, schema); + } + + /** + * 构建波次列表分配状态筛选 SQL 条件(通用)。 + * + * @param {string} statusFilter 分配状态筛选值(none/partial/finished)。 + * @param {{ statsColumnPrefix: string, withErrorStatus: boolean }} schema 筛选配置。 + * @return {{ sql: string, replacements: Object }} SQL 条件片段与参数。 + */ + buildBatchListAssignmentStatusFilterClause(statusFilter = '', schema = {}) { + const normalizedStatusFilter = String(statusFilter || '').trim(); if (!normalizedStatusFilter) { return { sql: '', @@ -1243,47 +1390,54 @@ class WaveService extends OrderBaseService { }; } - const totalExpr = 'COALESCE(wave_order_stats.order_total, 0)'; - const storageNoneExpr = 'COALESCE(wave_order_stats.storage_none_count, 0)'; - const storageFinExpr = 'COALESCE(wave_order_stats.storage_fin_count, 0)'; - const storageErrorExpr = 'COALESCE(wave_order_stats.storage_error_count, 0)'; - let whereClause = ''; + const statsPrefix = String(schema && schema.statsColumnPrefix || '').trim(); + if (!statsPrefix) { + throw new Error('分配状态筛选配置不完整,缺少统计字段前缀'); + } - if (normalizedStatusFilter === '已分配') { - whereClause = ` - ${storageFinExpr} = ${totalExpr} - AND ${totalExpr} > 0 - `; - } else if (normalizedStatusFilter === '部分分配') { - whereClause = ` - ${storageErrorExpr} = 0 - AND ${storageNoneExpr} <> ${totalExpr} - AND ${storageFinExpr} <> ${totalExpr} - `; - } else if (normalizedStatusFilter === '未分配') { + const totalExpr = 'COALESCE(wave_order_stats.order_total, 0)'; + const noneExpr = `COALESCE(wave_order_stats.${statsPrefix}_none_count, 0)`; + const finExpr = `COALESCE(wave_order_stats.${statsPrefix}_fin_count, 0)`; + const withErrorStatus = Boolean(schema && schema.withErrorStatus); + const errorExpr = withErrorStatus ? `COALESCE(wave_order_stats.${statsPrefix}_error_count, 0)` : ''; + + if (normalizedStatusFilter === 'finished') { + return { + sql: ` + AND ${finExpr} = ${totalExpr} + AND ${totalExpr} > 0`, + replacements: {}, + }; + } + + if (normalizedStatusFilter === 'partial') { + return { + sql: ` + AND ${withErrorStatus ? `${errorExpr} = 0\n AND ` : ''}${noneExpr} <> ${totalExpr} + AND ${finExpr} <> ${totalExpr}`, + replacements: {}, + }; + } + + if (normalizedStatusFilter === 'none') { return { sql: ` AND ( ${totalExpr} = 0 - OR ${storageErrorExpr} > 0 - OR ${storageNoneExpr} = ${totalExpr} + ${withErrorStatus ? `OR ${errorExpr} > 0\n ` : ''}OR ${noneExpr} = ${totalExpr} )`, replacements: {}, }; } - return { - sql: ` - AND ${whereClause}`, - replacements: {}, - }; + throw new Error(`不支持的分配状态筛选值: ${normalizedStatusFilter}`); } /** * 构建波次列表 where 条件(白名单字段)。 * - * @param {Object} whereData 查询 where 入参。 - * @return {{ sql: string, replacements: Object, storageAssignmentStatus: string }} SQL 条件片段、参数与库位分配状态筛选值。 + * @param {Object} whereData 查询 where 入参。 + * @return {{ sql: string, replacements: Object, storageAssignmentStatus: string, expressAssignmentStatus: string, printAssignmentStatus: string }} SQL 条件片段、参数与分配状态筛选值。 */ buildBatchListWhereClause(whereData = {}) { const normalizedWhere = this.isPlainObject(whereData) ? whereData : {}; @@ -1311,6 +1465,8 @@ class WaveService extends OrderBaseService { 'processed_orders_min', 'processed_orders_max', 'storage_assignment_status', + 'express_assignment_status', + 'print_assignment_status', ]; const invalidFields = whereKeys.filter(key => !allowedFields.includes(key)); @@ -1438,11 +1594,19 @@ class WaveService extends OrderBaseService { const storageAssignmentStatus = this.normalizeBatchListStorageAssignmentStatusFilter( normalizedWhere.storage_assignment_status ); + const expressAssignmentStatus = this.normalizeBatchListExpressAssignmentStatusFilter( + normalizedWhere.express_assignment_status + ); + const printAssignmentStatus = this.normalizeBatchListPrintAssignmentStatusFilter( + normalizedWhere.print_assignment_status + ); return { sql: conditions.length > 0 ? `\n AND ${conditions.join('\n AND ')}` : '', replacements, storageAssignmentStatus, + expressAssignmentStatus, + printAssignmentStatus, }; } @@ -3087,6 +3251,9 @@ class WaveService extends OrderBaseService { if (Object.prototype.hasOwnProperty.call(requestData, 'description')) { payload.description = String(requestData.description || '').trim(); } + if (mode === 'create' || Object.prototype.hasOwnProperty.call(requestData, 'wave_prefix')) { + payload.wave_prefix = this.normalizeWaveStrategyWavePrefix(requestData.wave_prefix); + } if (Object.prototype.hasOwnProperty.call(requestData, 'allowed_provinces')) { payload.allowed_provinces = this.normalizeWaveStrategyQuickScanStringList(requestData.allowed_provinces); } @@ -3115,6 +3282,71 @@ class WaveService extends OrderBaseService { return payload; } + /** + * 归一化波次策略波次前缀。 + * + * 规则: + * 1. 允许为空字符串(表示回退仓库前缀); + * 2. 非空时统一转大写; + * 3. 非空时仅允许 A-Z0-9,长度 1-5。 + * + * @param {*} rawWavePrefix 原始波次前缀入参。 + * @return {string} 归一化后的波次前缀。 + */ + normalizeWaveStrategyWavePrefix(rawWavePrefix) { + if (rawWavePrefix === undefined || rawWavePrefix === null) { + return ''; + } + + const normalizedWavePrefix = String(rawWavePrefix).trim() + .toUpperCase(); + if (!normalizedWavePrefix) { + return ''; + } + + if (normalizedWavePrefix.length < 1 || normalizedWavePrefix.length > 5) { + throw new Error('wave_prefix 非空时长度必须为 1-5 个字符'); + } + + if (!/^[A-Z0-9]+$/.test(normalizedWavePrefix)) { + throw new Error('wave_prefix 非空时仅支持 A-Z0-9'); + } + + return normalizedWavePrefix; + } + + /** + * 解析策略抓取建波使用的前缀(策略优先,仓库前缀兜底)。 + * + * @param {Object} params 解析参数。 + * @param {number|string} params.warehouseId 仓库ID。 + * @param {number|string} params.strategyType 策略类型(1-散单,2-团购)。 + * @param {Object} [params.strategyRow={}] 策略行。 + * @return {Promise<{ wavePrefix: string, source: string }>} 前缀及来源。 + */ + async resolveWaveStrategyFetchWavePrefix(params = {}) { + const warehouseId = this.normalizeRequiredPositiveInteger(params.warehouseId, 'warehouse_id'); + const strategyType = Number(params.strategyType || 0); + const strategyRow = this.isPlainObject(params.strategyRow) ? params.strategyRow : {}; + const strategyWavePrefix = this.normalizeWaveStrategyWavePrefix(strategyRow.wave_prefix); + + if (strategyWavePrefix) { + return { + wavePrefix: strategyWavePrefix, + source: 'strategy', + }; + } + + const warehouseWavePrefix = strategyType === 2 + ? await this.getGroupWavePrefix(warehouseId) + : await this.getSingleFetchByIdsWavePrefix(warehouseId); + + return { + wavePrefix: String(warehouseWavePrefix || '').trim() || (strategyType === 2 ? 'B' : 'A'), + source: 'warehouse_fallback', + }; + } + /** * 按字段补丁方式归一化波次策略正整数参数。 * @@ -3608,6 +3840,8 @@ class WaveService extends OrderBaseService { const orderTableName = this.getModelTableSqlName(orderModel); const whereClause = this.buildBatchListWhereClause(requestData.where); const storageAssignmentFilterClause = this.buildBatchListStorageAssignmentFilterClause(whereClause.storageAssignmentStatus); + const expressAssignmentFilterClause = this.buildBatchListExpressAssignmentFilterClause(whereClause.expressAssignmentStatus); + const printAssignmentFilterClause = this.buildBatchListPrintAssignmentFilterClause(whereClause.printAssignmentStatus); const baseBatchWhereSql = ` warehouse_id = :warehouseId AND wave_status IN (:waveStatusList) @@ -3639,7 +3873,12 @@ class WaveService extends OrderBaseService { COUNT(od.wave_id) AS order_total, SUM(CASE WHEN od.storage_status = 'none' THEN 1 ELSE 0 END) AS storage_none_count, SUM(CASE WHEN od.storage_status = 'fin' THEN 1 ELSE 0 END) AS storage_fin_count, - SUM(CASE WHEN od.storage_status = 'error' THEN 1 ELSE 0 END) AS storage_error_count + SUM(CASE WHEN od.storage_status = 'error' THEN 1 ELSE 0 END) AS storage_error_count, + SUM(CASE WHEN od.post_status = 'none' THEN 1 ELSE 0 END) AS post_none_count, + SUM(CASE WHEN od.post_status = 'fin' THEN 1 ELSE 0 END) AS post_fin_count, + SUM(CASE WHEN od.post_status = 'error' THEN 1 ELSE 0 END) AS post_error_count, + SUM(CASE WHEN od.print_status = 'none' THEN 1 ELSE 0 END) AS print_none_count, + SUM(CASE WHEN od.print_status = 'fin' THEN 1 ELSE 0 END) AS print_fin_count FROM ( SELECT wave_id FROM wms_wave_batch @@ -3650,6 +3889,8 @@ class WaveService extends OrderBaseService { ) wave_order_stats ON wave_order_stats.wave_id = wb.wave_id WHERE 1 = 1 ${storageAssignmentFilterClause.sql} + ${expressAssignmentFilterClause.sql} + ${printAssignmentFilterClause.sql} `; const listSql = ` @@ -3667,7 +3908,16 @@ class WaveService extends OrderBaseService { wb.warehouse_id, wb.creator, wb.create_time, - wb.update_time + wb.update_time, + COALESCE(wave_order_stats.order_total, 0) AS order_total, + COALESCE(wave_order_stats.storage_none_count, 0) AS storage_none_count, + COALESCE(wave_order_stats.storage_fin_count, 0) AS storage_fin_count, + COALESCE(wave_order_stats.storage_error_count, 0) AS storage_error_count, + COALESCE(wave_order_stats.post_none_count, 0) AS post_none_count, + COALESCE(wave_order_stats.post_fin_count, 0) AS post_fin_count, + COALESCE(wave_order_stats.post_error_count, 0) AS post_error_count, + COALESCE(wave_order_stats.print_none_count, 0) AS print_none_count, + COALESCE(wave_order_stats.print_fin_count, 0) AS print_fin_count ${batchListFromSql} ORDER BY wb.total_orders DESC, wb.wave_id DESC LIMIT :limit OFFSET :offset @@ -3685,6 +3935,8 @@ class WaveService extends OrderBaseService { waveStatusList, ...whereClause.replacements, ...storageAssignmentFilterClause.replacements, + ...expressAssignmentFilterClause.replacements, + ...printAssignmentFilterClause.replacements, limit: pageSize, offset, }, @@ -3695,6 +3947,8 @@ class WaveService extends OrderBaseService { waveStatusList, ...whereClause.replacements, ...storageAssignmentFilterClause.replacements, + ...expressAssignmentFilterClause.replacements, + ...printAssignmentFilterClause.replacements, }, }), ]); @@ -3718,82 +3972,17 @@ class WaveService extends OrderBaseService { }); } - const waveIds = rawList - .map(item => Number(item && item.wave_id || 0)) - .filter(id => Number.isInteger(id) && id > 0); - - const orderRows = waveIds.length > 0 - ? await orderModel.findAll({ - where: { - wave_id: { [Op.in]: waveIds }, - }, - attributes: [ 'wave_id', 'storage_status', 'post_status', 'print_status' ], - raw: true, - }) - : []; - - const waveOrderStatsMap = new Map(); - for (const row of orderRows) { - const waveId = Number(row && row.wave_id || 0); - if (!Number.isInteger(waveId) || waveId <= 0) { - continue; - } - - if (!waveOrderStatsMap.has(waveId)) { - waveOrderStatsMap.set(waveId, { - orderCount: 0, - storageNoneCount: 0, - storageFinCount: 0, - storageErrorCount: 0, - expressNoneCount: 0, - expressFinCount: 0, - expressErrorCount: 0, - printNoneCount: 0, - printFinCount: 0, - }); - } - - const stats = waveOrderStatsMap.get(waveId); - const storageStatus = String(row && row.storage_status || '').trim(); - const expressStatus = String(row && row.post_status || '').trim(); - const printStatus = String(row && row.print_status || '').trim(); - - stats.orderCount += 1; - if (storageStatus === 'none') { - stats.storageNoneCount += 1; - } else if (storageStatus === 'fin') { - stats.storageFinCount += 1; - } else if (storageStatus === 'error') { - stats.storageErrorCount += 1; - } - - if (expressStatus === 'none') { - stats.expressNoneCount += 1; - } else if (expressStatus === 'fin') { - stats.expressFinCount += 1; - } else if (expressStatus === 'error') { - stats.expressErrorCount += 1; - } - - if (printStatus === 'none') { - stats.printNoneCount += 1; - } else if (printStatus === 'fin') { - stats.printFinCount += 1; - } - } - const list = rawList.map(batch => { const waveId = Number(batch && batch.wave_id || 0); - const stats = waveOrderStatsMap.get(waveId) || {}; - const orderCount = Number(stats.orderCount || 0); - const storageNoneCount = Number(stats.storageNoneCount || 0); - const storageFinCount = Number(stats.storageFinCount || 0); - const storageErrorCount = Number(stats.storageErrorCount || 0); - const expressNoneCount = Number(stats.expressNoneCount || 0); - const expressFinCount = Number(stats.expressFinCount || 0); - const expressErrorCount = Number(stats.expressErrorCount || 0); - const printNoneCount = Number(stats.printNoneCount || 0); - const printFinCount = Number(stats.printFinCount || 0); + const orderCount = Number(batch && batch.order_total || 0); + const storageNoneCount = Number(batch && batch.storage_none_count || 0); + const storageFinCount = Number(batch && batch.storage_fin_count || 0); + const storageErrorCount = Number(batch && batch.storage_error_count || 0); + const expressNoneCount = Number(batch && batch.post_none_count || 0); + const expressFinCount = Number(batch && batch.post_fin_count || 0); + const expressErrorCount = Number(batch && batch.post_error_count || 0); + const printNoneCount = Number(batch && batch.print_none_count || 0); + const printFinCount = Number(batch && batch.print_fin_count || 0); return { wave_id: waveId, @@ -4570,6 +4759,7 @@ class WaveService extends OrderBaseService { * @param {number|string} [warehouseId=0] 仓库ID,未传时优先使用上下文仓库ID。 * @param {Object} [options={}] 提交选项。 * @param {Array|number|string} [options.orderIds] 可选订单ID数组。 + * @param {boolean} [options.wait=false] 是否等待任务执行完成后再返回最终进度快照。 * @return {Promise} 任务受理结果(plain object)。 */ async submitWaveStrategyQuickScanForWarehouse(warehouseId = 0, options = {}) { @@ -4579,6 +4769,7 @@ class WaveService extends OrderBaseService { } const normalizedOptions = this.isPlainObject(options) ? options : {}; const orderIds = this.normalizeIdsInput(normalizedOptions.orderIds); + const wait = this.normalizeBoolean(normalizedOptions.wait, false); const runningTask = await this.getWaveStrategyQuickScanWarehouseLock(normalizedWarehouseId); if (runningTask && runningTask.task_id) { @@ -4624,6 +4815,22 @@ class WaveService extends OrderBaseService { accepted_at: acceptedAt, }); + if (wait) { + await this.runWaveStrategyQuickScanTask({ + taskId, + warehouseId: normalizedWarehouseId, + ...(orderIds.length > 0 ? { orderIds } : {}), + }); + + const finalProgress = await this.getWaveStrategyQuickScanTaskProgress(taskId) || {}; + return { + ...finalProgress, + task_id: taskId, + warehouse_id: normalizedWarehouseId, + accepted_at: acceptedAt, + }; + } + setImmediate(() => { this.runWaveStrategyQuickScanTask({ taskId, @@ -9604,8 +9811,18 @@ class WaveService extends OrderBaseService { removed_order_ids: [], candidate_count: candidateCount, grouped_count: groupedRows.length, + wave_prefix: '', + wave_prefix_source: '', }; + const wavePrefixResolution = await this.resolveWaveStrategyFetchWavePrefix({ + warehouseId, + strategyType, + strategyRow, + }); + result.wave_prefix = wavePrefixResolution.wavePrefix; + result.wave_prefix_source = wavePrefixResolution.source; + if (strategyType === 2) { const groupLimitRaw = Number(strategyRow.group_batch_max_orders || plan.box_limit || 0); const groupLimit = Number.isInteger(groupLimitRaw) && groupLimitRaw > 0 ? groupLimitRaw : 1; @@ -9615,13 +9832,12 @@ class WaveService extends OrderBaseService { throw new Error('团购策略未找到可创建波次的同结构分组'); } - const groupWavePrefix = await this.getGroupWavePrefix(warehouseId); for (const group of selectedGroups) { const created = await this.createWaveBatchByOrderIdsInTransaction({ warehouseId, orderIds: group.order_ids, waveType: 1, - wavePrefix: groupWavePrefix, + wavePrefix: wavePrefixResolution.wavePrefix, source: waveBatchSource, transaction, }); @@ -9677,12 +9893,11 @@ class WaveService extends OrderBaseService { throw new Error('散单策略筛选后无可用订单(batch_max_orders 限制导致为空)'); } - const singleWavePrefix = await this.getSingleFetchByIdsWavePrefix(warehouseId); const createdWave = await this.createWaveBatchByOrderIdsInTransaction({ warehouseId, orderIds: limitedOrderIds, waveType: 2, - wavePrefix: singleWavePrefix, + wavePrefix: wavePrefixResolution.wavePrefix, source: waveBatchSource, transaction, }); @@ -9703,6 +9918,9 @@ class WaveService extends OrderBaseService { strategy_id: strategyId, warehouse_id: warehouseId, pick_mode: pickMode, + strategy_type: strategyType, + wave_prefix: result.wave_prefix, + wave_prefix_source: result.wave_prefix_source, candidate_count: result.candidate_count, removed_count: result.removed_order_ids.length, selected_count: result.selected_order_ids.length, @@ -9712,6 +9930,140 @@ class WaveService extends OrderBaseService { return result; } + /** + * 按策略直接抓取候选订单并创建波次(不创建拣货任务)。 + * + * 在一个事务内完成候选查询、分组与建波: + * - 团购策略(strategy_type=2):每个结构分组创建一个波次; + * - 散单策略(strategy_type=1):合并全部候选订单后创建一个散单波次。 + * + * @param {Object} params 执行参数。 + * @param {Object} params.plan 预处理计划。 + * @param {Object} [params.strategyRow={}] 策略行(可选,默认取 plan.strategy_row)。 + * @param {number|string} [params.waveBatchSource=0] 波次来源:0-普通波次 1-管理后台策略抓取 2-PDA策略抓取。 + * @return {Promise} 建波结果汇总。 + */ + async executeWaveStrategyDirectFetch(params = {}) { + const plan = this.isPlainObject(params && params.plan) ? params.plan : {}; + const strategyRow = this.isPlainObject(params && params.strategyRow) + ? params.strategyRow + : (this.isPlainObject(plan.strategy_row) ? plan.strategy_row : {}); + const waveBatchSourceInput = Number(params && params.waveBatchSource); + const waveBatchSource = [ 0, 1, 2 ].includes(waveBatchSourceInput) ? waveBatchSourceInput : 0; + + const warehouseId = this.normalizeRequiredPositiveInteger(plan.warehouse_id, 'warehouse_id'); + const strategyId = this.normalizeRequiredPositiveInteger(plan.strategy_id, 'strategy_id'); + const strategyType = Number(strategyRow.strategy_type || plan.strategy_type || 0); + const transaction = await this.ctx.model.transaction(); + + try { + const candidateRows = await this.getWaveStrategyFetchCandidateOrders({ + warehouseId, + strategyId, + minSameStructure: strategyRow.min_same_structure, + maxSameStructure: strategyRow.max_same_structure, + }); + const candidateCount = candidateRows.length; + if (candidateCount <= 0) { + throw new Error('未找到符合策略且未分配波次的候选订单'); + } + + const groupedRows = this.groupWaveStrategyFetchCandidateOrdersByStructure(candidateRows); + if (groupedRows.length <= 0) { + throw new Error('候选订单缺少有效商品结构,无法创建波次'); + } + + const wavePrefixResolution = await this.resolveWaveStrategyFetchWavePrefix({ + warehouseId, + strategyType, + strategyRow, + }); + + const createdWaveIds = []; + const createdWaveNos = []; + const createdOrderIds = []; + + if (strategyType === 2) { + for (const group of groupedRows) { + const created = await this.createWaveBatchByOrderIdsInTransaction({ + warehouseId, + orderIds: group.order_ids, + waveType: 1, + wavePrefix: wavePrefixResolution.wavePrefix, + source: waveBatchSource, + transaction, + }); + createdWaveIds.push(created.waveId); + createdWaveNos.push(created.waveNo); + createdOrderIds.push(...created.selectedOrderIds); + } + } else if (strategyType === 1) { + const mergedOrderIds = [ ...new Set(groupedRows + .flatMap(group => group.order_ids) + .map(id => Number(id || 0)) + .filter(id => Number.isInteger(id) && id > 0)) ] + .sort((a, b) => a - b); + if (mergedOrderIds.length <= 0) { + throw new Error('散单策略无可用候选订单'); + } + + const createdWave = await this.createWaveBatchByOrderIdsInTransaction({ + warehouseId, + orderIds: mergedOrderIds, + waveType: 2, + wavePrefix: wavePrefixResolution.wavePrefix, + source: waveBatchSource, + transaction, + }); + createdWaveIds.push(createdWave.waveId); + createdWaveNos.push(createdWave.waveNo); + createdOrderIds.push(...createdWave.selectedOrderIds); + } else { + throw new Error(`不支持的策略类型: ${strategyType}`); + } + + const normalizedWaveIds = [ ...new Set(createdWaveIds) ].sort((a, b) => a - b); + const normalizedWaveNos = [ ...new Set(createdWaveNos.map(item => String(item || '').trim()).filter(Boolean)) ]; + const normalizedOrderIds = [ ...new Set(createdOrderIds) ].sort((a, b) => a - b); + + if (normalizedWaveIds.length <= 0 || normalizedOrderIds.length <= 0) { + throw new Error('按策略抓取建波失败:未生成有效波次或订单结果'); + } + + const result = { + wave_ids: normalizedWaveIds, + wave_nos: normalizedWaveNos, + order_ids: normalizedOrderIds, + created_wave_count: normalizedWaveIds.length, + created_order_count: normalizedOrderIds.length, + wave_prefix: wavePrefixResolution.wavePrefix, + wave_prefix_source: wavePrefixResolution.source, + candidate_count: candidateCount, + grouped_count: groupedRows.length, + strategy_type: strategyType, + }; + + await transaction.commit(); + + this.ctx.logger.info('[wave.executeWaveStrategyDirectFetch] 按策略直接建波完成', { + strategy_id: strategyId, + warehouse_id: warehouseId, + strategy_type: strategyType, + wave_prefix: result.wave_prefix, + wave_prefix_source: result.wave_prefix_source, + candidate_count: result.candidate_count, + grouped_count: result.grouped_count, + created_wave_count: result.created_wave_count, + created_order_count: result.created_order_count, + }); + + return result; + } catch (error) { + await transaction.rollback(); + throw error; + } + } + /** * 执行按策略抓取任务创建主流程。 * @@ -11279,11 +11631,11 @@ class WaveService extends OrderBaseService { } /** - * 按策略抓取任务壳子方法(仅后台管理使用),仅受理请求并返回任务信息。 + * 后台按策略直接抓取并创建波次。 * * @param {Object} [data={}] 请求参数。 * @param {number|string} data.strategy_id 波次策略ID(支持 strategyId)。 - * @return {Promise} 受理结果。 + * @return {Promise} 建波结果。 */ async waveStrategyFetchAdmin(data = {}) { const normalizedData = this.isPlainObject(data) ? data : {}; @@ -11319,9 +11671,7 @@ class WaveService extends OrderBaseService { data: { status: 'failed', fetch_state: 2, - tip: '创建失败,请重试', - task_id: null, - can_enter_pick_flow: false, + tip: '建波失败,请重试', warehouse_id: warehouseId, strategy_id: strategyId, source: 'admin', @@ -11331,59 +11681,45 @@ class WaveService extends OrderBaseService { } try { - const createdTask = await this.createWavePickTaskFromPlan({ + const directFetchResult = await this.executeWaveStrategyDirectFetch({ plan, - data: normalizedData, waveBatchSource: 1, }); - this.ctx.logger.info('[wave.waveStrategyFetchAdmin] 任务创建成功', { - taskId: createdTask.task_id, - taskNo: createdTask.task_no, + this.ctx.logger.info('[wave.waveStrategyFetchAdmin] 建波成功', { warehouseId, strategyId, + strategyType: directFetchResult.strategy_type, + createdWaveCount: directFetchResult.created_wave_count, + createdOrderCount: directFetchResult.created_order_count, }); return this.success('ok', { status: 'success', fetch_state: 1, - tip: '任务创建成功', - task_id: createdTask.task_id, - task_no: createdTask.task_no, - can_enter_pick_flow: false, + tip: '建波成功', warehouse_id: warehouseId, strategy_id: strategyId, source: 'admin', - state: createdTask.state, plan, - plan_summary: createdTask.plan_summary, + wave_ids: directFetchResult.wave_ids, + wave_nos: directFetchResult.wave_nos, + order_ids: directFetchResult.order_ids, + created_wave_count: directFetchResult.created_wave_count, + created_order_count: directFetchResult.created_order_count, + wave_prefix: directFetchResult.wave_prefix, + wave_prefix_source: directFetchResult.wave_prefix_source, + candidate_count: directFetchResult.candidate_count, + grouped_count: directFetchResult.grouped_count, + strategy_type: directFetchResult.strategy_type, accepted_at: new Date().toISOString(), }); } catch (error) { - const errorMessage = String(error && error.message || ''); - if (errorMessage.includes('当前用户存在未完成任务')) { - const existingTaskInfo = this.parseWaveStrategyExistingTaskInfo(errorMessage); - return this.success('存在未完成任务', { - status: 'failed', - fetch_state: 3, - tip: '存在未完成任务,已返回任务ID,可继续拣货', - task_id: existingTaskInfo.task_id, - task_no: existingTaskInfo.task_no, - can_enter_pick_flow: true, - warehouse_id: warehouseId, - strategy_id: strategyId, - source: 'admin', - plan, - }); - } - - return this.fail(`按策略抓取任务创建失败: ${error.message}`, { + return this.fail(`按策略抓取建波失败: ${error.message}`, { data: { status: 'failed', fetch_state: 2, - tip: '创建失败,请重试', - task_id: null, - can_enter_pick_flow: false, + tip: '建波失败,请重试', warehouse_id: warehouseId, strategy_id: strategyId, source: 'admin', diff --git a/app/service/systemMethods/pick.js b/app/service/systemMethods/pick.js index f5628ce..45dd25e 100644 --- a/app/service/systemMethods/pick.js +++ b/app/service/systemMethods/pick.js @@ -11,9 +11,9 @@ class PickService extends MainService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = 'query,wavePickTaskDetail'; + const _noNeedRight = 'query,wavePickTaskDetail,wavePickTaskCurrent'; const _noNeedLog = 'query'; - const _noNeedAuth = 'query,wavePickTaskDetail'; + const _noNeedAuth = 'query,wavePickTaskDetail,wavePickTaskCurrent'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); } @@ -68,31 +68,29 @@ class PickService extends MainService { } /** - * 根据快递号查询订单所在波次的拣货汇总信息。 - * - * 入参: - * - 快递号:`waybill_code` - * - 完整显示开关:`full` / `full_display` / `is_full` - * - * 仓库上下文仅取当前登录用户 `ctx.user.store_id`(兼容 `ctx.state.user.store_id`), - * 不依赖外部传入 `warehouse_id`,用于避免跨仓越界访问。 + * 按关键字获取或创建波次拣货任务。 + * + * 关键字支持两种命中方式: + * - 命中运单号:先定位订单并强校验订单已入波次。 + * - 命中波次号:直接按波次定位。 + * + * 命中目标波次后按以下规则处理: + * - 若波次存在活动任务且创建人为当前用户:直接返回任务ID。 + * - 若波次存在活动任务但创建人非当前用户:返回冲突失败信息。 + * - 若波次不存在活动任务:按波次类型创建任务并返回任务ID。 * * @param {Object} data 请求参数。 + * @param {string} data.keyword 运单号或波次号关键字。 * @return {Promise} 统一 success/fail 包装结果。 */ async query(data = {}) { const { service, ctx } = this; const requestData = this.isPlainObject(data) ? data : {}; - const { - waybill_code, - full, - full_display, - is_full, - } = requestData; + const { keyword } = requestData; - const normalizedWaybillCode = String(waybill_code || '').trim(); - if (!normalizedWaybillCode) { - return this.fail('请传入快递号', {}, 400); + const normalizedKeyword = String(keyword || '').trim(); + if (!normalizedKeyword) { + return this.fail('请传入关键字 keyword', {}, 400); } const userWarehouseId = ctx && ctx.user ? ctx.user.store_id : undefined; @@ -102,69 +100,278 @@ class PickService extends MainService { return this.fail('缺少当前用户仓库上下文 store_id', {}, 400); } + const stateUser = this.isPlainObject(ctx && ctx.state && ctx.state.user) ? ctx.state.user : null; + const ctxUser = this.isPlainObject(ctx && ctx.user) ? ctx.user : null; + const operatorSource = stateUser || ctxUser || {}; + const rawOperatorId = operatorSource.employees_id ?? operatorSource.operator_id ?? operatorSource.id; + const operatorId = Number(rawOperatorId || 0); + const operatorName = String( + operatorSource.operator_name + || operatorSource.employees_name + || operatorSource.name + || '' + ).trim() || 'system'; + if (!Number.isInteger(operatorId) || operatorId <= 0) { + return this.fail('未获取到操作人上下文', {}, 401); + } + const orderExpress = await ctx.model.OrderExpress.findOne({ where: { warehouse_id: normalizedWarehouseId, - waybill_code: normalizedWaybillCode, + waybill_code: normalizedKeyword, }, attributes: [ 'order_id' ], raw: true, }); + let targetWaveId = 0; + let targetWaveNo = ''; + let targetWaveType = 2; + let selectedOrderIds = []; + const orderId = Number(orderExpress && orderExpress.order_id || 0); - if (!orderExpress || orderId <= 0) { - return this.fail('快递号不存在或不属于当前仓库', {}, 404); + if (orderExpress && orderId > 0) { + let orderModel = null; + try { + orderModel = await this.getOrderModelByWarehouse(normalizedWarehouseId); + } catch (error) { + return this.fail(error && error.message ? error.message : '订单模型不可用', {}, 500); + } + + const order = await orderModel.findOne({ + where: { + id: orderId, + warehouse_id: normalizedWarehouseId, + }, + attributes: [ 'id', 'wave_no', 'wave_id' ], + raw: true, + }); + if (!order) { + return this.fail('运单对应订单不存在', {}, 404); + } + + const orderWaveId = Number(order.wave_id || 0); + const orderWaveNo = String(order.wave_no || '').trim(); + if (!(orderWaveId > 0 || orderWaveNo)) { + return this.fail('运单对应订单未进入波次,无法创建拣货任务', {}, 400); + } + + if (orderWaveId > 0) { + const waveByIdRows = await ctx.model.query( + ` + SELECT wave_id, wave_no, wave_type + FROM wms_wave_batch + WHERE warehouse_id = :warehouseId + AND wave_id = :waveId + LIMIT 1 + `, + { + replacements: { + warehouseId: normalizedWarehouseId, + waveId: orderWaveId, + }, + type: ctx.model.QueryTypes.SELECT, + } + ); + const waveRow = Array.isArray(waveByIdRows) && waveByIdRows.length > 0 ? waveByIdRows[0] : null; + if (!waveRow) { + return this.fail('运单对应波次不存在或不属于当前仓库', {}, 404); + } + + targetWaveId = Number(waveRow.wave_id || 0); + targetWaveNo = String(waveRow.wave_no || '').trim(); + targetWaveType = Number(waveRow.wave_type || 2); + } else { + const waveByNoRows = await ctx.model.query( + ` + SELECT wave_id, wave_no, wave_type + FROM wms_wave_batch + WHERE warehouse_id = :warehouseId + AND wave_no = :waveNo + LIMIT 1 + `, + { + replacements: { + warehouseId: normalizedWarehouseId, + waveNo: orderWaveNo, + }, + type: ctx.model.QueryTypes.SELECT, + } + ); + const waveRow = Array.isArray(waveByNoRows) && waveByNoRows.length > 0 ? waveByNoRows[0] : null; + if (!waveRow) { + return this.fail('运单对应波次不存在或不属于当前仓库', {}, 404); + } + + targetWaveId = Number(waveRow.wave_id || 0); + targetWaveNo = String(waveRow.wave_no || '').trim(); + targetWaveType = Number(waveRow.wave_type || 2); + } + } else { + const waveRows = await ctx.model.query( + ` + SELECT wave_id, wave_no, wave_type + FROM wms_wave_batch + WHERE warehouse_id = :warehouseId + AND wave_no = :waveNo + LIMIT 1 + `, + { + replacements: { + warehouseId: normalizedWarehouseId, + waveNo: normalizedKeyword, + }, + type: ctx.model.QueryTypes.SELECT, + } + ); + + const waveRow = Array.isArray(waveRows) && waveRows.length > 0 ? waveRows[0] : null; + if (!waveRow) { + return this.fail('关键字未命中运单号或波次号', {}, 404); + } + + targetWaveId = Number(waveRow.wave_id || 0); + targetWaveNo = String(waveRow.wave_no || '').trim(); + targetWaveType = Number(waveRow.wave_type || 2); + } + + if (!Number.isInteger(targetWaveId) || targetWaveId <= 0 || !targetWaveNo) { + return this.fail('目标波次信息不完整', {}, 400); + } + + const activeTaskRows = await ctx.model.query( + ` + SELECT t.id AS task_id, t.pick_user_id, t.pick_user_name + FROM wms_wave_pick_task_wave tw + INNER JOIN wms_wave_pick_task t ON t.id = tw.task_id + WHERE tw.wave_id = :waveId + AND t.warehouse_id = :warehouseId + AND t.status IN (0, 1, 2) + ORDER BY t.id DESC + LIMIT 1 + `, + { + replacements: { + waveId: targetWaveId, + warehouseId: normalizedWarehouseId, + }, + type: ctx.model.QueryTypes.SELECT, + } + ); + const activeTask = Array.isArray(activeTaskRows) && activeTaskRows.length > 0 ? activeTaskRows[0] : null; + if (activeTask) { + const activeTaskId = Number(activeTask.task_id || 0); + const taskOwnerId = Number(activeTask.pick_user_id || 0); + const taskOwnerName = String(activeTask.pick_user_name || '').trim() || `${taskOwnerId}`; + if (taskOwnerId > 0 && taskOwnerId === operatorId) { + return this.success('ok', { + data: { + task_id: activeTaskId, + status: 'existing', + tip: '当前波次已有您创建的活动任务,可直接继续', + }, + code: 200, + }); + } + + return this.fail( + `当前波次已由其他人创建活动任务,请移交任务创建人处理(创建人: ${taskOwnerName},任务ID: ${activeTaskId})`, + { + task_id: activeTaskId, + task_owner_id: taskOwnerId, + task_owner_name: taskOwnerName, + }, + 409 + ); + } + + const normalizedWaveType = Number(targetWaveType || 2); + const isGroupWave = normalizedWaveType === 1; + const pickMode = isGroupWave ? 1 : 2; + + if (!isGroupWave && selectedOrderIds.length === 0) { + let orderModel = null; + try { + orderModel = await this.getOrderModelByWarehouse(normalizedWarehouseId); + } catch (error) { + return this.fail(error && error.message ? error.message : '订单模型不可用', {}, 500); + } + + const orderRows = await orderModel.findAll({ + where: { + warehouse_id: normalizedWarehouseId, + wave_id: targetWaveId, + }, + attributes: [ 'id' ], + raw: true, + }); + selectedOrderIds = [ ...new Set((Array.isArray(orderRows) ? orderRows : []) + .map(item => Number(item && item.id || 0)) + .filter(id => Number.isInteger(id) && id > 0)) ]; + + if (selectedOrderIds.length <= 0) { + const fallbackRows = await orderModel.findAll({ + where: { + warehouse_id: normalizedWarehouseId, + wave_no: targetWaveNo, + }, + attributes: [ 'id' ], + raw: true, + }); + selectedOrderIds = [ ...new Set((Array.isArray(fallbackRows) ? fallbackRows : []) + .map(item => Number(item && item.id || 0)) + .filter(id => Number.isInteger(id) && id > 0)) ]; + } + + if (selectedOrderIds.length <= 0) { + return this.fail('散单波次下无可用订单,无法创建任务', {}, 400); + } } - let orderModel = null; try { - orderModel = await this.getOrderModelByWarehouse(normalizedWarehouseId); - } catch (error) { - return this.fail(error && error.message ? error.message : '订单模型不可用', {}, 500); - } - - const order = await orderModel.findOne({ - where: { - id: orderId, + const plan = { + strategy_id: 0, warehouse_id: normalizedWarehouseId, - }, - attributes: [ 'id', 'store_id', 'wave_no', 'wave_id' ], - raw: true, - }); + source: 'pda', + operator: { + operator_id: operatorId, + operator_name: operatorName, + }, + pick_mode: pickMode, + wave_limit: 1, + order_limit: selectedOrderIds.length, + sku_limit: 0, + box_limit: 0, + dynamic_append: false, + selected_wave_ids: [ targetWaveId ], + }; + const createData = { + keyword: normalizedKeyword, + selected_order_ids: pickMode === 2 ? selectedOrderIds : [], + }; - if (!order) { - return this.fail('订单不存在', {}, 404); - } - - const waveNo = String(order.wave_no || '').trim(); - if (!waveNo) { - return this.fail('订单未分配波次号,暂无拣货信息', {}, 400); - } - - const fullDisplay = this.normalizeBoolean(full ?? full_display ?? is_full, false); - - try { - const result = await service.systems.pick.queryPickingInfo({ - orderId, - waveNo, - waveId: Number(order.wave_id || 0), - storeId: Number(order.store_id || 0), - warehouseId: normalizedWarehouseId, - fullDisplay, + const createdTask = await service.systemMethods.order.wave.createWavePickTaskFromPlan({ + plan, + data: createData, + waveBatchSource: 2, }); return this.success('ok', { - data: result, + data: { + task_id: createdTask.task_id, + status: 'created', + tip: '任务创建成功', + }, code: 200, }); } catch (error) { const code = Number(error && error.code); if (Number.isFinite(code) && code >= 400 && code < 600) { - return this.fail(error.message || '查询失败', {}, code); + return this.fail(error.message || '任务创建失败', {}, code); } - ctx.logger.error('[PickService.query] 查询波次拣货信息失败: %s', error && error.message ? error.message : error); - return this.fail('查询失败', {}, 500); + ctx.logger.error('[PickService.query] 获取或创建波次任务失败: %s', error && error.message ? error.message : error); + return this.fail('任务创建失败', {}, 500); } } @@ -216,6 +423,33 @@ class PickService extends MainService { return this.fail('查询失败', {}, 500); } } + + /** + * 查询当前登录用户正在处理中的拣货任务。 + * + * 仅供 PDA 使用,无需入参;按当前登录用户与仓库上下文返回最新任务ID。 + * + * @return {Promise} 统一 success/fail 包装结果。 + */ + async wavePickTaskCurrent() { + const { service, ctx } = this; + + try { + const result = await service.systems.pick.wavePickTaskCurrent(); + return this.success('ok', { + data: result, + code: 200, + }); + } catch (error) { + const code = Number(error && error.code); + if (Number.isInteger(code) && code >= 400 && code < 600) { + return this.fail(error.message || '查询失败', {}, code); + } + + ctx.logger.error('[PickService.wavePickTaskCurrent] 查询当前拣货任务失败: %s', error && error.message ? error.message : error); + return this.fail('查询失败', {}, 500); + } + } } module.exports = PickService; diff --git a/app/service/systemMethods/print.js b/app/service/systemMethods/print.js index 7195169..07ca4bc 100644 --- a/app/service/systemMethods/print.js +++ b/app/service/systemMethods/print.js @@ -150,6 +150,7 @@ class PrintService extends MainService { break; } case 'express': + break; default: return this.fail('不支持的打印类型', 1001); @@ -172,7 +173,6 @@ class PrintService extends MainService { } await printRecord.update({ status: 'failed', error_message: res.error }); return this.fail(res.error, { code: 504, printId: printRecord.id }); - } async getPrintResult(data) { const { ctx } = this; diff --git a/app/service/systemMethods/setting/printTemplate.js b/app/service/systemMethods/setting/printTemplate.js index 67f6ed1..f0afe61 100644 --- a/app/service/systemMethods/setting/printTemplate.js +++ b/app/service/systemMethods/setting/printTemplate.js @@ -1,6 +1,7 @@ 'use strict'; const MainService = require('../../main'); +const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ]; class printTemplateService extends MainService { constructor(ctx) { @@ -16,11 +17,55 @@ class printTemplateService extends MainService { const result = await service.systems.setting.printTemplate.getTree(); return this.success('ok', { presetTree: result, code: 200 }); } + + /** + * 规范化并校验业务类型 + * @param {string} businessType 业务类型 + * @return {string} 标准化后的业务类型 + */ + normalizeAndValidateBusinessType(businessType) { + const normalizedBusinessType = String(businessType || '').trim().toUpperCase(); + if (!normalizedBusinessType) { + throw new Error('business_type 参数不能为空'); + } + if (!SUPPORTED_BUSINESS_TYPES.includes(normalizedBusinessType)) { + throw new Error(`business_type 参数非法,仅支持:${SUPPORTED_BUSINESS_TYPES.join('、')}`); + } + return normalizedBusinessType; + } + + /** + * 保存打印模板 + * @param {Object} data 入参 + * @return {Promise} 保存结果 + */ async save(data) { const { service } = this; - const result = await service.systems.setting.printTemplate.save(data); - return this.success('ok', result); + const payload = data || {}; + try { + if (payload.business_type !== undefined && payload.business_type !== null && String(payload.business_type).trim() !== '') { + payload.business_type = this.normalizeAndValidateBusinessType(payload.business_type); + } + } catch (error) { + return this.fail(error.message, { code: 400 }); + } + try { + const result = await service.systems.setting.printTemplate.save(payload); + return this.success('ok', result); + } catch (error) { + const message = error && error.message ? error.message : '保存打印模板失败'; + if (message.includes('business_type 参数')) { + return this.fail(message, { code: 400 }); + } + return this.fail(message, { code: 500 }); + } } + + /** + * 创建打印模板 + * @param {Object} data 入参 + * @return {Promise} 创建结果 + */ async create(data) { const { service } = this; const { template_name, business_type, page_width, page_height } = data || {}; @@ -28,8 +73,11 @@ class printTemplateService extends MainService { if (!template_name || String(template_name).trim() === '') { return this.fail('template_name 参数不能为空', { code: 400 }); } - if (!business_type || String(business_type).trim() === '') { - return this.fail('business_type 参数不能为空', { code: 400 }); + let normalizedBusinessType = ''; + try { + normalizedBusinessType = this.normalizeAndValidateBusinessType(business_type); + } catch (error) { + return this.fail(error.message, { code: 400 }); } if (page_width === undefined || page_width === null || page_width === '') { return this.fail('page_width 参数不能为空', { code: 400 }); @@ -39,15 +87,27 @@ class printTemplateService extends MainService { } try { - const result = await service.systems.setting.printTemplate.createTemplate(data); + const result = await service.systems.setting.printTemplate.createTemplate({ + ...data, + business_type: normalizedBusinessType, + }); return this.success('ok', result); } catch (error) { if (error.message === '同一业务类型和平台下已存在自定义模板') { return this.fail(error.message, { code: 409 }); } + if (error.message && error.message.includes('business_type 参数')) { + return this.fail(error.message, { code: 400 }); + } return this.fail(error.message || '创建打印模板失败', { code: 500 }); } } + + /** + * 删除打印模板 + * @param {Object} data 入参 + * @return {Promise} 删除结果 + */ async delete(data) { const { service } = this; const { id } = data || {}; @@ -67,13 +127,23 @@ class printTemplateService extends MainService { return this.fail(error.message || '删除打印模板失败', { code: 500 }); } } + + /** + * 按业务类型查询模板 + * @param {Object} data 入参 + * @return {Promise} 查询结果 + */ async listTemplatesByType(data) { const { service } = this; - const { businessType } = data; - if (!businessType) { - throw new Error('缺少业务类型参数'); + const { businessType } = data || {}; + let normalizedBusinessType = ''; + try { + normalizedBusinessType = this.normalizeAndValidateBusinessType(businessType); + } catch (error) { + return this.fail(error.message, { code: 400 }); } - const list = await service.systems.setting.printTemplate.listTemplatesByType(businessType); + + const list = await service.systems.setting.printTemplate.listTemplatesByType(normalizedBusinessType); return this.success('ok', { data: list, code: 200 }); } } diff --git a/app/service/systems/order_print.js b/app/service/systems/order_print.js index e9ec645..218f7ae 100644 --- a/app/service/systems/order_print.js +++ b/app/service/systems/order_print.js @@ -1,7 +1,29 @@ 'use strict'; +const fs = require('node:fs'); +const path = require('node:path'); const { Op } = require('sequelize'); const OrderBaseService = require('../systemMethods/order/base'); +const PrinterDataBuilder = require('../../lib/printer_data_builder'); + +const SYS_PLATFORM_TO_PRINT_PLATFORM_MAP = Object.freeze({ + tb: 'cainiao', + taobao: 'cainiao', + cainiao: 'cainiao', + cn: 'cainiao', + jd: 'jd', + jingdong: 'jd', + dy: 'douyin', + douyin: 'douyin', + ks: 'kuaishou', + kuaishou: 'kuaishou', + pdd: 'pdd', + pinduoduo: 'pdd', + sph: 'sph', + shipinhao: 'sph', + xhs: 'xhs', + xiaohongshu: 'xhs', +}); class OrderPrintSystemService extends OrderBaseService { /** @@ -48,6 +70,135 @@ class OrderPrintSystemService extends OrderBaseService { }); } + /** + * 获取波次平台打印数据中间态。 + * + * 输出以波次分组为主结构(waveGroups),并在波次内按平台分组, + * 便于上游按「波次 -> 平台 -> 订单」层级批量发起打印。 + * + * @param {Object} params 请求参数。 + * @param {Array} params.waveIds 波次ID数组。 + * @param {number|string} params.warehouseId 仓库ID。 + * @return {Promise} 平台打印中间态结果。 + */ + async getWavePlatformPrintData(params = {}) { + const requestParams = this.isPlainObject(params) ? params : {}; + const { + waveIds, + warehouseId, + } = requestParams; + + const normalizedWaveIds = this.normalizeWaveIds(waveIds); + if (normalizedWaveIds.length === 0) { + throw new Error('wave_ids 必填,且必须为非空数组'); + } + + const normalizedWarehouseId = this.resolveWarehouseId(warehouseId); + const waveRows = await this.queryWavesByIds(normalizedWarehouseId, normalizedWaveIds); + if (waveRows.length === 0) { + return { + summary: { + total_waves: 0, + total_orders: 0, + total_platforms: 0, + }, + waveGroups: [], + wave_ids: [], + ext: { + missing_wave_ids: normalizedWaveIds, + filtered_wave_ids: [], + }, + }; + } + + const hitWaveIdSet = new Set(waveRows.map(row => Number(row.wave_id))); + const missingWaveIds = normalizedWaveIds.filter(waveId => !hitWaveIdSet.has(waveId)); + const hitWaveIds = normalizedWaveIds.filter(waveId => hitWaveIdSet.has(waveId)); + const orderRows = await this.queryOrdersByWaveIds(hitWaveIds, normalizedWarehouseId); + const { + validWaveIds, + filteredWaveIds, + } = this.filterFullyAssignedExpressWaves(hitWaveIds, orderRows); + const validWaveIdSet = new Set(validWaveIds); + const validOrderRows = orderRows.filter(order => validWaveIdSet.has(Number(order && order.wave_id || 0))); + + if (validOrderRows.length === 0) { + const waveGroups = this.groupOrderPrintItemsByWaveAndPlatform({ + waveRows, + hitWaveIds: validWaveIds, + orderPrintList: [], + }); + + return { + summary: { + total_waves: waveGroups.length, + total_orders: 0, + total_platforms: 0, + }, + waveGroups, + wave_ids: validWaveIds, + ext: { + missing_wave_ids: missingWaveIds, + filtered_wave_ids: filteredWaveIds, + }, + }; + } + + const orderIds = validOrderRows + .map(row => Number(row && row.id || 0)) + .filter(orderId => Number.isInteger(orderId) && orderId > 0); + const orderExpressRows = await this.queryOrderExpressByOrderIds(orderIds); + this.assertBusinessWaybillCompleteness(orderIds, orderExpressRows); + const orderExpressMap = this.buildOrderExpressMap(orderExpressRows); + const policyConfigMap = await this.getPolicyConfigMapByStore(validOrderRows, normalizedWarehouseId); + const templateSampleCache = new Map(); + const orderPrintList = []; + + for (const orderRow of validOrderRows) { + const orderId = Number(orderRow && orderRow.id || 0); + if (!Number.isInteger(orderId) || orderId <= 0) { + continue; + } + + const orderExpress = orderExpressMap.get(orderId) || {}; + const storeId = Number(orderRow && orderRow.store_id || 0); + const policyConfig = policyConfigMap.get(storeId) || {}; + const platformCode = this.resolvePrintPlatformCode(orderRow, orderExpress); + const templateSample = this.loadTemplateSampleByPlatform(platformCode, templateSampleCache); + + orderPrintList.push(this.buildOrderPlatformPrintItem({ + orderRow, + orderExpress, + policyConfig, + platformCode, + templateSample, + })); + } + + const waveGroups = this.groupOrderPrintItemsByWaveAndPlatform({ + waveRows, + hitWaveIds: validWaveIds, + orderPrintList, + }); + const totalPlatforms = waveGroups.reduce((sum, waveGroup) => { + return sum + Number(waveGroup && waveGroup.platforms && waveGroup.platforms.length || 0); + }, 0); + + return { + summary: { + total_waves: waveGroups.length, + total_orders: orderPrintList.length, + total_platforms: totalPlatforms, + }, + waveGroups, + wave_ids: validWaveIds, + ext: { + missing_wave_ids: missingWaveIds, + filtered_wave_ids: filteredWaveIds, + }, + }; + } + /** * 规范化波次ID数组(去重与数字化)。 * @@ -144,6 +295,8 @@ class OrderPrintSystemService extends OrderBaseService { 'id', 'delivery_order_code', 'source_order_codes', + 'warehouse_id', + 'store_id', 'wave_id', 'wave_no', 'name', @@ -154,8 +307,12 @@ class OrderPrintSystemService extends OrderBaseService { 'area', 'town', 'detail_address', + 'zip_code', + 'items', + 'source_platform_code', 'sys_platform_code', 'sys_platform_name', + 'logistics_code', 'logistics_name', 'post_status', 'status', @@ -164,6 +321,7 @@ class OrderPrintSystemService extends OrderBaseService { 'items_count', 'items_total', 'items_weight', + 'freight', 'create_at', 'pay_time', ], @@ -179,6 +337,440 @@ class OrderPrintSystemService extends OrderBaseService { return Array.isArray(rows) ? rows : []; } + /** + * 按订单ID批量查询快递单信息。 + * + * @param {Array} orderIds 订单ID数组。 + * @return {Promise>} 快递单信息列表。 + */ + async queryOrderExpressByOrderIds(orderIds = []) { + if (!Array.isArray(orderIds) || orderIds.length === 0) { + return []; + } + + const normalizedOrderIds = Array.from(new Set(orderIds + .map(id => Number(id)) + .filter(id => Number.isInteger(id) && id > 0))); + if (normalizedOrderIds.length === 0) { + return []; + } + + const rows = await this.ctx.model.OrderExpress.findAll({ + attributes: [ + 'id', + 'order_id', + 'business_key', + 'waybill_code', + 'logistics_code', + 'logistics_name', + 'platform_code', + 'warehouse_id', + 'printinfo', + 'signature', + 'encryptprintinfo', + ], + where: { + order_id: { + [Op.in]: normalizedOrderIds, + }, + business_key: 1, + }, + order: [[ 'order_id', 'ASC' ], [ 'business_key', 'ASC' ], [ 'id', 'ASC' ]], + raw: true, + }); + + return Array.isArray(rows) ? rows : []; + } + + /** + * 校验业务ID为1的运单号数据完整性。 + * + * @param {Array} orderIds 订单ID数组。 + * @param {Array} orderExpressRows 快递单查询结果。 + */ + assertBusinessWaybillCompleteness(orderIds = [], orderExpressRows = []) { + const normalizedOrderIds = Array.from(new Set((Array.isArray(orderIds) ? orderIds : []) + .map(id => Number(id)) + .filter(id => Number.isInteger(id) && id > 0))); + if (normalizedOrderIds.length === 0) { + return; + } + + const validOrderIdSet = new Set(); + const rows = Array.isArray(orderExpressRows) ? orderExpressRows : []; + for (const row of rows) { + const orderId = Number(row && row.order_id || 0); + if (!Number.isInteger(orderId) || orderId <= 0) { + continue; + } + + const waybillCode = String(row && row.waybill_code || '').trim(); + if (!waybillCode) { + continue; + } + + validOrderIdSet.add(orderId); + } + + const missingOrderIds = normalizedOrderIds.filter(orderId => !validOrderIdSet.has(orderId)); + if (missingOrderIds.length > 0) { + throw new Error(`业务id为1的运单号数据缺失,缺失 order_id: ${missingOrderIds.join(',')}`); + } + } + + /** + * 按订单ID构建快递信息映射,优先保留带运单号的记录。 + * + * @param {Array} rows 快递数据行。 + * @return {Map} 订单到快递信息的映射。 + */ + buildOrderExpressMap(rows = []) { + const expressMap = new Map(); + + for (const row of rows) { + const orderId = Number(row && row.order_id || 0); + if (!Number.isInteger(orderId) || orderId <= 0) { + continue; + } + + const previousRow = expressMap.get(orderId); + if (!previousRow) { + expressMap.set(orderId, row); + continue; + } + + const previousWaybillCode = String(previousRow.waybill_code || '').trim(); + const currentWaybillCode = String(row && row.waybill_code || '').trim(); + if (!previousWaybillCode && currentWaybillCode) { + expressMap.set(orderId, row); + } + } + + return expressMap; + } + + /** + * 获取波次订单对应货主的签约策略映射。 + * + * @param {Array} orderRows 订单行。 + * @param {number} warehouseId 仓库ID。 + * @return {Promise>} 货主策略映射。 + */ + async getPolicyConfigMapByStore(orderRows = [], warehouseId) { + const storeIds = Array.from(new Set(orderRows + .map(row => Number(row && row.store_id || 0)) + .filter(storeId => Number.isInteger(storeId) && storeId > 0))); + const policyMap = new Map(); + + if (storeIds.length === 0) { + return policyMap; + } + + const storeWarehouseService = this.ctx.service + && this.ctx.service.systems + && this.ctx.service.systems.storeWarehouse; + if (!storeWarehouseService || typeof storeWarehouseService.getContractConfig !== 'function') { + return policyMap; + } + + await Promise.all(storeIds.map(async storeId => { + try { + const contractConfig = await storeWarehouseService.getContractConfig(warehouseId, storeId); + const policyConfig = this.isPlainObject(contractConfig && contractConfig.policy_config) + ? contractConfig.policy_config + : {}; + policyMap.set(storeId, policyConfig); + } catch (error) { + this.ctx.logger.warn( + `[orderPrint.getPolicyConfigMapByStore] 读取签约策略失败 warehouseId=${warehouseId} storeId=${storeId} message=${error.message}` + ); + policyMap.set(storeId, {}); + } + })); + + return policyMap; + } + + /** + * 解析订单平台编码并转换为打印平台别名。 + * + * @param {Object} orderRow 订单行。 + * @param {Object} orderExpress 快递行。 + * @return {string} 打印平台编码。 + */ + resolvePrintPlatformCode(orderRow = {}, orderExpress = {}) { + const candidates = [ + orderRow && orderRow.sys_platform_code, + orderRow && orderRow.source_platform_code, + orderExpress && orderExpress.platform_code, + ]; + + for (const candidate of candidates) { + const normalizedCandidate = String(candidate || '').trim().toLowerCase(); + if (!normalizedCandidate) { + continue; + } + + const mappedPlatform = SYS_PLATFORM_TO_PRINT_PLATFORM_MAP[normalizedCandidate] || normalizedCandidate; + const normalizedPlatform = PrinterDataBuilder.normalizePlatformAlias(mappedPlatform); + if (normalizedPlatform.platform) { + return normalizedPlatform.platform; + } + } + + return ''; + } + + /** + * 按平台加载打印模板样例。 + * + * @param {string} platformCode 平台编码。 + * @param {Map} cache 模板缓存。 + * @return {Object} 模板样例对象。 + */ + loadTemplateSampleByPlatform(platformCode, cache) { + const normalized = PrinterDataBuilder.normalizePlatformAlias(platformCode); + const cacheKey = normalized.meta && normalized.meta.template_file + ? normalized.meta.template_file + : `platform:${normalized.platform || 'unknown'}`; + if (cache.has(cacheKey)) { + return cache.get(cacheKey); + } + + if (!normalized.meta || !normalized.meta.template_file) { + cache.set(cacheKey, {}); + return {}; + } + + const templatePath = path.join(this.app.baseDir, 'printer_data_template', normalized.meta.template_file); + try { + const fileContent = fs.readFileSync(templatePath, 'utf8'); + const parsedTemplate = JSON.parse(fileContent); + const templateSample = this.isPlainObject(parsedTemplate) ? parsedTemplate : {}; + cache.set(cacheKey, templateSample); + return templateSample; + } catch (error) { + this.ctx.logger.warn(`[orderPrint.loadTemplateSampleByPlatform] 模板读取失败 template=${templatePath} message=${error.message}`); + cache.set(cacheKey, {}); + return {}; + } + } + + /** + * 组装单订单平台打印中间态结果。 + * + * @param {Object} payload 聚合入参。 + * @param {Object} payload.orderRow 订单行。 + * @param {Object} payload.orderExpress 快递行。 + * @param {Object} payload.policyConfig 策略配置。 + * @param {string} payload.platformCode 平台编码。 + * @param {Object} payload.templateSample 模板样例。 + * @return {Object} 逐单打印中间态。 + */ + buildOrderPlatformPrintItem(payload = {}) { + const requestPayload = this.isPlainObject(payload) ? payload : {}; + const orderRow = this.isPlainObject(requestPayload.orderRow) ? requestPayload.orderRow : {}; + const orderExpress = this.isPlainObject(requestPayload.orderExpress) ? requestPayload.orderExpress : {}; + const policyConfig = this.isPlainObject(requestPayload.policyConfig) ? requestPayload.policyConfig : {}; + const templateSample = this.isPlainObject(requestPayload.templateSample) ? requestPayload.templateSample : {}; + const platformCode = String(requestPayload.platformCode || '').trim(); + + const orderId = Number(orderRow.id || 0); + const waveId = Number(orderRow.wave_id || 0); + const requestId = `wave_${waveId}_order_${orderId}`; + const waybillCode = String(orderExpress.waybill_code || '').trim(); + const documentId = waybillCode || `doc_${orderId}`; + const printPayload = PrinterDataBuilder.buildPlatformRequestSkeleton({ + platform: platformCode, + order_express: orderExpress, + order_delivery: orderRow, + store_contract: { + policy_config: policyConfig, + }, + policy_config: policyConfig, + template_sample: templateSample, + options: { + requestId, + taskId: requestId, + documentId, + }, + }); + const printData = this.extractSinglePlatformPrintData(printPayload); + + return { + wave_id: waveId, + wave_no: String(orderRow.wave_no || '').trim(), + order_id: orderId, + order_no: String(orderRow.delivery_order_code || orderRow.source_order_codes || '').trim(), + store_id: Number(orderRow.store_id || 0), + warehouse_id: Number(orderRow.warehouse_id || 0), + platform: String(printPayload.platform || '').trim(), + platform_name: printPayload.platform_meta && printPayload.platform_meta.name + ? String(printPayload.platform_meta.name).trim() + : '', + waybill_code: String(orderExpress.waybill_code || '').trim(), + print_data: printData, + }; + } + + /** + * 提取单个打印文档对象。 + * + * @param {Object} printPayload 打印载荷。 + * @return {Object} 单个文档对象;未命中时返回空对象。 + */ + extractSinglePlatformPrintData(printPayload = {}) { + const requestSkeleton = this.isPlainObject(printPayload) + ? printPayload.request_skeleton + : null; + if (!this.isPlainObject(requestSkeleton)) { + return {}; + } + + const taskDocuments = requestSkeleton.task && Array.isArray(requestSkeleton.task.documents) + ? requestSkeleton.task.documents + : []; + if (taskDocuments.length > 0 && this.isPlainObject(taskDocuments[0])) { + return taskDocuments[0]; + } + + if (Array.isArray(requestSkeleton.documents) && this.isPlainObject(requestSkeleton.documents[0])) { + return requestSkeleton.documents[0]; + } + + const taskListEntry = Array.isArray(requestSkeleton.taskList) + ? requestSkeleton.taskList.find(item => Array.isArray(item && item.documents) && item.documents.length > 0) + : null; + if (taskListEntry && this.isPlainObject(taskListEntry.documents[0])) { + return taskListEntry.documents[0]; + } + + return {}; + } + + /** + * 将逐单打印中间态按平台分组。 + * + * @param {Array} orderPrintList 逐单打印中间态列表。 + * @return {Array} 平台分组列表。 + */ + groupOrderPrintItemsByPlatform(orderPrintList = []) { + const groupedPlatformMap = new Map(); + + for (const item of orderPrintList) { + const platform = String(item && item.platform || '').trim() || 'unknown'; + const group = groupedPlatformMap.get(platform) || { + platform, + platform_name: String(item && item.platform_name || '').trim(), + order_count: 0, + orders: [], + }; + + group.orders.push(this.isPlainObject(item && item.print_data) ? item.print_data : {}); + group.order_count = group.orders.length; + groupedPlatformMap.set(platform, group); + } + + const groups = Array.from(groupedPlatformMap.values()); + groups.sort((a, b) => String(a.platform || '').localeCompare(String(b.platform || ''))); + return groups; + } + + /** + * 将逐单打印中间态按波次分组,并在波次内按平台分组。 + * + * @param {Object} payload 聚合输入。 + * @param {Array} payload.waveRows 波次元数据列表。 + * @param {Array} payload.hitWaveIds 命中的波次ID数组(已过滤)。 + * @param {Array} payload.orderPrintList 逐单打印中间态列表。 + * @return {Array} 波次平台分组结果。 + */ + groupOrderPrintItemsByWaveAndPlatform(payload = {}) { + const { + waveRows = [], + hitWaveIds = [], + orderPrintList = [], + } = this.isPlainObject(payload) ? payload : {}; + + const waveMetaMap = new Map(); + for (const row of waveRows) { + const waveId = Number(row && row.wave_id || 0); + if (!Number.isInteger(waveId) || waveId <= 0) { + continue; + } + + waveMetaMap.set(waveId, { + wave_id: waveId, + wave_no: String(row && row.wave_no || '').trim(), + }); + } + + const waveGroupMap = new Map(); + const wavePlatformMap = new Map(); + for (const waveId of hitWaveIds) { + const normalizedWaveId = Number(waveId); + if (!Number.isInteger(normalizedWaveId) || normalizedWaveId <= 0) { + continue; + } + + const waveMeta = waveMetaMap.get(normalizedWaveId) || { + wave_id: normalizedWaveId, + wave_no: '', + }; + waveGroupMap.set(normalizedWaveId, { + wave_id: waveMeta.wave_id, + wave_no: waveMeta.wave_no, + order_count: 0, + platforms: [], + }); + wavePlatformMap.set(normalizedWaveId, new Map()); + } + + for (const item of orderPrintList) { + const waveId = Number(item && item.wave_id || 0); + const waveGroup = waveGroupMap.get(waveId); + if (!waveGroup) { + continue; + } + + const platform = String(item && item.platform || '').trim() || 'unknown'; + const platformMap = wavePlatformMap.get(waveId) || new Map(); + const platformGroup = platformMap.get(platform) || { + platform, + platform_name: String(item && item.platform_name || '').trim(), + order_count: 0, + orders: [], + }; + + platformGroup.orders.push(this.isPlainObject(item && item.print_data) ? item.print_data : {}); + platformGroup.order_count = platformGroup.orders.length; + platformMap.set(platform, platformGroup); + wavePlatformMap.set(waveId, platformMap); + } + + const waveGroups = Array.from(waveGroupMap.values()); + for (const waveGroup of waveGroups) { + const platformMap = wavePlatformMap.get(Number(waveGroup.wave_id)) || new Map(); + const platforms = Array.from(platformMap.values()); + platforms.sort((a, b) => String(a.platform || '').localeCompare(String(b.platform || ''))); + waveGroup.platforms = platforms; + waveGroup.order_count = platforms.reduce((sum, platformGroup) => { + return sum + Number(platformGroup && platformGroup.order_count || 0); + }, 0); + } + + waveGroups.sort((a, b) => { + const waveNoCompare = String(a.wave_no || '').localeCompare(String(b.wave_no || '')); + if (waveNoCompare !== 0) { + return waveNoCompare; + } + + return Number(a.wave_id || 0) - Number(b.wave_id || 0); + }); + + return waveGroups; + } + /** * 过滤快递未完全分配的波次。 * diff --git a/app/service/systems/pick.js b/app/service/systems/pick.js index 704a5a3..80c48af 100644 --- a/app/service/systems/pick.js +++ b/app/service/systems/pick.js @@ -344,15 +344,18 @@ class PickSystemService extends Service { } } } else if (pickMode === 1) { + const taskWaveColumnSet = await this.getTableColumnSet('wms_wave_pick_task_wave'); + const taskWaveWarehouseFilterSql = taskWaveColumnSet.has('warehouse_id') ? ' AND ptw.warehouse_id = :warehouseId' : ''; const taskWaveRows = await ctx.model.query(` SELECT ptw.wave_id, ptw.box_no FROM wms_wave_pick_task_wave ptw WHERE ptw.task_id = :taskId + ${taskWaveWarehouseFilterSql} ORDER BY ptw.id ASC `, { - replacements: { taskId }, + replacements: { taskId, warehouseId }, type: ctx.model.QueryTypes.SELECT, }); @@ -782,6 +785,72 @@ class PickSystemService extends Service { }); } + /** + * 查询当前登录用户正在处理中的拣货任务。 + * + * 仅供 PDA 使用:根据当前登录用户上下文(仓库 + 操作人)查询状态为 0/1/2 的最新任务。 + * + * @param {Object} [params={}] 预留参数(当前无需传入)。 + * @return {Promise<{task_id: number|null}>} 当前任务ID,无任务则为 null。 + */ + async wavePickTaskCurrent(params = {}) { + const { ctx } = this; + void params; + + const stateUser = ctx && ctx.state && ctx.state.user && typeof ctx.state.user === 'object' + ? ctx.state.user + : null; + const ctxUser = ctx && ctx.user && typeof ctx.user === 'object' + ? ctx.user + : null; + const currentUser = stateUser || ctxUser || {}; + + const warehouseId = Number( + currentUser.store_id + || currentUser.warehouse_id + || (ctxUser && (ctxUser.store_id || ctxUser.warehouse_id)) + || 0 + ); + if (!Number.isInteger(warehouseId) || warehouseId <= 0) { + throw this.createBusinessError('缺少当前用户仓库上下文 store_id', 400); + } + + const pickUserId = Number( + currentUser.employees_id + || currentUser.operator_id + || currentUser.id + || (ctxUser && (ctxUser.employees_id || ctxUser.operator_id || ctxUser.id)) + || 0 + ); + if (!Number.isInteger(pickUserId) || pickUserId <= 0) { + throw this.createBusinessError('未获取到操作人上下文', 401); + } + + const taskRows = await ctx.model.query(` + SELECT + t.id AS task_id + FROM wms_wave_pick_task t + WHERE t.warehouse_id = :warehouseId + AND t.pick_user_id = :pickUserId + AND t.status IN (0, 1, 2) + ORDER BY t.id DESC + LIMIT 1 + `, { + replacements: { + warehouseId, + pickUserId, + }, + type: ctx.model.QueryTypes.SELECT, + }); + + const taskRow = Array.isArray(taskRows) && taskRows.length > 0 ? taskRows[0] : null; + const taskId = Number(taskRow && taskRow.task_id || 0); + + return { + task_id: Number.isInteger(taskId) && taskId > 0 ? taskId : null, + }; + } + /** * 查询拣货任务详情。 * @@ -835,7 +904,13 @@ class PickSystemService extends Service { } const warehouseId = Number(taskRow.warehouse_id || 0); + const pickMode = Number(taskRow.pick_mode || 0); + const taskOrderColumnSet = await this.getTableColumnSet('wms_wave_pick_task_order'); + const taskWaveColumnSet = await this.getTableColumnSet('wms_wave_pick_task_wave'); const boxColumnSet = await this.getTableColumnSet('wms_wave_pick_task_box'); + const taskOrderWarehouseFilterSql = taskOrderColumnSet.has('warehouse_id') ? ' AND pto.warehouse_id = :warehouseId' : ''; + const taskWaveWarehouseFilterSql = taskWaveColumnSet.has('warehouse_id') ? ' AND ptw.warehouse_id = :warehouseId' : ''; + const boxWarehouseFilterSql = boxColumnSet.has('warehouse_id') ? ' AND b.warehouse_id = :warehouseId' : ''; const boxExtraSelect = []; if (boxColumnSet.has('ref_label')) { boxExtraSelect.push('b.ref_label'); @@ -857,9 +932,10 @@ class PickSystemService extends Service { pto.box_no FROM wms_wave_pick_task_order pto WHERE pto.task_id = :taskId + ${taskOrderWarehouseFilterSql} ORDER BY pto.id ASC `, { - replacements: { taskId }, + replacements: { taskId, warehouseId }, type: ctx.model.QueryTypes.SELECT, }), ctx.model.query(` @@ -870,17 +946,63 @@ class PickSystemService extends Service { b.box_status AS status${boxExtraSelect.length > 0 ? `,\n ${boxExtraSelect.join(',\n ')}` : ''} FROM wms_wave_pick_task_box b WHERE b.task_id = :taskId + ${boxWarehouseFilterSql} ORDER BY b.id ASC `, { - replacements: { taskId }, + replacements: { taskId, warehouseId }, type: ctx.model.QueryTypes.SELECT, }), ]); const normalizedTaskOrderRows = Array.isArray(taskOrderRows) ? taskOrderRows : []; - const orderIds = [ ...new Set(normalizedTaskOrderRows + let orderIds = [ ...new Set(normalizedTaskOrderRows .map(row => Number(row && row.order_id || 0)) .filter(orderIdItem => Number.isInteger(orderIdItem) && orderIdItem > 0)) ]; + let taskWaveCount = 0; + let orderSource = 'task_order'; + const derivedWaveIds = []; + + if (orderIds.length === 0 && [ 1, 5 ].includes(pickMode)) { + const taskWaveRows = await ctx.model.query(` + SELECT + ptw.wave_id + FROM wms_wave_pick_task_wave ptw + WHERE ptw.task_id = :taskId + ${taskWaveWarehouseFilterSql} + ORDER BY ptw.id ASC + `, { + replacements: { taskId, warehouseId }, + type: ctx.model.QueryTypes.SELECT, + }); + + const normalizedTaskWaveRows = Array.isArray(taskWaveRows) ? taskWaveRows : []; + taskWaveCount = normalizedTaskWaveRows.length; + const fallbackWaveIds = [ ...new Set(normalizedTaskWaveRows + .map(row => Number(row && row.wave_id || 0)) + .filter(waveId => Number.isInteger(waveId) && waveId > 0)) ]; + derivedWaveIds.push(...fallbackWaveIds.slice(0, 5)); + + if (fallbackWaveIds.length > 0) { + const orderModel = await this.getOrderModel(warehouseId); + const fallbackOrderRows = await orderModel.findAll({ + where: { + wave_id: { + [this.app.Sequelize.Op.in]: fallbackWaveIds, + }, + warehouse_id: warehouseId, + }, + attributes: [ 'id' ], + raw: true, + }); + + orderIds = [ ...new Set((Array.isArray(fallbackOrderRows) ? fallbackOrderRows : []) + .map(row => Number(row && row.id || 0)) + .filter(orderIdItem => Number.isInteger(orderIdItem) && orderIdItem > 0)) ]; + if (orderIds.length > 0) { + orderSource = 'task_wave_fallback'; + } + } + } const pickingRows = orderIds.length > 0 ? await ctx.model.Picking.findAll({ @@ -895,6 +1017,10 @@ class PickSystemService extends Service { }) : []; + ctx.logger.info( + `[pick.wavePickTaskDetail] task_id=${taskId} pick_mode=${pickMode} warehouse_id=${warehouseId} task_order_count=${normalizedTaskOrderRows.length} task_wave_count=${taskWaveCount} derived_order_ids_count=${orderIds.length} picking_rows_count=${Array.isArray(pickingRows) ? pickingRows.length : 0} order_source=${orderSource} order_id_samples=${JSON.stringify(orderIds.slice(0, 5))} wave_id_samples=${JSON.stringify(derivedWaveIds)}` + ); + const pickingSpaceIds = [ ...new Set((Array.isArray(pickingRows) ? pickingRows : []) .map(row => Number(row && row.space_id || 0)) .filter(spaceId => Number.isInteger(spaceId) && spaceId > 0)) ]; @@ -955,7 +1081,6 @@ class PickSystemService extends Service { }); const pickingSummary = this.buildPickingSummary(pickingDetails); - const pickMode = Number(taskRow.pick_mode || 0); const pickingView = await this.buildPickingView({ pickMode, taskId, diff --git a/app/service/systems/setting/print_template.js b/app/service/systems/setting/print_template.js index a808573..bffdb07 100644 --- a/app/service/systems/setting/print_template.js +++ b/app/service/systems/setting/print_template.js @@ -1,15 +1,37 @@ 'use strict'; const Service = require('egg').Service; +const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ]; class PrintTemplateService extends Service { + /** + * 标准化并校验业务类型 + * @param {string} businessType 业务类型 + * @param {boolean} required 是否必填 + * @return {string|null} 标准化后的业务类型 + */ + normalizeAndValidateBusinessType(businessType, required = true) { + const normalizedBusinessType = String(businessType || '').trim().toUpperCase(); + if (!normalizedBusinessType) { + if (required) { + throw new Error('business_type 参数不能为空'); + } + return null; + } + if (!SUPPORTED_BUSINESS_TYPES.includes(normalizedBusinessType)) { + throw new Error(`business_type 参数非法,仅支持:${SUPPORTED_BUSINESS_TYPES.join('、')}`); + } + return normalizedBusinessType; + } + /** * 获取指定业务类型的模板列表 * @param {string} businessType 业务类型 * @return {Promise} 模板列表 */ async listTemplatesByType(businessType) { - return await this.getTemplatesByType(businessType); + const normalizedBusinessType = this.normalizeAndValidateBusinessType(businessType); + return await this.getTemplatesByType(normalizedBusinessType); } /** @@ -24,12 +46,15 @@ class PrintTemplateService extends Service { try { // 1. 获取所有业务类型及打印项 const businessTypeItems = await this.getBusinessTypesAndItem(); - const businessTypes = Object.keys(businessTypeItems); + const businessTypes = SUPPORTED_BUSINESS_TYPES; // 2. 查询所有打印模板,按业务类型分组 const templates = await ctx.model.PrintTemplate.findAll({ where: { status: 'ACTIVE', + business_type: { + [Op.in]: SUPPORTED_BUSINESS_TYPES, + }, warehouse_id: { [Op.or]: [ warehouseId, null ], }, @@ -67,7 +92,7 @@ class PrintTemplateService extends Service { type: 'category', businessType, children, - printItems: businessTypeItems[businessType].groupList || [], + printItems: businessTypeItems[businessType] ? (businessTypeItems[businessType].groupList || []) : [], editable: false, deletable: false, isGeneral: false, @@ -89,13 +114,14 @@ class PrintTemplateService extends Service { async getTemplatesByType(businessType) { const { ctx, app } = this; const { Op } = app.Sequelize; + const normalizedBusinessType = this.normalizeAndValidateBusinessType(businessType); const warehouseId = ctx.user.store_id; try { const templates = await ctx.model.PrintTemplate.findAll({ where: { status: 'ACTIVE', - business_type: businessType, + business_type: normalizedBusinessType, warehouse_id: { [Op.or]: [ warehouseId, null ], }, @@ -119,10 +145,17 @@ class PrintTemplateService extends Service { return []; } } + + /** + * 保存打印模板(创建或更新) + * @param {Object} data 模板数据 + * @return {Promise} 保存结果 + */ async save(data) { const { ctx } = this; const warehouseId = ctx.user.store_id; const { id, template_name, business_type, page_width, page_height, template_content } = data; + const normalizedBusinessType = this.normalizeAndValidateBusinessType(business_type, !id); try { if (id) { // 更新现有模板 @@ -137,20 +170,24 @@ class PrintTemplateService extends Service { throw new Error('模板不存在或无权限'); } - await template.update({ + const updatePayload = { template_name, - business_type, page_width, page_height, template_content, - }); + }; + if (normalizedBusinessType) { + updatePayload.business_type = normalizedBusinessType; + } + + await template.update(updatePayload); return { message: '模板更新成功', code: 200 }; } // 创建新模板 await ctx.model.PrintTemplate.create({ template_name, - business_type, + business_type: normalizedBusinessType, page_width, page_height, template_content, @@ -166,6 +203,11 @@ class PrintTemplateService extends Service { } } + /** + * 创建打印模板 + * @param {Object} data 模板数据 + * @return {Promise} 创建结果 + */ async createTemplate(data = {}) { const { ctx } = this; const warehouseId = ctx.user.store_id; @@ -178,13 +220,27 @@ class PrintTemplateService extends Service { template_content = [], is_default = false, } = data; + + if (!String(template_name || '').trim()) { + throw new Error('template_name 参数不能为空'); + } + + if (page_width === undefined || page_width === null || String(page_width).trim() === '') { + throw new Error('page_width 参数不能为空'); + } + + if (page_height === undefined || page_height === null || String(page_height).trim() === '') { + throw new Error('page_height 参数不能为空'); + } + + const normalizedBusinessType = this.normalizeAndValidateBusinessType(business_type); const platform = 'default'; const template_type = 'CUSTOM'; const template_url = ''; const existingTemplate = await ctx.model.PrintTemplate.findOne({ where: { - business_type, + business_type: normalizedBusinessType, platform, template_type, warehouse_id: warehouseId, @@ -222,7 +278,7 @@ class PrintTemplateService extends Service { try { created = await ctx.model.PrintTemplate.create({ template_name, - business_type, + business_type: normalizedBusinessType, page_width, page_height, template_content, diff --git a/database/migrations/20260511120000-add-wave-prefix-to-wms_wave_strategy.js b/database/migrations/20260511120000-add-wave-prefix-to-wms_wave_strategy.js new file mode 100644 index 0000000..4b6d708 --- /dev/null +++ b/database/migrations/20260511120000-add-wave-prefix-to-wms_wave_strategy.js @@ -0,0 +1,15 @@ +'use strict'; + +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.addColumn('wms_wave_strategy', 'wave_prefix', { + type: Sequelize.STRING(5), + allowNull: true, + comment: '策略波次前缀(优先于仓库前缀)', + }); + }, + + async down(queryInterface, Sequelize) { + await queryInterface.removeColumn('wms_wave_strategy', 'wave_prefix'); + }, +}; diff --git a/database/migrations/20260513090000-add-last-login-time-to-wms_print_computer.js b/database/migrations/20260513090000-add-last-login-time-to-wms_print_computer.js new file mode 100644 index 0000000..f71231d --- /dev/null +++ b/database/migrations/20260513090000-add-last-login-time-to-wms_print_computer.js @@ -0,0 +1,27 @@ +'use strict'; + +module.exports = { + /** + * 为打印台电脑表新增上次登录时间字段。 + * @param {import('sequelize').QueryInterface} queryInterface 查询接口 + * @param {import('sequelize')} Sequelize Sequelize 实例 + * @returns {Promise} 无返回值 + */ + async up(queryInterface, Sequelize) { + await queryInterface.addColumn('wms_print_computer', 'last_login_time', { + type: Sequelize.DATE, + allowNull: true, + comment: '上次登录时间', + }); + }, + + /** + * 回滚删除打印台电脑表的上次登录时间字段。 + * @param {import('sequelize').QueryInterface} queryInterface 查询接口 + * @param {import('sequelize')} Sequelize Sequelize 实例 + * @returns {Promise} 无返回值 + */ + async down(queryInterface, Sequelize) { + await queryInterface.removeColumn('wms_print_computer', 'last_login_time'); + }, +}; diff --git a/methods/changes/2026.05.13-system-01.json b/methods/changes/2026.05.13-system-01.json new file mode 100644 index 0000000..e46b3d6 --- /dev/null +++ b/methods/changes/2026.05.13-system-01.json @@ -0,0 +1,17 @@ +[ + { + "version": "2026.05.13-system-01", + "date": "2026-05-13", + "summary": "完善 print.send 的 API 文档与返回说明", + "methods": [ + "print.send" + ], + "notes": [ + "补充请求参数说明:computerId、printer、template、data、type 标为必填,count、timestamp 保持可选。", + "补充 template 的子字段说明:page_width、page_height、template_content。", + "补充响应结构:flag、code、message、printId;其中成功时 code=200。", + "补充错误码说明:1001 对应不支持的打印类型,504 对应打印任务发送失败(包含打印机不存在、脱机、通讯失败等场景)。" + ], + "type": "updated" + } +] diff --git a/methods/changes/system.json b/methods/changes/system.json index 9085f09..166d8ff 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,1556 +1,1645 @@ [ - { - "version": "2026.05.10-system-04", - "date": "2026-05-10", - "summary": "pick.wavePickTaskDetail 新增按任务类型区分的 picking_view 形态输出", - "methods": [ - "pick.wavePickTaskDetail" - ], - "notes": [ - "新增响应字段:picking_view(object),按 task.pick_mode 区分 5 种形态输出。", - "picking_view 字段说明:mode_code, mode_name, require_box_allocations, group_by, sort_by, items[](每项含 space_id、space_name、location_space、item_code、item_name、stock_id、total_qty、box_allocations[])。", - "当 pick_mode=1/3/4 时 require_box_allocations=true;当 pick_mode=2/5 时 require_box_allocations=false。" - ], - "type": "updated" - }, - { - "version": "2026.05.10-system-02", - "date": "2026-05-10", - "summary": "order.wave.waveStrategyFetchPda/Admin 返回新增 fetch_state 三态与简短 tip", - "methods": [ - "order.wave.waveStrategyFetchPda", - "order.wave.waveStrategyFetchAdmin" - ], - "notes": [ - "新增返回字段:fetch_state(number)、tip(string)、can_enter_pick_flow(boolean)", - "fetch_state 含义:1=创建成功(返回 task_id/task_no),2=普通失败(task_id=null),3=存在未完成任务(返回 existing task_id/task_no,前端可直接进入拣货流程)", - "当 fetch_state=3 时,字段 can_enter_pick_flow=true,表示前端可直接进入拣货流程;tip 为简短提示文本" - ], - "type": "updated" - }, - { - "version": "2026.05.10-system-03", - "date": "2026-05-10", - "summary": "裁剪 pick.wavePickTaskDetail 返回:移除 waves/orders,精简 task 并补充 boxes 拣货统计字段", - "methods": [ - "pick.wavePickTaskDetail" - ], - "notes": [ - "移除响应中的 waves 与 orders 子表,接口仅返回精简的 task、boxes、picking_details 与 picking_summary。", - "task 子字段裁剪为:task_id, task_no, status, pick_mode, start_at, finish_at, batch_no。", - "boxes 补充并明确返回:ref_label(箱参考标签)、required_qty(箱内需拣总数)、picked_qty(已拣数量)。", - "本次变更为文档层面的返回裁剪,前端应以新字段集合为准,旧字段可能不再返回。" - ], - "type": "updated" - }, - { - "version": "2026.05.10-system-01", - "date": "2026-05-10", - "summary": "order.wave.waveStrategyList 新增 strategy_type 最小过滤(散单/团购)", - "methods": [ - "order.wave.waveStrategyList" - ], - "notes": [ - "新增 strategy_type 过滤,仅 1/2", - "支持顶层 strategy_type 和 where.strategy_type,顶层优先", - "当前不引入其他 where 字段" - ], - "type": "updated" - }, - { - "version": "2026.05.09-system-02", - "date": "2026-05-09", - "summary": "新增 pick.wavePickTaskDetail:按任务ID解析拣货任务详情", - "methods": [ - "pick.wavePickTaskDetail" - ], - "notes": [ - "新增 pick.wavePickTaskDetail:传入 task_id 获取拣货任务完整信息,包含主表字段(task/pick_mode/status/wave_count/order_count/box_count 等)及三张子表数据(waves/orders/boxes)。", - "安全限制:接口会校验当前登录用户(operator_id/employees_id)与任务的 pick_user_id 是否一致;不一致时直接返回 403,不返回任何拣货信息。", - "鉴权配置:noNeedRight=true,noNeedAuth=true,isNeedLogin=true。" - ], - "type": "added" - }, - { - "version": "2026.05.08-system-05", - "date": "2026-05-08", - "summary": "order.wave.batchList:新增 source 字段并支持 where.source 过滤,返回 list item 中新增 source 字段", - "methods": [ - "order.wave.batchList" - ], - "notes": [ - "新增 where.source(可选,number)用于按来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。", - "响应 list 每条记录新增字段 source(number),用于区分波次来源。", - "仅更新文档,业务代码不在此变更范围。" - ], - "type": "updated" - }, - { - "version": "2026.05.08-system-04", - "date": "2026-05-08", - "summary": "完善 order.wave.wavePickTaskList 文档:补充入参、分页与返回字段兼容说明", - "methods": [ - "order.wave.wavePickTaskList", - "order.wave.wavePickTaskCancel" - ], - "notes": [ - "入参补充:warehouse_id(必填)、status(支持单值或数组,建议传数组)、source、keyword、page_no、page_size;保留 pagination 对象以兼容旧客户端。", - "兼容说明:接口同时支持历史 where 结构与顶层参数;当存在同名顶层参数时以顶层参数优先;pagination 支持 page/current 与 pageSize/size 别名。", - "返回格式:响应包含 total 与 list;list 每项包含字段:task_id、task_no、status、source、pick_mode、wave_count、order_count、box_count、operator_id、operator_name、start_at、finish_at、created_at。为兼容旧客户端,响应同时保留旧字段:pick_user_id、pick_user_name、start_time、finish_time、create_time。", - "入参 strategy_id 当前主表未存,接口会忽略该过滤,不建议使用。", - "默认排序:create_time desc.", - "文档变更:移除 order.wave.wavePickTaskCancel 的入参 operator_id 与 warehouse_id;入参改为仅支持 task_ids(数组,必填),不再兼容单个 task_id;操作人与仓库由请求上下文(例如当前登录用户上下文)自动获取;若上下文缺失接口将返回错误。响应补充批量结果字段:cancelled_count、task_ids、task_nos(若后端返回)。仅更新文档,未修改业务实现。" - ], - "type": "updated" - }, - { - "version": "2026.05.08-system-03", - "date": "2026-05-08", - "summary": "升级按策略抓取接口为创建任务主流程:order.wave.waveStrategyFetchPda / order.wave.waveStrategyFetchAdmin", - "methods": [ - "order.wave.waveStrategyFetchPda", - "order.wave.waveStrategyFetchAdmin" - ], - "notes": [ - "将 PDA/Admin 场景的按策略抓取接口由受理壳方法升级为 '创建任务主流程':接口会执行参数校验并在同步响应中创建任务记录(state=created),返回 task_id、task_no、plan 与 plan_summary 供前端展示与后续查询。", - "入参新增/扩展与创建流程相关字段:至少包含 cart_id(关联拣货车/作业车ID)、source(操作来源语义)并保留并透传 strategy_id 与 strategy_params(策略参数),以支持在创建阶段对策略进行局部覆盖或透传。", - "成功返回示例字段:state=created、task_id、task_no、plan(对象)和 plan_summary(字符串);失败场景会返回 validation_errors(数组,每项含 field/message)或 message 描述创建失败原因。", - "边界说明:当前为最小主流程(创建与计划预览),后续扫描/任务执行阶段(如实际抓取订单、写入 wave 等)将在后续版本中追加与完善。" - ], - "type": "updated" - }, - { - "version": "2026.05.08-system-02", - "date": "2026-05-08", - "summary": "调整按策略抓取壳方法:order.wave.waveStrategyFetch 更名为 order.wave.waveStrategyFetchPda,并新增 order.wave.waveStrategyFetchAdmin", - "methods": [ - "order.wave.waveStrategyFetch", - "order.wave.waveStrategyFetchPda", - "order.wave.waveStrategyFetchAdmin" - ], - "notes": [ - "waveStrategyFetchPda 仅用于 PDA 场景", - "waveStrategyFetchAdmin 仅用于后台管理场景", - "两者当前均为壳子受理方法,不执行真实抓取" - ], - "type": "updated" - }, - { - "version": "2026.05.08-system-01", - "date": "2026-05-08", - "summary": "新增 order.wave.waveStrategyFetch:按策略提交抓取任务(壳子方法)", - "methods": [ - "order.wave.waveStrategyFetch" - ], - "notes": [ - "当前方法为壳子方法:仅受理并返回任务受理信息,不执行真实抓取逻辑,后续补齐执行链路。" - ], - "type": "added" - }, - { - "version": "2026.05.07-system-05", - "date": "2026-05-07", - "summary": "新增 order.wave.waveStrategyCreate 与 order.wave.waveStrategyUpdate:波次策略创建与更新接口(含参数校验与版本推进)", - "methods": [ - "order.wave.waveStrategyCreate", - "order.wave.waveStrategyUpdate" - ], - "notes": [ - "仓库 ID 与创建人(creator_name)由当前登录仓库/操作者上下文获取,接口不接受外部覆盖。", - "入参 allowed_owners 与 allowed_expresses 会校验是否在系统可用范围内(基于仓库签约货主或系统快递列表),若存在非法值接口会直接报错(400)。", - "max_same_structure 受仓库配置 min_group_order_fetch_quantity 限制:若传入值 >= min_group_order_fetch_quantity,则自动下调为 min_group_order_fetch_quantity - 1(最小值为 1)。", - "新建/更新成功后会触发仓库的 wave_strategy_version 自增(+1)并失效相关仓库配置缓存,调用方可通过策略版本推进或缓存变化感知策略已生效。" - ], - "type": "added" - }, - { - "version": "2026.05.07-system-06", - "date": "2026-05-07", - "summary": "收敛 order.wave.waveStrategyFallbackOrderList 返回字段,限定 where 白名单,补充 order.wave.singleFetchByIds 别名与返回语义", - "methods": [ - "order.wave.waveStrategyFallbackOrderList", - "order.wave.singleFetchByIds" - ], - "notes": [ - "收敛 order.wave.waveStrategyFallbackOrderList response.list 字段为 id, delivery_no, tracking_no, items_count, items_total, sys_logistics_name, store_name, province, sys_platform_name, item_snapshot;item_snapshot 格式示例:商品名称*数量|...。", - "限制 order.wave.waveStrategyFallbackOrderList.where 白名单,禁止传入 warehouse_id / warehouseId;传入未列出字段或别名冲突将返回 400。", - "补充 order.wave.singleFetchByIds:明确支持 ids / order_ids / orderIds 三个别名(优先顺序 ids -> order_ids -> orderIds)并说明返回字段 fetched_order_ids、excluded_existing_wave_order_ids、skipped_order_ids、not_found_order_ids 的语义与兼容性。" - ], - "type": "updated" - }, - { - "version": "2026.05.07-system-04", - "date": "2026-05-07", - "summary": "更新 order.wave.waveStrategyFallbackOrderList,新增商品快照字段 item_snapshot", - "methods": [ - "order.wave.waveStrategyFallbackOrderList" - ], - "notes": [ - "item_snapshot 返回格式为 商品名称1*数量|商品名称2*数量" - ], - "type": "updated" - }, - { - "version": "2026.05.07-system-03", - "date": "2026-05-07", - "summary": "新增 order.wave.waveStrategyQuickScan 与进度查询接口", - "methods": [ - "order.wave.waveStrategyQuickScan", - "order.wave.waveStrategyQuickScanTaskProgress" - ], - "notes": [ - "同仓只允许一个扫描任务并使用缓存锁;扫描范围为当前表非待审核、未分配波次且订单策略版本与仓库当前版本不一致的订单;命中策略标记 wave_scan_result=1,否则=2" - ], - "type": "added" - }, - { - "version": "2026.05.07-system-02", - "date": "2026-05-07", - "summary": "新增 order.wave.waveStrategyList:查询当前仓库波次策略列表", - "methods": [ - "order.wave.waveStrategyList" - ], - "notes": [ - "从 wms_wave_strategy 拉取当前仓库的波次策略列表,分页返回" - ], - "type": "added" - }, - { - "version": "2026.05.07-system-01", - "date": "2026-05-07", - "summary": "移除 order.wave.singleOrderFetchDetailList,新增 order.wave.waveStrategyFallbackOrderList(内置固定筛选条件)", - "methods": [ - "order.wave.singleOrderFetchDetailList", - "order.wave.waveStrategyFallbackOrderList" - ], - "notes": [ - "移除 order.wave.singleOrderFetchDetailList。", - "新增 order.wave.waveStrategyFallbackOrderList。", - "新接口基于订单通用查询口径,固定内置筛选条件:step != 0、wave_id = 0、wave_scan_result = 2。" - ], - "type": "updated" - }, - { - "version": "2026.05.06-system-06", - "date": "2026-05-06", - "summary": "新增 order.wave.singleOrderFetchDetailList:订单级散单候选明细视图", - "methods": [ - "order.wave.singleOrderFetchDetailList" - ], - "notes": [ - "新增 order.wave.singleOrderFetchDetailList:提供订单级的散单候选明细列表,返回按订单聚合的明细(非分组级)。", - "返回订单级而非分组级;响应每项包含订单 id、group_count、item_detail_machine、item_detail_machine_snapshot、item_detail、item_snapshot、logistics_name、store_id、distinguish_express、create_at 与 status_summary 等关键字段。", - "仍沿用 same_order_quantity 阈值来排除团购命中分组(仅保留 group_count < same_order_quantity 的候选项)。", - "singleOrderFetchList 暂保留以兼容现有前端,前端可在切换到订单级视图后迁移到本接口。" - ], - "type": "added" - }, - { - "version": "2026.05.06-system-05", - "date": "2026-05-06", - "summary": "storage.receiving.get 返回扩展:data.details[*] 新增 box_remainder、box_weight", - "methods": [ - "storage.receiving.get" - ], - "notes": [ - "storage.receiving.get 的响应在 data.details[*] 中新增可选字段:box_remainder(箱内剩余数量/零散数量,number,默认 0)与 box_weight(实测箱重,number,默认 0)。", - "兼容性:新增字段为可选,旧客户端无需修改;建议前端在需要展示箱内余量/箱重时使用这些字段。" - ], - "type": "updated" - }, - { - "version": "2026.05.06-system-04", - "date": "2026-05-06", - "summary": "storage.receiving.getReceivingDetail 返回扩展:明细增加 box_remainder、box_weight;storage.receiving.completeReceiving 通知包含这两个字段", - "methods": [ - "storage.receiving.getReceivingDetail", - "storage.receiving.completeReceiving" - ], - "notes": [ - "为支持箱规统计与通知回传,getReceivingDetail 的明细项(receiving.details 或 data.details)在响应中新增可选字段:box_remainder(箱内剩余数量/零散数量,number)与 box_weight(实测箱重,number,单位同系统重量)。", - "completeReceiving 在完成收货后会发送通知(或回调),通知 payload/metadata 中将包含每条明细的 box_remainder 与 box_weight 字段,供下游系统/前端展示或审计使用。", - "兼容性:新增字段为可选,旧客户端在未使用这些字段时无需变更。" - ], - "type": "updated" - }, - { - "version": "2026.05.06-system-03", - "date": "2026-05-06", - "summary": "storage.receiving.detailChange:新增入参/出参字段 box_remainder、box_weight", - "methods": [ - "storage.receiving.detailChange" - ], - "notes": [ - "为支持箱规细化与回写,detailChange 新增可选入参 box_remainder(箱内余量/零散数量)和 box_weight(实测箱重,单位同系统重量),写入后会回写至明细并在响应 data 中返回对应字段。", - "兼容性:新增字段为可选,不传入则不影响现有调用;建议前端在需要回写箱余与箱重时一并传入。" - ], - "type": "updated" - }, - { - "version": "2026.05.06-system-02", - "date": "2026-05-06", - "summary": "新增 order.wave.singleFetchByIds:按订单ID抓取到一个散单波次", - "methods": [ - "order.wave.singleFetchByIds" - ], - "notes": [ - "新增 order.wave.singleFetchByIds:按入参 ids(兼容 order_ids/orderIds)去重后筛选当前仓库内待处理且不在波次中的订单,若存在可抓取订单则创建单个散单波次并把这些订单写入该波次(不区分快递);成功后批量写入订单操作日志;若无可抓取订单返回 wave_id=0。", - "接口行为严格对齐实现:过滤条件包含 step in [1,2,3]、status != 'cancel'、outbound_status != 'padding';已在波次的订单会被排除并返回 excluded_existing_wave_order_ids;响应包含 ids、wave_id、wave_no、fetched_order_ids、fetched_order_count、excluded_existing_wave_order_ids、skipped_order_ids、not_found_order_ids。" - ], - "type": "added" - }, - { - "version": "2026.05.06-system-01", - "date": "2026-05-06", - "summary": "新增 order.wave.groupFetch 与 order.wave.singleFetch;order.wave.fetch 保留兼容别名;抓取进度补充上限字段", - "methods": [ - "order.wave.groupFetch", - "order.wave.singleFetch", - "order.wave.fetch", - "order.wave.fetchTaskProgress" - ], - "notes": [ - "新增 order.wave.groupFetch:抓取团购接口(异步任务提交),参数 structure_list 与原 fetch 一致。", - "新增 order.wave.singleFetch:抓取散单接口(异步任务提交),在 structure_list 每项新增必填字段 max_fetch_quantity(最大抓取上限,订单数,正整数)。", - "order.wave.fetch 保留为兼容别名(等同 groupFetch),避免误导客户端。", - "groupFetch/singleFetch/fetch 的响应新增可选字段 fetch_mode;singleFetch 响应额外返回 max_fetch_quantity。", - "order.wave.fetchTaskProgress 的响应增加单模式相关字段:fetch_mode、max_fetch_quantity、limit_reached、stop_reason,用于描述散单抓取的上限与停止原因。" - ], - "type": "updated" - }, - { - "version": "2026.05.05-system-02", - "date": "2026-05-05", - "summary": "order.wave.batchList:新增 where.storage_assignment_status 的过滤语义说明", - "methods": [ - "order.wave.batchList" - ], - "notes": [ - "新增 where 字段 `storage_assignment_status`:类型 string,可选值:`未分配`、`部分分配`、`已分配`;默认不传:不做分配状态限制。", - "过滤语义:`已分配`:聚合后全部 fin;`部分分配`:不含 error,且既不是全 none,也不是全 fin;`未分配`:全 none 或包含 error(异常并入未分配筛选集合)。", - "说明:返回字段 `storage_assignment_status` 的展示值保持不变;包含 error 时仍可能展示“分配异常”,但 where 的过滤语义把异常算到“未分配”集合,避免把过滤语义与展示值混淆。" - ], - "type": "updated" - }, - { - "version": "2026.05.05-system-01", - "date": "2026-05-05", - "summary": "新增 order.wave.singleOrderFetchList:散单候选分组查询(排除团购命中分组)", - "methods": [ - "order.wave.singleOrderFetchList" - ], - "notes": [ - "新增 order.wave.singleOrderFetchList:返回按机器结构分组的散单候选列表,接口会排除已达团购阈值(同组订单数量 >= same_order_quantity 或仓库配置 min_group_order_fetch_quantity)的分组,仅返回同组订单数量 < 阈值 的分组(散单候选)。", - "与 order.wave.groupOrderFetchList 的关键差异:groupOrderFetchList 返回满足团购阈值(>=)的分组;singleOrderFetchList 返回未达阈值(<)的散单候选分组。", - "影响范围:订单波次抓取相关前端/调度服务。兼容性:不影响或修改现有 order.wave.groupOrderFetchList,两个接口可并行使用。" - ], - "type": "added" - }, - { - "version": "2026.05.04-system-04", - "date": "2026-05-04", - "summary": "完善商品编码唯一性校验接口文档,补充 item_id(排除自身)和 owner_id(货主ID)入参说明,新增 unique/isUnique 返回字段描述", - "methods": [ - "stock.warehouse.checkItemCodeUnique" - ], - "notes": [ - "完善商品编码唯一性校验接口文档,补充 item_id(排除自身)和 owner_id(货主ID)入参说明,新增 unique/isUnique 返回字段描述" - ], - "type": "modified" - }, - { - "version": "2026.05.04-system-03", - "date": "2026-05-04", - "summary": "新增订单打印模块:按波次IDs获取打印数据并自动过滤未完全分配波次", - "methods": [ - "order.print.getWavePrintData" - ], - "notes": [ - "按波次IDs获取订单打印数据,内部去重并规范化 wave_ids,自动过滤快递未完全分配的波次;返回通过过滤的波次订单明细,按 wave_no 排序分组,并在 ext 中返回 missing_wave_ids 与 filtered_wave_ids。" - ], - "type": "added" - }, - { - "version": "2026.05.04-system-02", - "date": "2026-05-04", - "summary": "修改 pick.query 入参:order_id -> waybill_code", - "methods": [ - "pick.query" - ], - "notes": [ - "入参从 order_id 改为 waybill_code(快递号),通过快递号查找订单后再查波次拣货信息" - ], - "type": "breaking_change" - }, - { - "version": "2026.05.04-system-01", - "date": "2026-05-04", - "summary": "新增 system method pick.query:按订单查询波次拣货信息", - "methods": [ - "pick.query" - ], - "notes": [ - "按订单查询该订单所属波次的拣货信息,支持 full/full_display/is_full 控制是否完整显示;接口按当前登录用户仓库上下文过滤,防止跨仓越界。" - ], - "type": "added" - }, - { - "version": "2026.05.03-system-09", - "date": "2026-05-03", - "summary": "新增按 request_id 查询分配状态/结果接口", - "methods": [ - "order.pendingOrder.allocateStorageProgress" - ], - "notes": [ - "新增按 request_id 查询储位分配异步任务状态/结果接口,支持 status:submitted/running/success/failed/not_found;success 返回 result(底层分配结果),failed 返回 error(错误信息);兼容 requestId 参数名。" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-07", - "date": "2026-05-03", - "summary": "新增抓取进度查询接口", - "methods": [ - "order.wave.fetch", - "order.wave.fetchTaskProgress" - ], - "notes": [ - "新增按 task_id 查询抓取任务进度的接口 order.wave.fetchTaskProgress,支持返回 status(submitted/running/success/failed/not_found)及进度相关字段:progress_percent、finished_structure_count、total_fetched_quantity、duration_ms、error、update_time 等;同时明确 order.wave.fetch 为异步任务提交接口,客户端可通过 task_id 调用 order.wave.fetchTaskProgress 查询进度和最终结果。" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-05", - "date": "2026-05-03", - "summary": "补齐仓库设置模块 setting.warehouse 的 methods 文档", - "methods": [ - "setting.warehouse.getSettings", - "setting.warehouse.getFieldMeta", - "setting.warehouse.saveSettings" - ], - "notes": [ - "补齐仓库配置 methods API 文档" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-04", - "date": "2026-05-03", - "summary": "order.wave:自动加团新增跳过规则并新增批量结束自动加团接口", - "methods": [ - "order.wave.batchAutoGrouping", - "order.wave.batchFinishAutoGrouping" - ], - "notes": [ - "开启自动加团新增“已打印/超最大波次容量”跳过规则并在响应中返回跳过明细;新增批量结束自动加团接口(将 wave_status=0 的波次批量置为 1)" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-03", - "date": "2026-05-03", - "summary": "裁剪 order_list 以轻量化返回", - "methods": [ - "order.wave.batchList" - ], - "notes": [ - "移除响应中的 order_list 字段,接口仅返回波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status)" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-02", - "date": "2026-05-03", - "summary": "新增 order.wave.batchAutoGrouping:批量改为自动加团中", - "methods": [ - "order.wave.batchAutoGrouping" - ], - "notes": [ - "新增批量改为自动加团中接口及返回字段" - ], - "type": "updated" - }, - { - "version": "2026.04.22-system-02", - "date": "2026-04-22", - "summary": "新增 order.pendingOrder.syncOrderIds:待处理订单同步透传入口", - "methods": [ - "order.pendingOrder.syncOrderIds" - ], - "notes": [ - "新增 order.pendingOrder.syncOrderIds:仅接收 order_ids 并转发到服务层,当前不做业务处理。", - "接口保留登录态校验,入参仅接受订单 ID 相关字段,响应以服务层返回值为准。", - "该方法用于预留同步链路,后续补齐业务逻辑时再扩展服务层实现。" - ], - "type": "updated" - }, - { - "version": "2026.04.22-system-01", - "date": "2026-04-22", - "summary": "补全订单工作台各模块 detail 方法文档", - "methods": [ - "order.detail", - "order.pendingOrder.detail", - "order.reviewOrder.detail", - "order.expectionOrder.detail", - "order.outboundOrder.detail", - "order.deliveryOrder.detail", - "order.deliveryExpectionOrder.detail", - "order.entrustOrder.detail", - "order.archiveOrder.detail" - ], - "notes": [ - "补全文档:detail 为订单工作台通用详情方法,入参支持 ids/id/order_id/orderId;可选 tableType/tablePosition/type/moduleName,支持 current/history/dispatch/outsourced/order/revieworder/pendingorder 等。", - "返回包含 order/detail(订单头)、orderItems/items(商品明细)、expresses(运单信息)、waybill_codes(去重运单号数组)。" - ], - "type": "updated" - }, - { - "version": "2026.04.19-system-01", - "date": "2026-04-19", - "summary": "新增方法 setting.expressInterface.listByWarehousePlatformCode:按 warehouse_id + platform_code 查询全字段列表并支持缓存", - "methods": [ - "setting.expressInterface.listByWarehousePlatformCode" - ], - "notes": [ - "新增 setting.expressInterface.listByWarehousePlatformCode:按 warehouse_id + platform_code 返回快递接口的全字段数组(不分页),每条记录包含 express 关联对象(id/code/name/platform 等)。", - "支持缓存,缓存键由 warehouse_id + platform_code 组成;缓存命中将直接返回缓存结果以提升查询性能。", - "在创建/更新/删除操作(setting.expressInterface.create/update/delete)后,会主动清理对应 warehouse_id + platform_code 的缓存以确保数据一致性。" - ], - "type": "added" - }, - { - "version": "2026.04.17-system-08", - "date": "2026-04-17", - "summary": "新增快递编码管理模块批量软删除接口 setting.express.delete", - "methods": [ - "setting.express.delete" - ], - "notes": [ - "新增批量软删除接口 setting.express.delete:接受 ids(数组、逗号字符串或单值),对属于当前仓库且未被删除的记录执行软删除(设置 deleted_at),并清理 express 列表缓存。", - "当任一目标记录的 code 被 wms_express_interface.express_code 引用时,接口会拒绝删除并返回 409,错误信息中包含被引用的编码列表。", - "响应包含 ids、deleted_ids、already_deleted_ids 与 status,已删除与未删除的 id 会明确分类。仅记录已实现行为。" - ], - "type": "added" - }, - { - "version": "2026.04.17-system-05", - "date": "2026-04-17", - "summary": "新增文档分组:平台编码管理模块(收口 index.getPlatformList 与 setting.platform.*)", - "methods": [ - "index.getPlatformList", - "setting.platform.list", - "setting.platform.create", - "setting.platform.update", - "setting.platform.delete" - ], - "notes": [ - "新增独立文档分组 '平台编码管理模块',将平台基础列表(index.getPlatformList)与平台设置管理接口(setting.platform.*)归并为单一分组以便维护;仅文档变更,不修改实现。", - "文档中仅包含已实现的方法与字段,未新增或推断不存在的参数/返回字段。" - ], - "type": "added" - }, - { - "version": "2026.04.17-system-04", - "date": "2026-04-17", - "summary": "新增独立平台设置模块 setting.platform(wms_platfrom_setting)及其 CRUD 接口:list/create/update/delete。", - "methods": [ - "setting.platform.list", - "setting.platform.create", - "setting.platform.update", - "setting.platform.delete" - ], - "notes": [ - "新增独立模块 setting.platform,映射数据表 wms_platfrom_setting;list 支持 where(id/code/name/platform_code/quickWhere)与 pagination(兼容 page/pageSize/page_size);create/update 要求 platform_code 必须存在于系统平台表(wms_platform),且禁止越权写入 warehouse_id;delete 需传入 id 并校验当前仓库范围。" - ], - "type": "added" - }, - { - "version": "2026.04.15-system-07", - "date": "2026-04-15", - "summary": "将 docs/order-workbench-list-api.md 引用统一为 window 链接格式", - "methods": [ - "order.list", - "order.reviewOrder.list", - "order.pendingOrder.list", - "order.outboundOrder.list", - "order.expectionOrder.list", - "order.entrustOrder.list", - "order.deliveryOrder.list", - "order.deliveryExpectionOrder.list" - ], - "notes": [ - "将所有 methods/system.json 中指向 docs/order-workbench-list-api.md 的说明统一替换为 docs/order-workbench-list-api.md 格式,以便 HTML 渲染识别为 window 链接。", - "仅修改 methods/system.json 的文档字段,不涉及任何业务代码或接口契约变化。" - ], - "type": "updated" - }, - { - "version": "2026.04.15-system-06", - "date": "2026-04-15", - "summary": "订单工作台列表文档补全 raw 字段字典与中文语义说明", - "methods": [ - "order.list", - "order.reviewOrder.list", - "order.pendingOrder.list", - "order.outboundOrder.list", - "order.expectionOrder.list", - "order.entrustOrder.list", - "order.deliveryOrder.list", - "order.deliveryExpectionOrder.list", - "order.archiveOrder.list" - ], - "notes": [ - "在 docs/order-workbench-list-api.md 中补充所有订单列表通用 raw 字段字典,明确每个字段的中文语义与 enum 取值。", - "补充 express_numbers / waybill_codes 两个服务层派生字段说明,便于前端直接渲染多个快递号。", - "methods/system.json 中所有订单 list 的 response.list 描述已指向该字段字典章节。" - ], - "type": "updated" - }, - { - "version": "2026.04.15-system-05", - "date": "2026-04-15", - "summary": "基础模块新增快递/平台列表查询接口并设置为不鉴权,复用缓存 service", - "methods": [ - "index.getExpressList", - "index.getPlatformList" - ], - "notes": [ - "新增 index.getExpressList,归属基础模块(module=index),对应 app/service/systems/express.js 中的 getExpressList。", - "index.getExpressList 设置为不鉴权,不需要 Authorization 头。", - "新增 index.getPlatformList,归属基础模块(module=index),对应 app/service/systems/platform.js 中的 getPlatformList。", - "index.getPlatformList 设置为不鉴权,不需要 Authorization 头。", - "快递列表与平台列表都支持缓存优先,缓存未命中时回源数据库并写入缓存。", - "平台列表支持缓存优先,缓存未命中时回源 wms_platform 并写入缓存。" - ], - "type": "added" - }, - { - "version": "2026.04.15-system-02", - "date": "2026-04-15", - "summary": "签约策略字段元信息新增 default_express_code / default_platform_code list 选项", - "methods": [ - "storeWarehouse.store.getPolicyConfigFields" - ], - "notes": [ - "getPolicyConfigFields 现在返回 default_express_code 与 default_platform_code 两个 list 字段,并从 wms_express / wms_platform 读取选项列表。", - "默认值仍保留为 default_express_code=STO、default_platform_code=TB。" - ], - "type": "updated" - }, - { - "version": "2026.04.15-system-03", - "date": "2026-04-15", - "summary": "签约策略字段移除 sku_visibility,receive_mode options 改为 value/label 结构", - "methods": [ - "storeWarehouse.store.savePolicyConfig", - "storeWarehouse.store.getPolicyConfigFields" - ], - "notes": [ - "策略字段定义不再包含 sku_visibility,历史值读取时仍会被归一化忽略。", - "receive_mode 的 options 改为 [{ value, label }] 格式,便于前端直接渲染。" - ], - "type": "updated" - }, - { - "version": "2026.04.15-system-04", - "date": "2026-04-15", - "summary": "按文件模块拆分 order 目录系统文档分组,覆盖订单工作台入口及各子模块方法", - "methods": [ - "order.list", - "order.manualOutboundOrder", - "order.badgeCount", - "order.outboundOrder.manualOutboundOrder", - "order.reviewOrder.list", - "order.reviewOrder.reviewOrder", - "order.pendingOrder.list", - "order.pendingOrder.reverseReviewOrder", - "order.pendingOrder.markPendingOutboundOrder", - "order.pendingOrder.cancelOrder", - "order.outboundOrder.list", - "order.expectionOrder.list", - "order.entrustOrder.list", - "order.deliveryOrder.list", - "order.deliveryExpectionOrder.list", - "order.archiveOrder.list" - ], - "notes": [ - "按 app/service/systemMethods/order 下的实际对外方法补全 methods/system.json 文档,只覆盖 system,不处理 qimen。", - "order 文档已按 index / reviewOrder / pendingOrder / outboundOrder / expectionOrder / entrustOrder / deliveryOrder / deliveryExpectionOrder / archiveOrder 拆成多个模块分组。", - "同步根据当前代码意图补充 params / response / errors,且不再把 index.js 已移除的兼容接口写回文档。" - ], - "type": "updated" - }, - { - "version": "2026.04.15-system-01", - "date": "2026-04-15", - "summary": "货主主体配置默认补齐 default_express_code / default_platform_code", - "methods": [ - "store.createStore", - "store.createWarehouse" - ], - "notes": [ - "当 subject_config 未传或缺少字段时,自动补齐 default_express_code=STO、default_platform_code=TB,并保留现有的 max_notice_webhook_count 默认值。", - "同步更新 methods/system.json 中 store.createStore 与 store.createWarehouse 的参数说明。" - ], - "type": "updated" - }, - { - "version": "2026.04.14-system-01", - "date": "2026-04-14", - "summary": "库存列表新增货主名称字段 stock.store_name", - "methods": [ - "storage.inventory.list" - ], - "notes": [ - "在 methods/system.json 的 storage.inventory.list response 中补充 stock.store_name:来源于签约表 store_remask,若无签约关系则为 null。", - "只同步文档,不修改业务代码。" - ], - "type": "updated" - }, - { - "version": "2026.04.13-system-01", - "date": "2026-04-13", - "summary": "补全 storage.receiving.detailChange 的入参/出参契约与错误码说明", - "methods": [ - "storage.receiving.detailChange" - ], - "notes": [ - "在 methods/system.json 中补充 storage.receiving.detailChange 的 params/response/errors,明确 id 与 receiving_id 必填。", - "说明 expiry_date 小于当前日期时返回 400 且 message 为 \"到期日期已过期,不能录入收货\"。", - "说明当传入 system_product_id 时会回填条码、重量、箱规、商品名称与 product_snapshot;未传时 barcode/product_name 也可单独更新。", - "同步补充文档:docs/storage-receiving-api.md 中新增 detailChange 段落。" - ], - "type": "updated" - }, - { - "version": "2026.04.07-system-01", - "date": "2026-04-07", - "summary": "修正 warehouse.getAreaRacks 的鉴权/权限链路文档,明确该接口需要 登录并走权限校验。", - "methods": [ - "warehouse.getAreaRacks" - ], - "notes": [ - "对齐当前 system 文档中的 isNeedAuth=true、isNeedLogin=true。", - "用于补充该接口权限链路修正文档的历史上下文,不改变 methods/system.json 的 SSOT 角色。" - ] - }, - { - "version": "2026.04.07-system-02", - "date": "2026-04-07", - "summary": "补充签约配置相关接口文档,覆盖策略字段元信息查询与面单数量人工调整。", - "methods": [ - "storeWarehouse.store.getPolicyConfigFields", - "storeWarehouse.store.adjustPrintQuantity" - ], - "notes": [ - "getPolicyConfigFields 说明为获取签约策略可配置字段元信息列表。", - "adjustPrintQuantity 说明为人工调整签约关系下的面单余额并记录变更日志,并 明确 id、change_quantity、reason 等关键入参。" - ] - }, - { - "version": "2026.04.07-system-03", - "date": "2026-04-07", - "summary": "对外命名从 qimenConfig 收口为 apiConfig,并在接口配置文档中强调 interface_type_id 校验。", - "methods": [ - "storeWarehouse.store.listApiConfig", - "storeWarehouse.store.saveApiConfig", - "storeWarehouse.store.deleteQimenConfig" - ], - "notes": [ - "文档对外统一使用 apiConfig / api_config 命名,减少 qimenConfig 历史别名歧义。", - "saveApiConfig 要求 interface_type_id 为必填且必须指向已存在的 wms_interface_type 记录。", - "listApiConfig / deleteQimenConfig 同步补充 interface_type_id 字段说明。" - ] - }, - { - "version": "2026.04.07-system-04", - "date": "2026-04-07", - "summary": "补充 /api/docs 文档体验增强说明,新增查看变更记录与查看原文 JSON 的入口说明。", - "methods": [ - "/api/docs", - "/api/docs/:docName", - "/api/docs/:docName/raw", - "/api/docs/:docName/changes" - ], - "notes": [ - "sidecar 变更数组用于承载文档历史说明,不替代 methods/system.json 作为 SSOT。", - "原文 JSON 入口继续用于直接查看当前生效文档。" - ] - }, - { - "version": "2026.04.07-system-05", - "date": "2026-04-07", - "summary": "修正 storeWarehouse.store.adjustPrintQuantity 的面单余额调整语义:由增减/累加改为覆盖设置目标余额。", - "methods": [ - "storeWarehouse.store.adjustPrintQuantity" - ], - "notes": [ - "adjustPrintQuantity 当前兼容 print_quantity、target_quantity、change_quantity、adjust_quantity 作为目标面单余额输入,不再按增减量解释。", - "变更日志中的 change_quantity 由 before/after 自动计算差值,以兼容历史审计与展示。" - ] - }, - { - "version": "2026.04.07-system-06", - "date": "2026-04-07", - "summary": "按接口类型分类限制必填字段,OPEN_API 创建时自动生成 self_app_key/self_app_secret", - "methods": [ - "storeWarehouse.store.saveApiConfig" - ], - "notes": [ - "QM_WMS 类型须填写 qimen_app_key/qimen_customer_id/qimen_warehouse_code;OPEN_API 类型三个奇门字段非必填,创建时自动生成 self_app_key(WMS+32位HEX)和 self_app_secret(64位HEX),更新时保留已有密钥。" - ], - "type": "changed" - }, - { - "version": "2026.04.07-system-07", - "date": "2026-04-07", - "summary": "新增接口类型列表查询接口,归属基础模块,无需权限", - "methods": [ - "index.listInterfaceTypes" - ], - "notes": [ - "返回所有已启用的接口类型(wms_interface_type),包含 id、interface_code、interface_name、interface_category、description 字段。设置 isNeedAuth: false, isNeedLogin: true。" - ], - "type": "added" - }, - { - "version": "2026.04.07-system-08", - "date": "2026-04-07", - "summary": "app_name 改为必传参数", - "methods": [ - "storeWarehouse.store.saveApiConfig" - ], - "notes": [ - "app_name 不再有默认值自动生成逻辑,调用方必须传入非空的 app_name,否则返 回 400 错误。" - ], - "type": "changed" - }, - { - "version": "2026.04.07-system-09", - "date": "2026-04-07", - "summary": "新增收货单快捷入库上架接口", - "methods": [ - "storage.inventory.quickPutaway" - ], - "notes": [ - "新建 storage.inventory 库存操作模块。quickPutaway 从收货单直接生成入库单 (SCRK)并写入 wms_storage 库存表,同时更新 wms_stock_warehouse 库存数量(悲观行锁),回填收货明细入库状态。要求收货单已完成且所有明细已匹配系统商品。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-01", - "date": "2026-04-08", - "summary": "新增收货单与入库单匹配入库接口", - "methods": [ - "storage.inventory.matchPutaway" - ], - "notes": [ - "接收多个收货单和入库单,按商品(stock_warehouse_id)进行数量匹配入库,完 成后根据入库单来源(QM/API)自动触发回传。入参为 receiving_ids(数组)和 entry_order_ids(数组),返回匹配汇总、各收货单入库状态、各入库单状态及回传结果。isNeedAuth=true, isNeedLogin=true, isNeedRight=false。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-02", - "date": "2026-04-08", - "summary": "saveApiConfig 新增 callback_url 可选参数", - "methods": [ - "storeWarehouse.store.saveApiConfig" - ], - "notes": [ - "新增 callback_url 参数(VARCHAR(500),可选),用于 OPEN_API 类型入库单的 回调地址配置。" - ], - "type": "changed" - }, - { - "version": "2026.04.08-system-03", - "date": "2026-04-08", - "summary": "serializeQimenConfig 新增返回 callback_url 字段,影响 list 和 listApiConfig 两个接口", - "methods": [ - "storeWarehouse.store.list", - "storeWarehouse.store.listApiConfig" - ], - "notes": [ - "serializeQimenConfig() 序列化方法新增 callback_url(string)字段。storeWarehouse.store.list 返回的每条记录 api_config 对象中包含 callback_url;storeWarehouse.store.listApiConfig 返回的 list 数组中每条配置包含 callback_url。" - ], - "type": "changed" - }, - { - "version": "2026.04.08-system-04", - "date": "2026-04-08", - "summary": "新增库存移库(库位转移)接口", - "methods": [ - "storage.inventory.transferLocation" - ], - "notes": [ - "新增 storage.inventory.transferLocation 接口,支持批量多商品多库位移库, 包含部分数量移库与全量移库。入参为 warehouse_id(仓库ID)和 transfers 数组(storage_id、target_space_id、quantity),触发 storage_transfer_completed 通知事件, 每条移库记录独立操作日志。isNeedAuth=true, isNeedLogin=true。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-05", - "date": "2026-04-08", - "summary": "简化移库接口入参,从批量 transfers 数组改为单条移库", - "methods": [ - "storage.inventory.transferLocation" - ], - "notes": [ - "移除 warehouse_id 和 transfers 数组入参,改为扁平的 storage_id + target_space_id + quantity 三个顶层参数。warehouse_id 从库存记录自动获取,接口从批量移库简化为单商品单库位移库。响应结构同步简化为单条结果对象。" - ], - "type": "modified" - }, - { - "version": "2026.04.08-system-06", - "date": "2026-04-08", - "summary": "新增商品库存明细查询接口", - "methods": [ - "stock.warehouse.getStockDetail" - ], - "notes": [ - "新增 stock.warehouse.getStockDetail 接口,按库位/批次维度查询商品库存分布。入参为 stock_id(必填,商品库存ID)和 pagination(可选,含 page/pageSize)。返回 stockItem(商品概要)、storageList(wms_storage 明细数组,含批次号、库位、数 量、锁定数量、生产日期、过期日期等,关联 location_space 库位信息)、pagination 分页信息。isNeedAuth=false, isNeedLogin=true。底层调用 stockStore.getStockDetail,自动校验商品归属当前仓库。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-07", - "date": "2026-04-08", - "summary": "新增入参 group_by_batch,支持按批次维度切换库存明细聚合方式", - "methods": [ - "stock.warehouse.getStockDetail" - ], - "notes": [ - "新增可选布尔参数 group_by_batch(默认 false)。false 时按库位合并数量,批次相关字段(batch_no, production_date, expiry_date, inbound_time, inbound_order_no, supplier_batch_no)置 null;true 时保持原逻辑返回每条明细。出参结构不变,但 storageList 中批次字段在合并模式下为 null。" - ], - "type": "modified" - }, - { - "version": "2026.04.08-system-08", - "date": "2026-04-08", - "summary": "新增按商品维度移库接口", - "methods": [ - "storage.inventory.transferByProduct" - ], - "notes": [ - "新增 storage.inventory.transferByProduct 接口,按库位+商品查找所有库存记 录合并移动。入参为 space_id(原库位ID)、stock_id(商品SKU ID,即 wms_stock_warehouse.id)、target_space_id(目标库位ID)、quantity(移库数量)。开启批次管理(is_batch_mgmt=Y)的商品会被拒绝,需使用 transferLocation 按库存记录精确移库。复用 storage_transfer_completed 通知事件,操作日志编码 STORAGE_TRANSFER_BY_PRODUCT。isNeedAuth=true, isNeedLogin=true。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-09", - "date": "2026-04-08", - "summary": "补充 storeWarehouse.store.list 完整 response 输出字段说明,移除 api_config / apiConfig", - "methods": [ - "storeWarehouse.store.list" - ], - "notes": [ - "从返回结果中移除 api_config 和 apiConfig 字段(代码中 delete serialized.api_config / delete serialized.apiConfig),文档 response 补充完整输出字段列表:id, store_id, store_name, warehouse_id, warehouse_name, counterparty_id, counterparty_name, current_subject_role, auth_status, auth_status_label, apply_reason, review_comment, apply_time, review_time, auth_start, auth_end, actual_end, print_quantity, applied_by, reviewed_by, ended_by, remask, use_status, policy_config, is_auth_valid, remaining_days 以及分页和 current_subject 信息。" - ], - "type": "updated" - }, - { - "version": "2026.04.08-system-10", - "date": "2026-04-08", - "summary": "货主列表返回新增 has_qimen_config 布尔字段", - "methods": [ - "storeWarehouse.store.list" - ], - "notes": [ - "storeWarehouse.store.list 返回的 data.list[] 中新增 has_qimen_config(boolean),表示该货主是否已配置奇门。" - ], - "type": "changed" - }, - { - "version": "2026.04.08-system-11", - "date": "2026-04-08", - "summary": "补全 stock.warehouse.search 接口文档,新增 params / response / errors 完整说明", - "methods": [ - "stock.warehouse.search" - ], - "notes": [ - "入参补充 keyword(string,模糊匹配 item_code / item_name / goods_code / barcode)和 store_id(number,按货主筛选)。响应补充 data 数组各字段(id, item_code, goods_code, item_name, sku_property, stock_unit, quantity, locked_quantity, brand_name, item_type, barcodes, store_stock)以及 total。errors 补充 code=0 搜 索失败场景。" - ], - "type": "updated" - }, - { - "version": "2026.04.08-system-12", - "date": "2026-04-08", - "summary": "新增 with_stock / is_batch 参数,支持返回关联库存明细(按库位分 组或按批次逐条)", - "methods": [ - "stock.warehouse.search" - ], - "notes": [ - "入参新增 with_stock(boolean,默认 false,是否返回关联库存数据)和 is_batch(boolean,默认 false,仅 with_stock=true 时生效,按批次明细返回)。响应 data[] 新增 storage[] 字段:is_batch=false 时按库位分组汇总(含 space_id、space、inventory_type、quantity、locked_quantity、available_quantity);is_batch=true 时逐 条返回批次明细(含 id、stock_id、space_id、batch_no、inventory_type、quantity、locked_quantity、available_quantity、production_date、expiry_date、inbound_time、inbound_order_no、supplier_batch_no、created_at、space)。" - ], - "type": "updated" - }, - { - "version": "2026.04.08-system-13", - "date": "2026-04-08", - "summary": "新增 wms_stock_transaction 表和模型", - "methods": [ - "wms_stock_transaction" - ], - "notes": [ - "新增出入库流水记录表 wms_stock_transaction,含 transaction_type(INBOUND/OUTBOUND)、warehouse_id、store_id、stock_id、storage_id、space_id、quantity、batch_no、inventory_type、order_type、order_no、order_id、receiving_id、entry_order_id、operator_id、operator_name、remark 等字段,关联 StockWarehouse 和 Storage 模型。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-14", - "date": "2026-04-08", - "summary": "quickPutaway 和 matchPutaway 入库时自动写入出入库记录", - "methods": [ - "storage.inventory.quickPutaway", - "storage.inventory.matchPutaway" - ], - "notes": [ - "入库操作完成后自动写入 wms_stock_transaction 记录。quickPutaway 写入 order_type='SCRK'(收货入库),matchPutaway 写入 order_type='MATCH'(匹配入库),均 自动填充 warehouse_id、store_id、stock_id、storage_id、space_id、quantity、batch_no、inventory_type 等字段。" - ], - "type": "updated" - }, - { - "version": "2026.04.08-system-15", - "date": "2026-04-08", - "summary": "新增 storage.inventory.list 出入库记录列表查询接口", - "methods": [ - "storage.inventory.list" - ], - "notes": [ - "出入库记录列表查询,支持 where 条件(transaction_type、stock_id、space_id、store_id、order_type、order_no、inventory_type、operator_name、created_at)、 分页(pagination)、排序(sort)和 group_by_batch 参数。默认合并模式按库位+商品 聚合返回合计数量与记录条数,group_by_batch=true 时返回每条明细含 batch_no、order_no、operator_name 等完整信息。响应均关联 stockItem(item_code、item_name、sku_property、stock_unit)。" - ], - "type": "added" - }, - { - "version": "2026.04.08-system-16", - "date": "2026-04-08", - "summary": "出入库流水记录查询接口从 storage.inventory.list 改名为 storage.transaction.list", - "methods": [ - "storage.transaction.list" - ], - "notes": [ - "将出入库流水记录查询从 storage.inventory.list 迁移到 storage.transaction.list,避免与库存列表概念混淆。功能和参数不变。isNeedAuth=false, isNeedLogin=true, isNeedRight=false。" - ], - "type": "rename", - "module": "storage" - }, - { - "version": "2026.04.08-system-17", - "date": "2026-04-08", - "summary": "新增 storage.inventory.list 库存列表查询接口", - "methods": [ - "storage.inventory.list" - ], - "notes": [ - "新增库存列表查询接口,查询 wms_storage 表。支持 where 条件(stock_id/space_id/store_id/inventory_type/batch_no/inbound_order_no/available_quantity/inbound_time/created_at)、分页、排序。支持 group_by_batch 参数:默认 false 按库位+商 品合并(SUM quantity/locked_quantity/available_quantity),true 返回每条明细含 batch_no/production_date/expiry_date 等。关联 stockItem(商品信息)和 space(库位信息)。isNeedAuth=false, isNeedLogin=true, isNeedRight=false。" - ], - "type": "add", - "module": "storage" - }, - { - "version": "2026.04.08-system-18", - "date": "2026-04-08", - "summary": "移除 storage.entry.create 创建入库单接口", - "methods": [ - "storage.entry.create" - ], - "notes": [ - "不再允许通过 API 创建入库单。入库单仅由快捷入库(quickPutaway)和匹配入库(matchPutaway)等内部流程自动创建。底层 service 实现保留但不再通过 systemMethods 对外暴露。" - ], - "type": "remove", - "module": "storage" - }, - { - "version": "2026.04.08-system-19", - "date": "2026-04-08", - "summary": "移除 storage.entry.addDetail / deleteDetail / detailChange 对外 接口", - "methods": [ - "storage.entry.addDetail", - "storage.entry.deleteDetail", - "storage.entry.detailChange" - ], - "notes": [ - "入库单明细编辑能力不再通过 systemMethods 对外暴露,入库单模块仅保留 list/get/cancel/completeEntry。" - ], - "type": "remove", - "module": "storage" - }, - { - "version": "2026.04.08-system-20", - "date": "2026-04-08", - "summary": "新增 storage.stockout 出库单模块(非订单出库单能力)", - "methods": [ - "storage.stockout.list", - "storage.stockout.toOrder", - "storage.stockout.listItems" - ], - "notes": [ - "新增 storage.stockout.list / toOrder / listItems 接口,作为非订单出库单的主出口(对应奇门 stockout.create)。storage.delivery.* 仅作为兼容转发保留;底层 部分能力仍复用 order 模块。" - ], - "type": "add", - "module": "storage" - }, - { - "version": "2026.04.08-system-21", - "date": "2026-04-08", - "summary": "将 storage.stockout.toOrder 标记为占位接口", - "methods": [ - "storage.stockout.toOrder" - ], - "notes": [ - "storage.stockout.toOrder 当前仅保留方法名用于后续扩展,暂不开放实际逻辑。调用时返回 code=405、message=占位接口,暂未开放。" - ], - "type": "change" - }, - { - "version": "2026.04.09-system-01", - "date": "2026-04-09", - "summary": "storage.entry.cancel 支持批量作废,新增 ids 入参并兼容单条 id", - "methods": [ - "storage.entry.cancel" - ], - "notes": [ - "新增入参 `ids`(number[])以支持批量作废,兼容旧入参 `id`;当同时传入 `ids` 与 `id` 时以 `ids` 为准。", - "参数校验:`ids` 必须为非空数组;非法 ID 或空数组返回 400。", - "业务约束:已完成/已作废/处于不可作废状态的单据不允许作废;批量场景下任一 单据不存在或状态不允许时整体返回 404/400,未执行部分更新。", - "响应说明:单条作废返回字段 `id`(number);批量作废返回字段 `ids`(number[])。", - "已同步更新 methods/system.json(storage.entry.cancel)为 SSOT。" - ] - }, - { - "version": "2026.04.09-system-02", - "date": "2026-04-09", - "summary": "新增基础模块车牌识别接口 index.recognizeLicensePlate", - "methods": [ - "index.recognizeLicensePlate" - ], - "notes": [ - "入参:base64(string,必填)或 imageBase64/image_base64(兼容)", - "响应:返回归一化后的识别对象,包含 licensePlate、plateNumber、color、confidence、requestId、imageSize、rawData", - "错误:400(参数或图片格式/尺寸问题),500(第三方 OCR 调用失败或云密钥未 配置)", - "文档中不包含任何敏感配置;实际腾讯云密钥保留在配置文件中,勿在文档中暴露 。" - ], - "type": "added" - }, - { - "version": "2026.04.09-system-03", - "date": "2026-04-09", - "summary": "收紧基础模块车牌识别接口响应,仅返回 licensePlate 字段", - "methods": [ - "index.recognizeLicensePlate" - ], - "notes": [ - "出参由 {licensePlate, plateNumber, color, confidence, requestId, imageSize, rawData} 调整为 {licensePlate}", - "调用方请仅依赖 licensePlate 字段以适配新版本;历史字段已裁剪且不再保证存 在。", - "文档中未包含任何云密钥或敏感配置信息。" - ], - "type": "changed" - }, - { - "version": "2026.04.10-system-01", - "date": "2026-04-10", - "summary": "订单审核字段由 audit_status 替换为整数字段 step,并添加数据库迁移", - "methods": [ - "order.getreviewOrderlist", - "order.reviewOrder.getreviewOrderlist", - "order.reviewOrder.reviewOrder", - "order.deliveryOrder.getdeliveryOrderlist", - "order.list", - "order.stats" - ], - "notes": [ - "字段变更:order 相关审核字段从字符串/枚举 audit_status 替换为整数 step。", - "step 映射:0=未审核,1=已审核,2=处理中,3=驳回/异常,4=配送中,5=已完成,9=已关闭。", - "reviewOrder 接口在更新 inspection_status 的同时会写入 step 字段。", - "必须执行迁移脚本:20260410150000-replace-audit-status-with-step-on-order-delivery-tables.js" - ], - "type": "changed" - }, - { - "version": "2026.04.13-system-02", - "date": "2026-04-13", - "summary": "stock.warehouse.search 返回新增效期管理字段并保留 is_shelf_life_mgmt", - "methods": [ - "stock.warehouse.search" - ], - "notes": [ - "响应 data[] 中新增字段:inbound_min_days、outbound_min_days、shelf_life_days、remaining_threshold_days(均为 number,单位:天)。", - "保留并说明 is_shelf_life_mgmt 布尔字段(boolean),表示是否启用效期管理(true=启用)。", - "仅更新文档(methods/system.json 与变更记录),代码行为不变。" - ], - "type": "updated" - }, - { - "version": "2026.04.13-system-02", - "date": "2026-04-13", - "summary": "新增 storage.expiry.list 库存有效期列表查询接口", - "methods": [ - "storage.expiry.list" - ], - "notes": [ - "该接口查询 wms_storage,关联 stockWarehouse 和 locationSpace,并按当前仓库与 remaining_threshold_days / expiry_date 过滤。" - ], - "type": "added" - }, - { - "version": "2026.04.13-system-03", - "date": "2026-04-13", - "summary": "新增 storage.inventory.list 库存列表返回效期字段与预警标记", - "methods": [ - "storage.inventory.list" - ], - "notes": [ - "库存列表响应增加生产日期、过期日期、效期预警是否触发字段", - "预警标记仅在商品启用保质期管理且到期日满足阈值条件时为 true" - ], - "type": "updated" - }, - { - "version": "2026.04.14-system-01", - "date": "2026-04-14", - "summary": "更新 index.searchSpace 文档", - "methods": [ - "index.searchSpace" - ], - "notes": [ - "补充 index.searchSpace 的 params/response,按 ctx.user.store_id 作为仓库上下文;keyword 为可选字符串,对 space_code 与 custom_barcode 做 %keyword% 模糊匹配;返回字段 id、space_code、custom_barcode、custom_name,最多 50 条;仅文档同步,无代码变更。" - ], - "type": "updated" - }, - { - "version": "2026.04.16-system-01", - "date": "2026-04-16", - "summary": "基础模块新增快递产品类型查询接口", - "methods": [ - "index.getExpressProductTypeList" - ], - "notes": [ - "新增 index.getExpressProductTypeList,归属基础模块(module=index),用于查询指定快递公司的产品类型列表。", - "对应服务实现:app/service/systems/express.js 中的 getExpressProductTypeList,支持传入 express_code 作为可选筛选参数(source=body)。", - "接口设置为免鉴权(isNeedAuth=false)但需登录(isNeedLogin=true),与 index.getExpressList / index.getPlatformList 一致,优先从缓存读取。" - ], - "type": "added" - }, - { - "version": "2026.04.17-system-01", - "date": "2026-04-17", - "summary": "新增快递管理模块(setting.express)及 5 个接口文档", - "methods": [ - "setting.express.list", - "setting.express.listBase", - "setting.express.create", - "setting.express.checkCodeUnique", - "setting.express.update" - ], - "notes": [ - "新增独立模块组:快递管理模块(module=setting.express),将快递映射管理相关接口独立为一组以便维护。", - "接口实现参考:app/service/systems/setting/express.js(返回结构)与 app/service/systemMethods/setting/express.js(对外方法包装)。", - "接口鉴权与上下文:isNeedAuth=false, isNeedLogin=true;需在请求中传入 Authorization 以携带登录上下文(用于获取当前仓库/货主上下文)。", - "已同步更新 methods/system.json,补充 params/response/errors,保持文档与实现一致。" - ], - "type": "added" - }, - { - "version": "2026.04.17-system-02", - "date": "2026-04-17", - "summary": "setting.express.list 分页入参统一为 pagination", - "methods": [ - "setting.express.list" - ], - "notes": [ - "将 setting.express.list 的分页入参文档从顶层 page/page_size/pageSize 迁移为 pagination 对象,主形态为 pagination;兼容 snake_case 的 page_size 与 camelCase 的 pageSize。", - "文档与当前实现一致:顶层 page/page_size/pageSize 会被归一化到 data.pagination 并转发到系统服务。" - ], - "type": "updated" - }, - { - "version": "2026.04.17-system-03", - "date": "2026-04-17", - "summary": "新增快递接口管理模块(setting.expressInterface)及 4 个接口文档", - "methods": [ - "setting.expressInterface.list", - "setting.expressInterface.create", - "setting.expressInterface.update", - "setting.expressInterface.delete" - ], - "notes": [ - "新增独立模块组:快递接口管理模块(module=setting.expressInterface),对应实现:app/service/systems/setting/expressInterface.js 与对外包装 app/service/systemMethods/setting/expressInterface.js。", - "接口为当前仓库范围(基于 ctx.user.store_id),仓库边界由系统服务强制校验;禁止通过接口指定 warehouse_id/warehouseId。操作需登录(isNeedLogin=true),无需额外鉴权(isNeedAuth=false)。", - "已在 methods/system.json 新增对应接口的 params/response/errors 文档,保持与实现一致。" - ], - "type": "added" - }, - { - "version": "2026.04.18-system-01", - "date": "2026-04-18", - "summary": "补充订单储位分配接口文档:order.storageAllocation.allocateStorage", - "methods": [ - "order.storageAllocation.allocateStorage" - ], - "notes": [ - "新增 order.storageAllocation.allocateStorage:按订单批量分配储位,支持多种入参别名(order_ids/ids/orderId 等)与仓库上下文优先级。", - "响应包含 requested_order_ids, pending_order_ids, allocated_order_ids, shortage_order_ids, skipped_orders, picking_count, stock_lock_summary, storage_lock_summary 等字段,用于前端展示分配结果与不足提示。" - ], - "type": "added" - }, - { - "version": "2026.04.18-system-02", - "date": "2026-04-18", - "summary": "新增 order.pendingOrder.allocateExpressCode:待处理订单模块的批量分配快递号入口,复用 express.createWaybillCodePipeline。", - "methods": [ - "order.pendingOrder.allocateExpressCode" - ], - "notes": [ - "该接口直接接收订单对象数组入参;订单对象应为来自待处理订单列表或详情的原始订单对象。每个订单对象必须包含 order_id 与 business_key;sys_platform_code、logistics_code 为订单对象自带字段,前端无需额外拼装或单独构造,直接原样回传订单对象即可。", - "实际的运单创建、归一化与跳过逻辑由 express.createWaybillCodePipeline 处理。", - "接口返回值与现有分配链路一致,已用统一 success 包装返回。" - ], - "type": "added" - }, - { - "version": "2026.04.18-system-03", - "date": "2026-04-18", - "summary": "将 order.storageAllocation.allocateStorage 迁移到 order.pendingOrder.allocateStorage,并移除原有公开分组。", - "methods": [ - "order.pendingOrder.allocateStorage" - ], - "notes": [ - "将对外入口从 order.storageAllocation.allocateStorage 迁移到 order.pendingOrder.allocateStorage,旧的 order.storageAllocation 分组已从 methods/system.json 中移除。", - "新的对外接口不接受 warehouse_id / warehouseId,仓库上下文由当前登录用户(ctx.user.store_id)提供。", - "本次变更仅同步文档位置与对外方法名,底层实现保留且通过新的 system 方法暴露。" - ], - "type": "changed" - }, - { - "version": "2026.04.19-system-02", - "date": "2026-04-19", - "summary": "新增待处理模块取消分配储位接口 order.pendingOrder.cancelAllocateStorage", - "methods": [ - "order.pendingOrder.cancelAllocateStorage" - ], - "notes": [ - "新增待处理模块取消分配储位接口 `order.pendingOrder.cancelAllocateStorage`,直接对接 `service.systems.orderStorageAllocation.cancelAllocateStorage` 实现。", - "接口现在仅接受订单ID(order_ids),不再接受 allow_storage_location;禁止传入 `warehouse_id/warehouseId`,仓库上下文由当前登录用户的 `store_id` 提供。", - "响应返回标准 { flag, code, message, data } 结构,data 包含取消分配的汇总结果(warehouse_id, requested_order_ids, cancellable_order_ids, skipped_orders, orders, picking_count, storage_unlock_summary, stock_unlock_summary)。" - ], - "type": "added" - }, - { - "version": "2026.04.21-system-01", - "date": "2026-04-21", - "summary": "新增 order.pendingOrder.updateOrderPlatform 方法:批量修改待处理订单平台信息", - "methods": [ - "order.pendingOrder.updateOrderPlatform" - ], - "notes": [ - "通过 code 查找 wms_platform,平台不存在时返回 404 错误。", - "仅操作当前仓库的当前订单表。", - "noNeedRight=true,noNeedAuth=true(isNeedAuth: true 在 spec 中对应权限配置 noNeedAuth=true)。" - ], - "type": "added" - }, - { - "version": "2026.04.21-system-02", - "date": "2026-04-21", - "summary": "新增方法 order.pendingOrder.updateOrderExpress:批量修改待处理订单的快递信息", - "methods": [ - "order.pendingOrder.updateOrderExpress" - ], - "notes": [ - "新增 order.pendingOrder.updateOrderExpress:批量修改待处理订单的快递信息,按 express_code 从仓库快递列表(带缓存)匹配快递项。", - "自定义映射(is_system_setting=true)时,sys_logistics_code/name 写入系统快递编码和名称,logistics_code/name 写入自定义编码和名称;系统快递(is_system_setting=false)时四个字段均写系统快递的 code/name。", - "只操作当前仓库的当前订单表,不处理其他订单表;操作后写入操作日志(ORDER_UPDATE_EXPRESS)。" - ], - "type": "added" - }, - { - "version": "2026.04.21-system-03", - "date": "2026-04-21", - "summary": "新增 order.expectionOrder.resolveException:将待处理异常订单转回正常待处理状态", - "methods": [ - "order.expectionOrder.resolveException" - ], - "notes": [ - "新增 order.expectionOrder.resolveException:批量将 step=3 的异常订单恢复为 step=2 正常待处理状态。", - "入参 ids 为订单ID 正整数数组,不能为空;仅操作当前仓库当前订单表。", - "返回 updated_count(实际更新行数)与 ids(本次操作ID列表)。", - "权限配置:noNeedLogin=false、noNeedRight=true、noNeedLog=false、noNeedAuth=true" - ], - "type": "added" - }, - { - "version": "2026.04.21-system-04", - "date": "2026-04-21", - "summary": "新增 order.pendingOrder.cloneOrder 方法:克隆待处理订单", - "methods": [ - "order.pendingOrder.cloneOrder" - ], - "notes": [ - "支持对 step 0/1/2/3 的待处理订单进行克隆操作。", - "若原订单已分配储位(storage_status=fin),克隆前自动清除已分配库存。", - "原订单取消后(step→9, status→cancel),以原订单业务数据创建新订单,流程状态字段全部重置为初始落库状态。", - "克隆订单明细含 stock_id,新订单 ID 重新绑定。", - "noNeedAuth=true,noNeedRight=true,noNeedLogin=false。" - ], - "type": "added" - }, - { - "version": "2026.04.21-system-06", - "date": "2026-04-21", - "summary": "新增 order.pendingOrder.createOrder:手动创建待处理/待审核订单", - "methods": [ - "order.pendingOrder.createOrder" - ], - "notes": [ - "新增 order.pendingOrder.createOrder:手动创建订单,step 由货主策略 need_order_approval 决定(1→待审核 step=0,0→待处理 step=1)。", - "必填字段:store_id、name、mobile/tel 至少一项、detail_address、items[](含 item_code 和 plan_qty)。", - "delivery_order_code 不传则自动生成(SYS+时间戳+随机4位);logistics_code/sys_platform_code 不传则读货主合约策略 default_express_code/default_platform_code。", - "不做库存锁定,储位分配为独立步骤。操作日志写入 ORDER_CREATE。", - "noNeedRight=true,noNeedAuth=true,noNeedLogin=false。" - ], - "type": "added" - }, - { - "version": "2026.04.21-system-07", - "date": "2026-04-21", - "summary": "新增 Excel 模板下载与批量导入创建订单接口:order.pendingOrder.downloadCreateTemplate 和 order.pendingOrder.importOrdersFromExcel", - "methods": [ - "order.pendingOrder.downloadCreateTemplate", - "order.pendingOrder.importOrdersFromExcel" - ], - "notes": [ - "新增 order.pendingOrder.downloadCreateTemplate:生成 Excel 导入模板,返回 base64 编码的 xlsx 文件,表头中带 * 的列为必填项(橙色背景),可选列为灰色背景,含示例数据行和填写说明工作表。", - "新增 order.pendingOrder.importOrdersFromExcel:接受 base64 编码的 xlsx 文件,按订单号分组,每组调用 createOrder 逻辑创建订单;不中断执行,逐条记录成功/失败结果返回。", - "多行相同订单号的行组成一个完整订单,每行代表一条商品明细;订单头信息(收件人、地址等)取每组第一行。", - "step 由货主策略 need_order_approval 决定(与 createOrder 一致);通过事务保证每个订单的主记录与明细原子写入。" - ], - "type": "added" - }, - { - "version": "2026.05.01-system-01", - "date": "2026-05-01", - "summary": "新增基础模块 IM 登录码接口文档:index.loginToIm", - "methods": [ - "index.loginToIm" - ], - "notes": [ - "新增 index.loginToIm 文档,入参为空对象({}),依赖当前登录用户上下文生成一次性 code。", - "响应增加 data.code 字段,长度固定 64 位(hex),默认有效期 5 分钟。", - "错误码补充:401(用户未登录)、400(用户信息不完整,缺 employees_id 或 employees_name)。", - "该接口仅做登录码签发,实际换取员工信息由 IM 侧 ssoCodeToId 完成并在成功后使 code 失效。" - ], - "type": "added" - }, - { - "version": "2026.05.01-system-03", - "date": "2026-05-01", - "summary": "扩展 index.loginToIm 返回字段:增加主体/主体类型/头像信息", - "methods": [ - "index.loginToIm" - ], - "notes": [ - "登录码签发接口响应新增 employees_id、employees_name、subject、store_type、avatar 字段。", - "subject 包含 id/name;store_type 严格取自 wms_store.project 字段,不再返回 subject_type 兼容字段。", - "同一批字段会写入 code 缓存,供 IM 侧 ssoCodeToId 换取并在成功后失效。" - ], - "type": "updated" - }, - { - "version": "2026.05.01-system-04", - "date": "2026-05-01", - "summary": "index.loginToIm 与 ssoCodeToId 改为严格字段模式,不再做兼容回退", - "methods": [ - "index.loginToIm" - ], - "notes": [ - "loginToIm 仅读取 ctx.user 标准字段:employees_id、employees_name、store_id、store_name、store_type、avatar。", - "不再兼容 id/real_name/username/company_name/avatar_url 等历史字段。", - "ssoCodeToId 返回值不再使用默认兜底,缺少关键字段时按 code 无效处理。" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-01", - "date": "2026-05-03", - "summary": "将 order.wave.fetch 调整为异步任务提交接口,删除同步返回抓取结果字段", - "methods": [ - "order.wave.fetch" - ], - "notes": [ - "接口从同步返回抓取结果改为提交任务并异步处理。", - "移除原方法中 result_list / total_request_quantity / total_fetched_quantity 等同步返回字段。" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-06", - "date": "2026-05-03", - "summary": "order.wave.batchList:新增 where 支持并限制传入字段", - "methods": [ - "order.wave.batchList" - ], - "notes": [ - "batchList 新增 where 支持及白名单过滤;禁止传入 warehouse_id/warehouseId。" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-08", - "date": "2026-05-03", - "summary": "order.pendingOrder.allocateStorage 改为异步提交", - "methods": [ - "order.pendingOrder.allocateStorage" - ], - "notes": [ - "接口变更为异步提交:调用后立即返回 request_id,后端异步执行储位分配;接口不再在响应中同步返回分配明细(如 requested_order_ids、allocated_order_ids 等)。客户端可后续通过任务 ID / 查询链路或事件获取最终分配结果。" - ], - "type": "updated" - }, - { - "version": "2026.05.03-system-10", - "date": "2026-05-03", - "summary": "新增订单批量移出波次接口", - "methods": [ - "order.wave.batchRemoveOrders" - ], - "notes": [ - "按订单ID批量移出波次;仅处理待处理订单表中非待审核订单(step in [1,2,3])。", - "操作在单事务内完成:清空订单的 wave_id/wave_no,并回写 wms_wave_batch 统计(重算 total_orders;当波次被清空时将 wave_status 置为 -1)。", - "仓库上下文来自当前登录用户(ctx.user.store_id)。" - ], - "type": "updated" - }, - { - "version": "2026.05.08-system-05", - "date": "2026-05-08", - "summary": "order.wave.batchList:新增 source 字段并支持 where.source 过滤,返回 list item 中新增 source 字段", - "methods": [ - "order.wave.batchList" - ], - "notes": [ - "新增 where.source(可选,number)用于按来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。", - "响应 list 每条记录新增字段 source(number),用于区分波次来源。", - "仅更新文档,业务代码不在此变更范围。" - ], - "type": "updated" - } - - , - { - "version": "2026.05.09-system-01", - "date": "2026-05-09", - "summary": "新增 order.wave.wavePickTaskCancelSelf;order.wave.waveStrategyList 新增预演计数字段/参数", - "methods": [ - "order.wave.wavePickTaskCancelSelf", - "order.wave.waveStrategyList" - ], - "notes": [ - "新增接口 `order.wave.wavePickTaskCancelSelf`:仅支持单个 `task_id`(number,必填),明确不支持 `task_ids` 批量参数。", - "业务约束:仅允许取消当前登录用户本人创建的拣货任务;若尝试取消非本人创建任务,接口应返回 400 错误(仅允许取消本人创建任务)。", - "返回建议:与现有取消接口风格一致,包含 `cancelled_count`(0/1)、`task_id`、`task_no`(若后端返回)或相应的取消结果汇总。", - "错误码建议:400 参数不合法(task_id 缺失或传了 task_ids);400 仅允许取消本人创建任务;500 取消失败。", - "新增参数:calculate_next_fetch_order_count(number,可选),含别名 calculateNextFetchOrderCount;取值 0=不计算(默认),1=计算并返回每条策略的 next_fetch_order_count,用于前端在策略列表中预览抓取量。", - "新增响应字段:list[*].next_fetch_order_count(number),含义:按当前策略口径预演一次自动抓取时,预计会选中的订单数量;当未开启计算时返回 0。" - ], - "type": "added" - } + { + "version": "2026.05.12-system-01", + "date": "2026-05-12", + "summary": "调整订单打印中间态返回结构为 waveGroups(波次 -> 平台 -> 订单)", + "methods": [ + "order.print.getWavePlatformPrintData" + ], + "notes": [ + "主要变更:将方法的主返回结构改为 waveGroups,按波次分组,波次内按平台分组,平台内为订单列表(波次 -> 平台 -> 订单)。", + "兼容性:保留旧字段 platform_groups 与 order_list 作为向后兼容字段,但文档主结构与推荐使用为 waveGroups。", + "返回结构说明:summary(total_waves/total_orders/total_platforms)、wave_ids(通过过滤的波次ID数组)、waveGroups(数组,项含 wave_id、wave_no、order_count、platforms[...],platforms项含 platform、platform_name、order_count、orders[...])、ext(missing_wave_ids、filtered_wave_ids)。", + "errors:保留 400 / 500 不变。" + ], + "type": "modified" + }, + { + "version": "2026.05.11-system-05", + "date": "2026-05-11", + "summary": "order.wave.batchList:支持 express/print 分配状态筛选,入参改为英文枚举(express/print)", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "修复 where.express_assignment_status 可按快递分配状态筛选。", + "新增 where.print_assignment_status 筛选(按打印分配聚合判断)。", + "express_assignment_status / print_assignment_status 要求使用英文枚举值:express=unassigned/partially_assigned/assigned,print=unprinted/partially_printed/printed;storage_assignment_status 继续兼容中文枚举(未分配/部分分配/已分配)。", + "若传入非法枚举值,接口返回 400(参数校验失败),message 中会说明允许取值。" + ], + "type": "updated" + }, + { + "version": "2026.05.11-system-04", + "date": "2026-05-11", + "summary": "调整 order.wave.waveStrategyFetchAdmin:由创建任务改为直接创建波次(不创建拣货任务)", + "methods": [ + "order.wave.waveStrategyFetchAdmin" + ], + "notes": [ + "接口行为变更:按策略直接抓取命中订单并创建波次,不再创建拣货任务(不返回 task_id/task_no 等任务字段)。", + "响应调整为建波结果:fetch_state(1=成功/2=失败)、wave_ids、wave_nos、created_wave_count、created_order_count、order_ids、(可选)wave_prefix、wave_prefix_source、tip/message。", + "错误调整:策略校验失败返回 400(并可能返回 validation_errors),缺少仓库上下文返回 400,建波失败返回 500 并在 message 中说明。" + ], + "type": "updated" + }, + { + "version": "2026.05.11-system-03", + "date": "2026-05-11", + "summary": "更新 pick.query:由查询拣货明细调整为按 keyword 获取/创建拣货任务", + "methods": [ + "pick.query" + ], + "notes": [ + "入参由 waybill_code/full_display 调整为 keyword(支持运单号或波次号)。", + "接口语义调整为任务化返回:命中活动任务则返回 existing 任务ID;无活动任务则创建并返回 created 任务ID。", + "新增任务归属冲突错误:当活动任务创建人非当前用户时返回冲突提示,并附带创建人及任务ID信息。" + ], + "type": "updated" + }, + { + "version": "2026.05.11-system-02", + "date": "2026-05-11", + "summary": "新增 pick.wavePickTaskCurrent:PDA 无参查询当前进行中拣货任务", + "methods": [ + "pick.wavePickTaskCurrent" + ], + "notes": [ + "新增 PDA 专用无参接口 pick.wavePickTaskCurrent。", + "按当前登录用户上下文(pick_user_id + warehouse_id)查询状态在 0/1/2 的最新任务。", + "命中返回 task_id,未命中返回 task_id=null。" + ], + "type": "added" + }, + { + "version": "2026.05.10-system-04", + "date": "2026-05-10", + "summary": "pick.wavePickTaskDetail 新增按任务类型区分的 picking_view 形态输出", + "methods": [ + "pick.wavePickTaskDetail" + ], + "notes": [ + "新增响应字段:picking_view(object),按 task.pick_mode 区分 5 种形态输出。", + "picking_view 字段说明:mode_code, mode_name, require_box_allocations, group_by, sort_by, items[](每项含 space_id、space_name、location_space、item_code、item_name、stock_id、total_qty、box_allocations[])。", + "当 pick_mode=1/3/4 时 require_box_allocations=true;当 pick_mode=2/5 时 require_box_allocations=false。" + ], + "type": "updated" + }, + { + "version": "2026.05.10-system-02", + "date": "2026-05-10", + "summary": "order.wave.waveStrategyFetchPda/Admin 返回新增 fetch_state 三态与简短 tip", + "methods": [ + "order.wave.waveStrategyFetchPda", + "order.wave.waveStrategyFetchAdmin" + ], + "notes": [ + "新增返回字段:fetch_state(number)、tip(string)、can_enter_pick_flow(boolean)", + "fetch_state 含义:1=创建成功(返回 task_id/task_no),2=普通失败(task_id=null),3=存在未完成任务(返回 existing task_id/task_no,前端可直接进入拣货流程)", + "当 fetch_state=3 时,字段 can_enter_pick_flow=true,表示前端可直接进入拣货流程;tip 为简短提示文本" + ], + "type": "updated" + }, + { + "version": "2026.05.10-system-03", + "date": "2026-05-10", + "summary": "裁剪 pick.wavePickTaskDetail 返回:移除 waves/orders,精简 task 并补充 boxes 拣货统计字段", + "methods": [ + "pick.wavePickTaskDetail" + ], + "notes": [ + "移除响应中的 waves 与 orders 子表,接口仅返回精简的 task、boxes、picking_details 与 picking_summary。", + "task 子字段裁剪为:task_id, task_no, status, pick_mode, start_at, finish_at, batch_no。", + "boxes 补充并明确返回:ref_label(箱参考标签)、required_qty(箱内需拣总数)、picked_qty(已拣数量)。", + "本次变更为文档层面的返回裁剪,前端应以新字段集合为准,旧字段可能不再返回。" + ], + "type": "updated" + }, + { + "version": "2026.05.10-system-01", + "date": "2026-05-10", + "summary": "order.wave.waveStrategyList 新增 strategy_type 最小过滤(散单/团购)", + "methods": [ + "order.wave.waveStrategyList" + ], + "notes": [ + "新增 strategy_type 过滤,仅 1/2", + "支持顶层 strategy_type 和 where.strategy_type,顶层优先", + "当前不引入其他 where 字段" + ], + "type": "updated" + }, + { + "version": "2026.05.09-system-02", + "date": "2026-05-09", + "summary": "新增 pick.wavePickTaskDetail:按任务ID解析拣货任务详情", + "methods": [ + "pick.wavePickTaskDetail" + ], + "notes": [ + "新增 pick.wavePickTaskDetail:传入 task_id 获取拣货任务完整信息,包含主表字段(task/pick_mode/status/wave_count/order_count/box_count 等)及三张子表数据(waves/orders/boxes)。", + "安全限制:接口会校验当前登录用户(operator_id/employees_id)与任务的 pick_user_id 是否一致;不一致时直接返回 403,不返回任何拣货信息。", + "鉴权配置:noNeedRight=true,noNeedAuth=true,isNeedLogin=true。" + ], + "type": "added" + }, + { + "version": "2026.05.08-system-05", + "date": "2026-05-08", + "summary": "order.wave.batchList:新增 source 字段并支持 where.source 过滤,返回 list item 中新增 source 字段", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "新增 where.source(可选,number)用于按来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。", + "响应 list 每条记录新增字段 source(number),用于区分波次来源。", + "仅更新文档,业务代码不在此变更范围。" + ], + "type": "updated" + }, + { + "version": "2026.05.08-system-04", + "date": "2026-05-08", + "summary": "完善 order.wave.wavePickTaskList 文档:补充入参、分页与返回字段兼容说明", + "methods": [ + "order.wave.wavePickTaskList", + "order.wave.wavePickTaskCancel" + ], + "notes": [ + "入参补充:warehouse_id(必填)、status(支持单值或数组,建议传数组)、source、keyword、page_no、page_size;保留 pagination 对象以兼容旧客户端。", + "兼容说明:接口同时支持历史 where 结构与顶层参数;当存在同名顶层参数时以顶层参数优先;pagination 支持 page/current 与 pageSize/size 别名。", + "返回格式:响应包含 total 与 list;list 每项包含字段:task_id、task_no、status、source、pick_mode、wave_count、order_count、box_count、operator_id、operator_name、start_at、finish_at、created_at。为兼容旧客户端,响应同时保留旧字段:pick_user_id、pick_user_name、start_time、finish_time、create_time。", + "入参 strategy_id 当前主表未存,接口会忽略该过滤,不建议使用。", + "默认排序:create_time desc.", + "文档变更:移除 order.wave.wavePickTaskCancel 的入参 operator_id 与 warehouse_id;入参改为仅支持 task_ids(数组,必填),不再兼容单个 task_id;操作人与仓库由请求上下文(例如当前登录用户上下文)自动获取;若上下文缺失接口将返回错误。响应补充批量结果字段:cancelled_count、task_ids、task_nos(若后端返回)。仅更新文档,未修改业务实现。" + ], + "type": "updated" + }, + { + "version": "2026.05.08-system-03", + "date": "2026-05-08", + "summary": "升级按策略抓取接口为创建任务主流程:order.wave.waveStrategyFetchPda / order.wave.waveStrategyFetchAdmin", + "methods": [ + "order.wave.waveStrategyFetchPda", + "order.wave.waveStrategyFetchAdmin" + ], + "notes": [ + "将 PDA/Admin 场景的按策略抓取接口由受理壳方法升级为 '创建任务主流程':接口会执行参数校验并在同步响应中创建任务记录(state=created),返回 task_id、task_no、plan 与 plan_summary 供前端展示与后续查询。", + "入参新增/扩展与创建流程相关字段:至少包含 cart_id(关联拣货车/作业车ID)、source(操作来源语义)并保留并透传 strategy_id 与 strategy_params(策略参数),以支持在创建阶段对策略进行局部覆盖或透传。", + "成功返回示例字段:state=created、task_id、task_no、plan(对象)和 plan_summary(字符串);失败场景会返回 validation_errors(数组,每项含 field/message)或 message 描述创建失败原因。", + "边界说明:当前为最小主流程(创建与计划预览),后续扫描/任务执行阶段(如实际抓取订单、写入 wave 等)将在后续版本中追加与完善。" + ], + "type": "updated" + }, + { + "version": "2026.05.08-system-02", + "date": "2026-05-08", + "summary": "调整按策略抓取壳方法:order.wave.waveStrategyFetch 更名为 order.wave.waveStrategyFetchPda,并新增 order.wave.waveStrategyFetchAdmin", + "methods": [ + "order.wave.waveStrategyFetch", + "order.wave.waveStrategyFetchPda", + "order.wave.waveStrategyFetchAdmin" + ], + "notes": [ + "waveStrategyFetchPda 仅用于 PDA 场景", + "waveStrategyFetchAdmin 仅用于后台管理场景", + "两者当前均为壳子受理方法,不执行真实抓取" + ], + "type": "updated" + }, + { + "version": "2026.05.08-system-01", + "date": "2026-05-08", + "summary": "新增 order.wave.waveStrategyFetch:按策略提交抓取任务(壳子方法)", + "methods": [ + "order.wave.waveStrategyFetch" + ], + "notes": [ + "当前方法为壳子方法:仅受理并返回任务受理信息,不执行真实抓取逻辑,后续补齐执行链路。" + ], + "type": "added" + }, + { + "version": "2026.05.07-system-05", + "date": "2026-05-07", + "summary": "新增 order.wave.waveStrategyCreate 与 order.wave.waveStrategyUpdate:波次策略创建与更新接口(含参数校验与版本推进)", + "methods": [ + "order.wave.waveStrategyCreate", + "order.wave.waveStrategyUpdate" + ], + "notes": [ + "仓库 ID 与创建人(creator_name)由当前登录仓库/操作者上下文获取,接口不接受外部覆盖。", + "入参 allowed_owners 与 allowed_expresses 会校验是否在系统可用范围内(基于仓库签约货主或系统快递列表),若存在非法值接口会直接报错(400)。", + "max_same_structure 受仓库配置 min_group_order_fetch_quantity 限制:若传入值 >= min_group_order_fetch_quantity,则自动下调为 min_group_order_fetch_quantity - 1(最小值为 1)。", + "新建/更新成功后会触发仓库的 wave_strategy_version 自增(+1)并失效相关仓库配置缓存,调用方可通过策略版本推进或缓存变化感知策略已生效。" + ], + "type": "added" + }, + { + "version": "2026.05.07-system-06", + "date": "2026-05-07", + "summary": "收敛 order.wave.waveStrategyFallbackOrderList 返回字段,限定 where 白名单,补充 order.wave.singleFetchByIds 别名与返回语义", + "methods": [ + "order.wave.waveStrategyFallbackOrderList", + "order.wave.singleFetchByIds" + ], + "notes": [ + "收敛 order.wave.waveStrategyFallbackOrderList response.list 字段为 id, delivery_no, tracking_no, items_count, items_total, sys_logistics_name, store_name, province, sys_platform_name, item_snapshot;item_snapshot 格式示例:商品名称*数量|...。", + "限制 order.wave.waveStrategyFallbackOrderList.where 白名单,禁止传入 warehouse_id / warehouseId;传入未列出字段或别名冲突将返回 400。", + "补充 order.wave.singleFetchByIds:明确支持 ids / order_ids / orderIds 三个别名(优先顺序 ids -> order_ids -> orderIds)并说明返回字段 fetched_order_ids、excluded_existing_wave_order_ids、skipped_order_ids、not_found_order_ids 的语义与兼容性。" + ], + "type": "updated" + }, + { + "version": "2026.05.07-system-04", + "date": "2026-05-07", + "summary": "更新 order.wave.waveStrategyFallbackOrderList,新增商品快照字段 item_snapshot", + "methods": [ + "order.wave.waveStrategyFallbackOrderList" + ], + "notes": [ + "item_snapshot 返回格式为 商品名称1*数量|商品名称2*数量" + ], + "type": "updated" + }, + { + "version": "2026.05.07-system-03", + "date": "2026-05-07", + "summary": "新增 order.wave.waveStrategyQuickScan 与进度查询接口", + "methods": [ + "order.wave.waveStrategyQuickScan", + "order.wave.waveStrategyQuickScanTaskProgress" + ], + "notes": [ + "同仓只允许一个扫描任务并使用缓存锁;扫描范围为当前表非待审核、未分配波次且订单策略版本与仓库当前版本不一致的订单;命中策略标记 wave_scan_result=1,否则=2" + ], + "type": "added" + }, + { + "version": "2026.05.07-system-02", + "date": "2026-05-07", + "summary": "新增 order.wave.waveStrategyList:查询当前仓库波次策略列表", + "methods": [ + "order.wave.waveStrategyList" + ], + "notes": [ + "从 wms_wave_strategy 拉取当前仓库的波次策略列表,分页返回" + ], + "type": "added" + }, + { + "version": "2026.05.07-system-01", + "date": "2026-05-07", + "summary": "移除 order.wave.singleOrderFetchDetailList,新增 order.wave.waveStrategyFallbackOrderList(内置固定筛选条件)", + "methods": [ + "order.wave.singleOrderFetchDetailList", + "order.wave.waveStrategyFallbackOrderList" + ], + "notes": [ + "移除 order.wave.singleOrderFetchDetailList。", + "新增 order.wave.waveStrategyFallbackOrderList。", + "新接口基于订单通用查询口径,固定内置筛选条件:step != 0、wave_id = 0、wave_scan_result = 2。" + ], + "type": "updated" + }, + { + "version": "2026.05.06-system-06", + "date": "2026-05-06", + "summary": "新增 order.wave.singleOrderFetchDetailList:订单级散单候选明细视图", + "methods": [ + "order.wave.singleOrderFetchDetailList" + ], + "notes": [ + "新增 order.wave.singleOrderFetchDetailList:提供订单级的散单候选明细列表,返回按订单聚合的明细(非分组级)。", + "返回订单级而非分组级;响应每项包含订单 id、group_count、item_detail_machine、item_detail_machine_snapshot、item_detail、item_snapshot、logistics_name、store_id、distinguish_express、create_at 与 status_summary 等关键字段。", + "仍沿用 same_order_quantity 阈值来排除团购命中分组(仅保留 group_count < same_order_quantity 的候选项)。", + "singleOrderFetchList 暂保留以兼容现有前端,前端可在切换到订单级视图后迁移到本接口。" + ], + "type": "added" + }, + { + "version": "2026.05.06-system-05", + "date": "2026-05-06", + "summary": "storage.receiving.get 返回扩展:data.details[*] 新增 box_remainder、box_weight", + "methods": [ + "storage.receiving.get" + ], + "notes": [ + "storage.receiving.get 的响应在 data.details[*] 中新增可选字段:box_remainder(箱内剩余数量/零散数量,number,默认 0)与 box_weight(实测箱重,number,默认 0)。", + "兼容性:新增字段为可选,旧客户端无需修改;建议前端在需要展示箱内余量/箱重时使用这些字段。" + ], + "type": "updated" + }, + { + "version": "2026.05.06-system-04", + "date": "2026-05-06", + "summary": "storage.receiving.getReceivingDetail 返回扩展:明细增加 box_remainder、box_weight;storage.receiving.completeReceiving 通知包含这两个字段", + "methods": [ + "storage.receiving.getReceivingDetail", + "storage.receiving.completeReceiving" + ], + "notes": [ + "为支持箱规统计与通知回传,getReceivingDetail 的明细项(receiving.details 或 data.details)在响应中新增可选字段:box_remainder(箱内剩余数量/零散数量,number)与 box_weight(实测箱重,number,单位同系统重量)。", + "completeReceiving 在完成收货后会发送通知(或回调),通知 payload/metadata 中将包含每条明细的 box_remainder 与 box_weight 字段,供下游系统/前端展示或审计使用。", + "兼容性:新增字段为可选,旧客户端在未使用这些字段时无需变更。" + ], + "type": "updated" + }, + { + "version": "2026.05.06-system-03", + "date": "2026-05-06", + "summary": "storage.receiving.detailChange:新增入参/出参字段 box_remainder、box_weight", + "methods": [ + "storage.receiving.detailChange" + ], + "notes": [ + "为支持箱规细化与回写,detailChange 新增可选入参 box_remainder(箱内余量/零散数量)和 box_weight(实测箱重,单位同系统重量),写入后会回写至明细并在响应 data 中返回对应字段。", + "兼容性:新增字段为可选,不传入则不影响现有调用;建议前端在需要回写箱余与箱重时一并传入。" + ], + "type": "updated" + }, + { + "version": "2026.05.06-system-02", + "date": "2026-05-06", + "summary": "新增 order.wave.singleFetchByIds:按订单ID抓取到一个散单波次", + "methods": [ + "order.wave.singleFetchByIds" + ], + "notes": [ + "新增 order.wave.singleFetchByIds:按入参 ids(兼容 order_ids/orderIds)去重后筛选当前仓库内待处理且不在波次中的订单,若存在可抓取订单则创建单个散单波次并把这些订单写入该波次(不区分快递);成功后批量写入订单操作日志;若无可抓取订单返回 wave_id=0。", + "接口行为严格对齐实现:过滤条件包含 step in [1,2,3]、status != 'cancel'、outbound_status != 'padding';已在波次的订单会被排除并返回 excluded_existing_wave_order_ids;响应包含 ids、wave_id、wave_no、fetched_order_ids、fetched_order_count、excluded_existing_wave_order_ids、skipped_order_ids、not_found_order_ids。" + ], + "type": "added" + }, + { + "version": "2026.05.06-system-01", + "date": "2026-05-06", + "summary": "新增 order.wave.groupFetch 与 order.wave.singleFetch;order.wave.fetch 保留兼容别名;抓取进度补充上限字段", + "methods": [ + "order.wave.groupFetch", + "order.wave.singleFetch", + "order.wave.fetch", + "order.wave.fetchTaskProgress" + ], + "notes": [ + "新增 order.wave.groupFetch:抓取团购接口(异步任务提交),参数 structure_list 与原 fetch 一致。", + "新增 order.wave.singleFetch:抓取散单接口(异步任务提交),在 structure_list 每项新增必填字段 max_fetch_quantity(最大抓取上限,订单数,正整数)。", + "order.wave.fetch 保留为兼容别名(等同 groupFetch),避免误导客户端。", + "groupFetch/singleFetch/fetch 的响应新增可选字段 fetch_mode;singleFetch 响应额外返回 max_fetch_quantity。", + "order.wave.fetchTaskProgress 的响应增加单模式相关字段:fetch_mode、max_fetch_quantity、limit_reached、stop_reason,用于描述散单抓取的上限与停止原因。" + ], + "type": "updated" + }, + { + "version": "2026.05.05-system-02", + "date": "2026-05-05", + "summary": "order.wave.batchList:新增 where.storage_assignment_status 的过滤语义说明", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "新增 where 字段 `storage_assignment_status`:类型 string,可选值:`未分配`、`部分分配`、`已分配`;默认不传:不做分配状态限制。", + "过滤语义:`已分配`:聚合后全部 fin;`部分分配`:不含 error,且既不是全 none,也不是全 fin;`未分配`:全 none 或包含 error(异常并入未分配筛选集合)。", + "说明:返回字段 `storage_assignment_status` 的展示值保持不变;包含 error 时仍可能展示“分配异常”,但 where 的过滤语义把异常算到“未分配”集合,避免把过滤语义与展示值混淆。" + ], + "type": "updated" + }, + { + "version": "2026.05.05-system-01", + "date": "2026-05-05", + "summary": "新增 order.wave.singleOrderFetchList:散单候选分组查询(排除团购命中分组)", + "methods": [ + "order.wave.singleOrderFetchList" + ], + "notes": [ + "新增 order.wave.singleOrderFetchList:返回按机器结构分组的散单候选列表,接口会排除已达团购阈值(同组订单数量 >= same_order_quantity 或仓库配置 min_group_order_fetch_quantity)的分组,仅返回同组订单数量 < 阈值 的分组(散单候选)。", + "与 order.wave.groupOrderFetchList 的关键差异:groupOrderFetchList 返回满足团购阈值(>=)的分组;singleOrderFetchList 返回未达阈值(<)的散单候选分组。", + "影响范围:订单波次抓取相关前端/调度服务。兼容性:不影响或修改现有 order.wave.groupOrderFetchList,两个接口可并行使用。" + ], + "type": "added" + }, + { + "version": "2026.05.04-system-04", + "date": "2026-05-04", + "summary": "完善商品编码唯一性校验接口文档,补充 item_id(排除自身)和 owner_id(货主ID)入参说明,新增 unique/isUnique 返回字段描述", + "methods": [ + "stock.warehouse.checkItemCodeUnique" + ], + "notes": [ + "完善商品编码唯一性校验接口文档,补充 item_id(排除自身)和 owner_id(货主ID)入参说明,新增 unique/isUnique 返回字段描述" + ], + "type": "modified" + }, + { + "version": "2026.05.04-system-03", + "date": "2026-05-04", + "summary": "新增订单打印模块:按波次IDs获取打印数据并自动过滤未完全分配波次", + "methods": [ + "order.print.getWavePrintData" + ], + "notes": [ + "按波次IDs获取订单打印数据,内部去重并规范化 wave_ids,自动过滤快递未完全分配的波次;返回通过过滤的波次订单明细,按 wave_no 排序分组,并在 ext 中返回 missing_wave_ids 与 filtered_wave_ids。" + ], + "type": "added" + }, + { + "version": "2026.05.04-system-02", + "date": "2026-05-04", + "summary": "修改 pick.query 入参:order_id -> waybill_code", + "methods": [ + "pick.query" + ], + "notes": [ + "入参从 order_id 改为 waybill_code(快递号),通过快递号查找订单后再查波次拣货信息" + ], + "type": "breaking_change" + }, + { + "version": "2026.05.04-system-01", + "date": "2026-05-04", + "summary": "新增 system method pick.query:按订单查询波次拣货信息", + "methods": [ + "pick.query" + ], + "notes": [ + "按订单查询该订单所属波次的拣货信息,支持 full/full_display/is_full 控制是否完整显示;接口按当前登录用户仓库上下文过滤,防止跨仓越界。" + ], + "type": "added" + }, + { + "version": "2026.05.03-system-09", + "date": "2026-05-03", + "summary": "新增按 request_id 查询分配状态/结果接口", + "methods": [ + "order.pendingOrder.allocateStorageProgress" + ], + "notes": [ + "新增按 request_id 查询储位分配异步任务状态/结果接口,支持 status:submitted/running/success/failed/not_found;success 返回 result(底层分配结果),failed 返回 error(错误信息);兼容 requestId 参数名。" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-07", + "date": "2026-05-03", + "summary": "新增抓取进度查询接口", + "methods": [ + "order.wave.fetch", + "order.wave.fetchTaskProgress" + ], + "notes": [ + "新增按 task_id 查询抓取任务进度的接口 order.wave.fetchTaskProgress,支持返回 status(submitted/running/success/failed/not_found)及进度相关字段:progress_percent、finished_structure_count、total_fetched_quantity、duration_ms、error、update_time 等;同时明确 order.wave.fetch 为异步任务提交接口,客户端可通过 task_id 调用 order.wave.fetchTaskProgress 查询进度和最终结果。" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-05", + "date": "2026-05-03", + "summary": "补齐仓库设置模块 setting.warehouse 的 methods 文档", + "methods": [ + "setting.warehouse.getSettings", + "setting.warehouse.getFieldMeta", + "setting.warehouse.saveSettings" + ], + "notes": [ + "补齐仓库配置 methods API 文档" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-04", + "date": "2026-05-03", + "summary": "order.wave:自动加团新增跳过规则并新增批量结束自动加团接口", + "methods": [ + "order.wave.batchAutoGrouping", + "order.wave.batchFinishAutoGrouping" + ], + "notes": [ + "开启自动加团新增“已打印/超最大波次容量”跳过规则并在响应中返回跳过明细;新增批量结束自动加团接口(将 wave_status=0 的波次批量置为 1)" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-03", + "date": "2026-05-03", + "summary": "裁剪 order_list 以轻量化返回", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "移除响应中的 order_list 字段,接口仅返回波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status)" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-02", + "date": "2026-05-03", + "summary": "新增 order.wave.batchAutoGrouping:批量改为自动加团中", + "methods": [ + "order.wave.batchAutoGrouping" + ], + "notes": [ + "新增批量改为自动加团中接口及返回字段" + ], + "type": "updated" + }, + { + "version": "2026.04.22-system-02", + "date": "2026-04-22", + "summary": "新增 order.pendingOrder.syncOrderIds:待处理订单同步透传入口", + "methods": [ + "order.pendingOrder.syncOrderIds" + ], + "notes": [ + "新增 order.pendingOrder.syncOrderIds:仅接收 order_ids 并转发到服务层,当前不做业务处理。", + "接口保留登录态校验,入参仅接受订单 ID 相关字段,响应以服务层返回值为准。", + "该方法用于预留同步链路,后续补齐业务逻辑时再扩展服务层实现。" + ], + "type": "updated" + }, + { + "version": "2026.04.22-system-01", + "date": "2026-04-22", + "summary": "补全订单工作台各模块 detail 方法文档", + "methods": [ + "order.detail", + "order.pendingOrder.detail", + "order.reviewOrder.detail", + "order.expectionOrder.detail", + "order.outboundOrder.detail", + "order.deliveryOrder.detail", + "order.deliveryExpectionOrder.detail", + "order.entrustOrder.detail", + "order.archiveOrder.detail" + ], + "notes": [ + "补全文档:detail 为订单工作台通用详情方法,入参支持 ids/id/order_id/orderId;可选 tableType/tablePosition/type/moduleName,支持 current/history/dispatch/outsourced/order/revieworder/pendingorder 等。", + "返回包含 order/detail(订单头)、orderItems/items(商品明细)、expresses(运单信息)、waybill_codes(去重运单号数组)。" + ], + "type": "updated" + }, + { + "version": "2026.04.19-system-01", + "date": "2026-04-19", + "summary": "新增方法 setting.expressInterface.listByWarehousePlatformCode:按 warehouse_id + platform_code 查询全字段列表并支持缓存", + "methods": [ + "setting.expressInterface.listByWarehousePlatformCode" + ], + "notes": [ + "新增 setting.expressInterface.listByWarehousePlatformCode:按 warehouse_id + platform_code 返回快递接口的全字段数组(不分页),每条记录包含 express 关联对象(id/code/name/platform 等)。", + "支持缓存,缓存键由 warehouse_id + platform_code 组成;缓存命中将直接返回缓存结果以提升查询性能。", + "在创建/更新/删除操作(setting.expressInterface.create/update/delete)后,会主动清理对应 warehouse_id + platform_code 的缓存以确保数据一致性。" + ], + "type": "added" + }, + { + "version": "2026.04.17-system-08", + "date": "2026-04-17", + "summary": "新增快递编码管理模块批量软删除接口 setting.express.delete", + "methods": [ + "setting.express.delete" + ], + "notes": [ + "新增批量软删除接口 setting.express.delete:接受 ids(数组、逗号字符串或单值),对属于当前仓库且未被删除的记录执行软删除(设置 deleted_at),并清理 express 列表缓存。", + "当任一目标记录的 code 被 wms_express_interface.express_code 引用时,接口会拒绝删除并返回 409,错误信息中包含被引用的编码列表。", + "响应包含 ids、deleted_ids、already_deleted_ids 与 status,已删除与未删除的 id 会明确分类。仅记录已实现行为。" + ], + "type": "added" + }, + { + "version": "2026.04.17-system-05", + "date": "2026-04-17", + "summary": "新增文档分组:平台编码管理模块(收口 index.getPlatformList 与 setting.platform.*)", + "methods": [ + "index.getPlatformList", + "setting.platform.list", + "setting.platform.create", + "setting.platform.update", + "setting.platform.delete" + ], + "notes": [ + "新增独立文档分组 '平台编码管理模块',将平台基础列表(index.getPlatformList)与平台设置管理接口(setting.platform.*)归并为单一分组以便维护;仅文档变更,不修改实现。", + "文档中仅包含已实现的方法与字段,未新增或推断不存在的参数/返回字段。" + ], + "type": "added" + }, + { + "version": "2026.04.17-system-04", + "date": "2026-04-17", + "summary": "新增独立平台设置模块 setting.platform(wms_platfrom_setting)及其 CRUD 接口:list/create/update/delete。", + "methods": [ + "setting.platform.list", + "setting.platform.create", + "setting.platform.update", + "setting.platform.delete" + ], + "notes": [ + "新增独立模块 setting.platform,映射数据表 wms_platfrom_setting;list 支持 where(id/code/name/platform_code/quickWhere)与 pagination(兼容 page/pageSize/page_size);create/update 要求 platform_code 必须存在于系统平台表(wms_platform),且禁止越权写入 warehouse_id;delete 需传入 id 并校验当前仓库范围。" + ], + "type": "added" + }, + { + "version": "2026.04.15-system-07", + "date": "2026-04-15", + "summary": "将 docs/order-workbench-list-api.md 引用统一为 window 链接格式", + "methods": [ + "order.list", + "order.reviewOrder.list", + "order.pendingOrder.list", + "order.outboundOrder.list", + "order.expectionOrder.list", + "order.entrustOrder.list", + "order.deliveryOrder.list", + "order.deliveryExpectionOrder.list" + ], + "notes": [ + "将所有 methods/system.json 中指向 docs/order-workbench-list-api.md 的说明统一替换为 docs/order-workbench-list-api.md 格式,以便 HTML 渲染识别为 window 链接。", + "仅修改 methods/system.json 的文档字段,不涉及任何业务代码或接口契约变化。" + ], + "type": "updated" + }, + { + "version": "2026.04.15-system-06", + "date": "2026-04-15", + "summary": "订单工作台列表文档补全 raw 字段字典与中文语义说明", + "methods": [ + "order.list", + "order.reviewOrder.list", + "order.pendingOrder.list", + "order.outboundOrder.list", + "order.expectionOrder.list", + "order.entrustOrder.list", + "order.deliveryOrder.list", + "order.deliveryExpectionOrder.list", + "order.archiveOrder.list" + ], + "notes": [ + "在 docs/order-workbench-list-api.md 中补充所有订单列表通用 raw 字段字典,明确每个字段的中文语义与 enum 取值。", + "补充 express_numbers / waybill_codes 两个服务层派生字段说明,便于前端直接渲染多个快递号。", + "methods/system.json 中所有订单 list 的 response.list 描述已指向该字段字典章节。" + ], + "type": "updated" + }, + { + "version": "2026.04.15-system-05", + "date": "2026-04-15", + "summary": "基础模块新增快递/平台列表查询接口并设置为不鉴权,复用缓存 service", + "methods": [ + "index.getExpressList", + "index.getPlatformList" + ], + "notes": [ + "新增 index.getExpressList,归属基础模块(module=index),对应 app/service/systems/express.js 中的 getExpressList。", + "index.getExpressList 设置为不鉴权,不需要 Authorization 头。", + "新增 index.getPlatformList,归属基础模块(module=index),对应 app/service/systems/platform.js 中的 getPlatformList。", + "index.getPlatformList 设置为不鉴权,不需要 Authorization 头。", + "快递列表与平台列表都支持缓存优先,缓存未命中时回源数据库并写入缓存。", + "平台列表支持缓存优先,缓存未命中时回源 wms_platform 并写入缓存。" + ], + "type": "added" + }, + { + "version": "2026.04.15-system-02", + "date": "2026-04-15", + "summary": "签约策略字段元信息新增 default_express_code / default_platform_code list 选项", + "methods": [ + "storeWarehouse.store.getPolicyConfigFields" + ], + "notes": [ + "getPolicyConfigFields 现在返回 default_express_code 与 default_platform_code 两个 list 字段,并从 wms_express / wms_platform 读取选项列表。", + "默认值仍保留为 default_express_code=STO、default_platform_code=TB。" + ], + "type": "updated" + }, + { + "version": "2026.04.15-system-03", + "date": "2026-04-15", + "summary": "签约策略字段移除 sku_visibility,receive_mode options 改为 value/label 结构", + "methods": [ + "storeWarehouse.store.savePolicyConfig", + "storeWarehouse.store.getPolicyConfigFields" + ], + "notes": [ + "策略字段定义不再包含 sku_visibility,历史值读取时仍会被归一化忽略。", + "receive_mode 的 options 改为 [{ value, label }] 格式,便于前端直接渲染。" + ], + "type": "updated" + }, + { + "version": "2026.04.15-system-04", + "date": "2026-04-15", + "summary": "按文件模块拆分 order 目录系统文档分组,覆盖订单工作台入口及各子模块方法", + "methods": [ + "order.list", + "order.manualOutboundOrder", + "order.badgeCount", + "order.outboundOrder.manualOutboundOrder", + "order.reviewOrder.list", + "order.reviewOrder.reviewOrder", + "order.pendingOrder.list", + "order.pendingOrder.reverseReviewOrder", + "order.pendingOrder.markPendingOutboundOrder", + "order.pendingOrder.cancelOrder", + "order.outboundOrder.list", + "order.expectionOrder.list", + "order.entrustOrder.list", + "order.deliveryOrder.list", + "order.deliveryExpectionOrder.list", + "order.archiveOrder.list" + ], + "notes": [ + "按 app/service/systemMethods/order 下的实际对外方法补全 methods/system.json 文档,只覆盖 system,不处理 qimen。", + "order 文档已按 index / reviewOrder / pendingOrder / outboundOrder / expectionOrder / entrustOrder / deliveryOrder / deliveryExpectionOrder / archiveOrder 拆成多个模块分组。", + "同步根据当前代码意图补充 params / response / errors,且不再把 index.js 已移除的兼容接口写回文档。" + ], + "type": "updated" + }, + { + "version": "2026.04.15-system-01", + "date": "2026-04-15", + "summary": "货主主体配置默认补齐 default_express_code / default_platform_code", + "methods": [ + "store.createStore", + "store.createWarehouse" + ], + "notes": [ + "当 subject_config 未传或缺少字段时,自动补齐 default_express_code=STO、default_platform_code=TB,并保留现有的 max_notice_webhook_count 默认值。", + "同步更新 methods/system.json 中 store.createStore 与 store.createWarehouse 的参数说明。" + ], + "type": "updated" + }, + { + "version": "2026.04.14-system-01", + "date": "2026-04-14", + "summary": "库存列表新增货主名称字段 stock.store_name", + "methods": [ + "storage.inventory.list" + ], + "notes": [ + "在 methods/system.json 的 storage.inventory.list response 中补充 stock.store_name:来源于签约表 store_remask,若无签约关系则为 null。", + "只同步文档,不修改业务代码。" + ], + "type": "updated" + }, + { + "version": "2026.04.13-system-01", + "date": "2026-04-13", + "summary": "补全 storage.receiving.detailChange 的入参/出参契约与错误码说明", + "methods": [ + "storage.receiving.detailChange" + ], + "notes": [ + "在 methods/system.json 中补充 storage.receiving.detailChange 的 params/response/errors,明确 id 与 receiving_id 必填。", + "说明 expiry_date 小于当前日期时返回 400 且 message 为 \"到期日期已过期,不能录入收货\"。", + "说明当传入 system_product_id 时会回填条码、重量、箱规、商品名称与 product_snapshot;未传时 barcode/product_name 也可单独更新。", + "同步补充文档:docs/storage-receiving-api.md 中新增 detailChange 段落。" + ], + "type": "updated" + }, + { + "version": "2026.04.07-system-01", + "date": "2026-04-07", + "summary": "修正 warehouse.getAreaRacks 的鉴权/权限链路文档,明确该接口需要 登录并走权限校验。", + "methods": [ + "warehouse.getAreaRacks" + ], + "notes": [ + "对齐当前 system 文档中的 isNeedAuth=true、isNeedLogin=true。", + "用于补充该接口权限链路修正文档的历史上下文,不改变 methods/system.json 的 SSOT 角色。" + ] + }, + { + "version": "2026.04.07-system-02", + "date": "2026-04-07", + "summary": "补充签约配置相关接口文档,覆盖策略字段元信息查询与面单数量人工调整。", + "methods": [ + "storeWarehouse.store.getPolicyConfigFields", + "storeWarehouse.store.adjustPrintQuantity" + ], + "notes": [ + "getPolicyConfigFields 说明为获取签约策略可配置字段元信息列表。", + "adjustPrintQuantity 说明为人工调整签约关系下的面单余额并记录变更日志,并 明确 id、change_quantity、reason 等关键入参。" + ] + }, + { + "version": "2026.04.07-system-03", + "date": "2026-04-07", + "summary": "对外命名从 qimenConfig 收口为 apiConfig,并在接口配置文档中强调 interface_type_id 校验。", + "methods": [ + "storeWarehouse.store.listApiConfig", + "storeWarehouse.store.saveApiConfig", + "storeWarehouse.store.deleteQimenConfig" + ], + "notes": [ + "文档对外统一使用 apiConfig / api_config 命名,减少 qimenConfig 历史别名歧义。", + "saveApiConfig 要求 interface_type_id 为必填且必须指向已存在的 wms_interface_type 记录。", + "listApiConfig / deleteQimenConfig 同步补充 interface_type_id 字段说明。" + ] + }, + { + "version": "2026.04.07-system-04", + "date": "2026-04-07", + "summary": "补充 /api/docs 文档体验增强说明,新增查看变更记录与查看原文 JSON 的入口说明。", + "methods": [ + "/api/docs", + "/api/docs/:docName", + "/api/docs/:docName/raw", + "/api/docs/:docName/changes" + ], + "notes": [ + "sidecar 变更数组用于承载文档历史说明,不替代 methods/system.json 作为 SSOT。", + "原文 JSON 入口继续用于直接查看当前生效文档。" + ] + }, + { + "version": "2026.04.07-system-05", + "date": "2026-04-07", + "summary": "修正 storeWarehouse.store.adjustPrintQuantity 的面单余额调整语义:由增减/累加改为覆盖设置目标余额。", + "methods": [ + "storeWarehouse.store.adjustPrintQuantity" + ], + "notes": [ + "adjustPrintQuantity 当前兼容 print_quantity、target_quantity、change_quantity、adjust_quantity 作为目标面单余额输入,不再按增减量解释。", + "变更日志中的 change_quantity 由 before/after 自动计算差值,以兼容历史审计与展示。" + ] + }, + { + "version": "2026.04.07-system-06", + "date": "2026-04-07", + "summary": "按接口类型分类限制必填字段,OPEN_API 创建时自动生成 self_app_key/self_app_secret", + "methods": [ + "storeWarehouse.store.saveApiConfig" + ], + "notes": [ + "QM_WMS 类型须填写 qimen_app_key/qimen_customer_id/qimen_warehouse_code;OPEN_API 类型三个奇门字段非必填,创建时自动生成 self_app_key(WMS+32位HEX)和 self_app_secret(64位HEX),更新时保留已有密钥。" + ], + "type": "changed" + }, + { + "version": "2026.04.07-system-07", + "date": "2026-04-07", + "summary": "新增接口类型列表查询接口,归属基础模块,无需权限", + "methods": [ + "index.listInterfaceTypes" + ], + "notes": [ + "返回所有已启用的接口类型(wms_interface_type),包含 id、interface_code、interface_name、interface_category、description 字段。设置 isNeedAuth: false, isNeedLogin: true。" + ], + "type": "added" + }, + { + "version": "2026.04.07-system-08", + "date": "2026-04-07", + "summary": "app_name 改为必传参数", + "methods": [ + "storeWarehouse.store.saveApiConfig" + ], + "notes": [ + "app_name 不再有默认值自动生成逻辑,调用方必须传入非空的 app_name,否则返 回 400 错误。" + ], + "type": "changed" + }, + { + "version": "2026.04.07-system-09", + "date": "2026-04-07", + "summary": "新增收货单快捷入库上架接口", + "methods": [ + "storage.inventory.quickPutaway" + ], + "notes": [ + "新建 storage.inventory 库存操作模块。quickPutaway 从收货单直接生成入库单 (SCRK)并写入 wms_storage 库存表,同时更新 wms_stock_warehouse 库存数量(悲观行锁),回填收货明细入库状态。要求收货单已完成且所有明细已匹配系统商品。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-01", + "date": "2026-04-08", + "summary": "新增收货单与入库单匹配入库接口", + "methods": [ + "storage.inventory.matchPutaway" + ], + "notes": [ + "接收多个收货单和入库单,按商品(stock_warehouse_id)进行数量匹配入库,完 成后根据入库单来源(QM/API)自动触发回传。入参为 receiving_ids(数组)和 entry_order_ids(数组),返回匹配汇总、各收货单入库状态、各入库单状态及回传结果。isNeedAuth=true, isNeedLogin=true, isNeedRight=false。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-02", + "date": "2026-04-08", + "summary": "saveApiConfig 新增 callback_url 可选参数", + "methods": [ + "storeWarehouse.store.saveApiConfig" + ], + "notes": [ + "新增 callback_url 参数(VARCHAR(500),可选),用于 OPEN_API 类型入库单的 回调地址配置。" + ], + "type": "changed" + }, + { + "version": "2026.04.08-system-03", + "date": "2026-04-08", + "summary": "serializeQimenConfig 新增返回 callback_url 字段,影响 list 和 listApiConfig 两个接口", + "methods": [ + "storeWarehouse.store.list", + "storeWarehouse.store.listApiConfig" + ], + "notes": [ + "serializeQimenConfig() 序列化方法新增 callback_url(string)字段。storeWarehouse.store.list 返回的每条记录 api_config 对象中包含 callback_url;storeWarehouse.store.listApiConfig 返回的 list 数组中每条配置包含 callback_url。" + ], + "type": "changed" + }, + { + "version": "2026.04.08-system-04", + "date": "2026-04-08", + "summary": "新增库存移库(库位转移)接口", + "methods": [ + "storage.inventory.transferLocation" + ], + "notes": [ + "新增 storage.inventory.transferLocation 接口,支持批量多商品多库位移库, 包含部分数量移库与全量移库。入参为 warehouse_id(仓库ID)和 transfers 数组(storage_id、target_space_id、quantity),触发 storage_transfer_completed 通知事件, 每条移库记录独立操作日志。isNeedAuth=true, isNeedLogin=true。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-05", + "date": "2026-04-08", + "summary": "简化移库接口入参,从批量 transfers 数组改为单条移库", + "methods": [ + "storage.inventory.transferLocation" + ], + "notes": [ + "移除 warehouse_id 和 transfers 数组入参,改为扁平的 storage_id + target_space_id + quantity 三个顶层参数。warehouse_id 从库存记录自动获取,接口从批量移库简化为单商品单库位移库。响应结构同步简化为单条结果对象。" + ], + "type": "modified" + }, + { + "version": "2026.04.08-system-06", + "date": "2026-04-08", + "summary": "新增商品库存明细查询接口", + "methods": [ + "stock.warehouse.getStockDetail" + ], + "notes": [ + "新增 stock.warehouse.getStockDetail 接口,按库位/批次维度查询商品库存分布。入参为 stock_id(必填,商品库存ID)和 pagination(可选,含 page/pageSize)。返回 stockItem(商品概要)、storageList(wms_storage 明细数组,含批次号、库位、数 量、锁定数量、生产日期、过期日期等,关联 location_space 库位信息)、pagination 分页信息。isNeedAuth=false, isNeedLogin=true。底层调用 stockStore.getStockDetail,自动校验商品归属当前仓库。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-07", + "date": "2026-04-08", + "summary": "新增入参 group_by_batch,支持按批次维度切换库存明细聚合方式", + "methods": [ + "stock.warehouse.getStockDetail" + ], + "notes": [ + "新增可选布尔参数 group_by_batch(默认 false)。false 时按库位合并数量,批次相关字段(batch_no, production_date, expiry_date, inbound_time, inbound_order_no, supplier_batch_no)置 null;true 时保持原逻辑返回每条明细。出参结构不变,但 storageList 中批次字段在合并模式下为 null。" + ], + "type": "modified" + }, + { + "version": "2026.04.08-system-08", + "date": "2026-04-08", + "summary": "新增按商品维度移库接口", + "methods": [ + "storage.inventory.transferByProduct" + ], + "notes": [ + "新增 storage.inventory.transferByProduct 接口,按库位+商品查找所有库存记 录合并移动。入参为 space_id(原库位ID)、stock_id(商品SKU ID,即 wms_stock_warehouse.id)、target_space_id(目标库位ID)、quantity(移库数量)。开启批次管理(is_batch_mgmt=Y)的商品会被拒绝,需使用 transferLocation 按库存记录精确移库。复用 storage_transfer_completed 通知事件,操作日志编码 STORAGE_TRANSFER_BY_PRODUCT。isNeedAuth=true, isNeedLogin=true。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-09", + "date": "2026-04-08", + "summary": "补充 storeWarehouse.store.list 完整 response 输出字段说明,移除 api_config / apiConfig", + "methods": [ + "storeWarehouse.store.list" + ], + "notes": [ + "从返回结果中移除 api_config 和 apiConfig 字段(代码中 delete serialized.api_config / delete serialized.apiConfig),文档 response 补充完整输出字段列表:id, store_id, store_name, warehouse_id, warehouse_name, counterparty_id, counterparty_name, current_subject_role, auth_status, auth_status_label, apply_reason, review_comment, apply_time, review_time, auth_start, auth_end, actual_end, print_quantity, applied_by, reviewed_by, ended_by, remask, use_status, policy_config, is_auth_valid, remaining_days 以及分页和 current_subject 信息。" + ], + "type": "updated" + }, + { + "version": "2026.04.08-system-10", + "date": "2026-04-08", + "summary": "货主列表返回新增 has_qimen_config 布尔字段", + "methods": [ + "storeWarehouse.store.list" + ], + "notes": [ + "storeWarehouse.store.list 返回的 data.list[] 中新增 has_qimen_config(boolean),表示该货主是否已配置奇门。" + ], + "type": "changed" + }, + { + "version": "2026.04.08-system-11", + "date": "2026-04-08", + "summary": "补全 stock.warehouse.search 接口文档,新增 params / response / errors 完整说明", + "methods": [ + "stock.warehouse.search" + ], + "notes": [ + "入参补充 keyword(string,模糊匹配 item_code / item_name / goods_code / barcode)和 store_id(number,按货主筛选)。响应补充 data 数组各字段(id, item_code, goods_code, item_name, sku_property, stock_unit, quantity, locked_quantity, brand_name, item_type, barcodes, store_stock)以及 total。errors 补充 code=0 搜 索失败场景。" + ], + "type": "updated" + }, + { + "version": "2026.04.08-system-12", + "date": "2026-04-08", + "summary": "新增 with_stock / is_batch 参数,支持返回关联库存明细(按库位分 组或按批次逐条)", + "methods": [ + "stock.warehouse.search" + ], + "notes": [ + "入参新增 with_stock(boolean,默认 false,是否返回关联库存数据)和 is_batch(boolean,默认 false,仅 with_stock=true 时生效,按批次明细返回)。响应 data[] 新增 storage[] 字段:is_batch=false 时按库位分组汇总(含 space_id、space、inventory_type、quantity、locked_quantity、available_quantity);is_batch=true 时逐 条返回批次明细(含 id、stock_id、space_id、batch_no、inventory_type、quantity、locked_quantity、available_quantity、production_date、expiry_date、inbound_time、inbound_order_no、supplier_batch_no、created_at、space)。" + ], + "type": "updated" + }, + { + "version": "2026.04.08-system-13", + "date": "2026-04-08", + "summary": "新增 wms_stock_transaction 表和模型", + "methods": [ + "wms_stock_transaction" + ], + "notes": [ + "新增出入库流水记录表 wms_stock_transaction,含 transaction_type(INBOUND/OUTBOUND)、warehouse_id、store_id、stock_id、storage_id、space_id、quantity、batch_no、inventory_type、order_type、order_no、order_id、receiving_id、entry_order_id、operator_id、operator_name、remark 等字段,关联 StockWarehouse 和 Storage 模型。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-14", + "date": "2026-04-08", + "summary": "quickPutaway 和 matchPutaway 入库时自动写入出入库记录", + "methods": [ + "storage.inventory.quickPutaway", + "storage.inventory.matchPutaway" + ], + "notes": [ + "入库操作完成后自动写入 wms_stock_transaction 记录。quickPutaway 写入 order_type='SCRK'(收货入库),matchPutaway 写入 order_type='MATCH'(匹配入库),均 自动填充 warehouse_id、store_id、stock_id、storage_id、space_id、quantity、batch_no、inventory_type 等字段。" + ], + "type": "updated" + }, + { + "version": "2026.04.08-system-15", + "date": "2026-04-08", + "summary": "新增 storage.inventory.list 出入库记录列表查询接口", + "methods": [ + "storage.inventory.list" + ], + "notes": [ + "出入库记录列表查询,支持 where 条件(transaction_type、stock_id、space_id、store_id、order_type、order_no、inventory_type、operator_name、created_at)、 分页(pagination)、排序(sort)和 group_by_batch 参数。默认合并模式按库位+商品 聚合返回合计数量与记录条数,group_by_batch=true 时返回每条明细含 batch_no、order_no、operator_name 等完整信息。响应均关联 stockItem(item_code、item_name、sku_property、stock_unit)。" + ], + "type": "added" + }, + { + "version": "2026.04.08-system-16", + "date": "2026-04-08", + "summary": "出入库流水记录查询接口从 storage.inventory.list 改名为 storage.transaction.list", + "methods": [ + "storage.transaction.list" + ], + "notes": [ + "将出入库流水记录查询从 storage.inventory.list 迁移到 storage.transaction.list,避免与库存列表概念混淆。功能和参数不变。isNeedAuth=false, isNeedLogin=true, isNeedRight=false。" + ], + "type": "rename", + "module": "storage" + }, + { + "version": "2026.04.08-system-17", + "date": "2026-04-08", + "summary": "新增 storage.inventory.list 库存列表查询接口", + "methods": [ + "storage.inventory.list" + ], + "notes": [ + "新增库存列表查询接口,查询 wms_storage 表。支持 where 条件(stock_id/space_id/store_id/inventory_type/batch_no/inbound_order_no/available_quantity/inbound_time/created_at)、分页、排序。支持 group_by_batch 参数:默认 false 按库位+商 品合并(SUM quantity/locked_quantity/available_quantity),true 返回每条明细含 batch_no/production_date/expiry_date 等。关联 stockItem(商品信息)和 space(库位信息)。isNeedAuth=false, isNeedLogin=true, isNeedRight=false。" + ], + "type": "add", + "module": "storage" + }, + { + "version": "2026.04.08-system-18", + "date": "2026-04-08", + "summary": "移除 storage.entry.create 创建入库单接口", + "methods": [ + "storage.entry.create" + ], + "notes": [ + "不再允许通过 API 创建入库单。入库单仅由快捷入库(quickPutaway)和匹配入库(matchPutaway)等内部流程自动创建。底层 service 实现保留但不再通过 systemMethods 对外暴露。" + ], + "type": "remove", + "module": "storage" + }, + { + "version": "2026.04.08-system-19", + "date": "2026-04-08", + "summary": "移除 storage.entry.addDetail / deleteDetail / detailChange 对外 接口", + "methods": [ + "storage.entry.addDetail", + "storage.entry.deleteDetail", + "storage.entry.detailChange" + ], + "notes": [ + "入库单明细编辑能力不再通过 systemMethods 对外暴露,入库单模块仅保留 list/get/cancel/completeEntry。" + ], + "type": "remove", + "module": "storage" + }, + { + "version": "2026.04.08-system-20", + "date": "2026-04-08", + "summary": "新增 storage.stockout 出库单模块(非订单出库单能力)", + "methods": [ + "storage.stockout.list", + "storage.stockout.toOrder", + "storage.stockout.listItems" + ], + "notes": [ + "新增 storage.stockout.list / toOrder / listItems 接口,作为非订单出库单的主出口(对应奇门 stockout.create)。storage.delivery.* 仅作为兼容转发保留;底层 部分能力仍复用 order 模块。" + ], + "type": "add", + "module": "storage" + }, + { + "version": "2026.04.08-system-21", + "date": "2026-04-08", + "summary": "将 storage.stockout.toOrder 标记为占位接口", + "methods": [ + "storage.stockout.toOrder" + ], + "notes": [ + "storage.stockout.toOrder 当前仅保留方法名用于后续扩展,暂不开放实际逻辑。调用时返回 code=405、message=占位接口,暂未开放。" + ], + "type": "change" + }, + { + "version": "2026.04.09-system-01", + "date": "2026-04-09", + "summary": "storage.entry.cancel 支持批量作废,新增 ids 入参并兼容单条 id", + "methods": [ + "storage.entry.cancel" + ], + "notes": [ + "新增入参 `ids`(number[])以支持批量作废,兼容旧入参 `id`;当同时传入 `ids` 与 `id` 时以 `ids` 为准。", + "参数校验:`ids` 必须为非空数组;非法 ID 或空数组返回 400。", + "业务约束:已完成/已作废/处于不可作废状态的单据不允许作废;批量场景下任一 单据不存在或状态不允许时整体返回 404/400,未执行部分更新。", + "响应说明:单条作废返回字段 `id`(number);批量作废返回字段 `ids`(number[])。", + "已同步更新 methods/system.json(storage.entry.cancel)为 SSOT。" + ] + }, + { + "version": "2026.04.09-system-02", + "date": "2026-04-09", + "summary": "新增基础模块车牌识别接口 index.recognizeLicensePlate", + "methods": [ + "index.recognizeLicensePlate" + ], + "notes": [ + "入参:base64(string,必填)或 imageBase64/image_base64(兼容)", + "响应:返回归一化后的识别对象,包含 licensePlate、plateNumber、color、confidence、requestId、imageSize、rawData", + "错误:400(参数或图片格式/尺寸问题),500(第三方 OCR 调用失败或云密钥未 配置)", + "文档中不包含任何敏感配置;实际腾讯云密钥保留在配置文件中,勿在文档中暴露 。" + ], + "type": "added" + }, + { + "version": "2026.04.09-system-03", + "date": "2026-04-09", + "summary": "收紧基础模块车牌识别接口响应,仅返回 licensePlate 字段", + "methods": [ + "index.recognizeLicensePlate" + ], + "notes": [ + "出参由 {licensePlate, plateNumber, color, confidence, requestId, imageSize, rawData} 调整为 {licensePlate}", + "调用方请仅依赖 licensePlate 字段以适配新版本;历史字段已裁剪且不再保证存 在。", + "文档中未包含任何云密钥或敏感配置信息。" + ], + "type": "changed" + }, + { + "version": "2026.04.10-system-01", + "date": "2026-04-10", + "summary": "订单审核字段由 audit_status 替换为整数字段 step,并添加数据库迁移", + "methods": [ + "order.getreviewOrderlist", + "order.reviewOrder.getreviewOrderlist", + "order.reviewOrder.reviewOrder", + "order.deliveryOrder.getdeliveryOrderlist", + "order.list", + "order.stats" + ], + "notes": [ + "字段变更:order 相关审核字段从字符串/枚举 audit_status 替换为整数 step。", + "step 映射:0=未审核,1=已审核,2=处理中,3=驳回/异常,4=配送中,5=已完成,9=已关闭。", + "reviewOrder 接口在更新 inspection_status 的同时会写入 step 字段。", + "必须执行迁移脚本:20260410150000-replace-audit-status-with-step-on-order-delivery-tables.js" + ], + "type": "changed" + }, + { + "version": "2026.04.13-system-02", + "date": "2026-04-13", + "summary": "stock.warehouse.search 返回新增效期管理字段并保留 is_shelf_life_mgmt", + "methods": [ + "stock.warehouse.search" + ], + "notes": [ + "响应 data[] 中新增字段:inbound_min_days、outbound_min_days、shelf_life_days、remaining_threshold_days(均为 number,单位:天)。", + "保留并说明 is_shelf_life_mgmt 布尔字段(boolean),表示是否启用效期管理(true=启用)。", + "仅更新文档(methods/system.json 与变更记录),代码行为不变。" + ], + "type": "updated" + }, + { + "version": "2026.04.13-system-02", + "date": "2026-04-13", + "summary": "新增 storage.expiry.list 库存有效期列表查询接口", + "methods": [ + "storage.expiry.list" + ], + "notes": [ + "该接口查询 wms_storage,关联 stockWarehouse 和 locationSpace,并按当前仓库与 remaining_threshold_days / expiry_date 过滤。" + ], + "type": "added" + }, + { + "version": "2026.04.13-system-03", + "date": "2026-04-13", + "summary": "新增 storage.inventory.list 库存列表返回效期字段与预警标记", + "methods": [ + "storage.inventory.list" + ], + "notes": [ + "库存列表响应增加生产日期、过期日期、效期预警是否触发字段", + "预警标记仅在商品启用保质期管理且到期日满足阈值条件时为 true" + ], + "type": "updated" + }, + { + "version": "2026.04.14-system-01", + "date": "2026-04-14", + "summary": "更新 index.searchSpace 文档", + "methods": [ + "index.searchSpace" + ], + "notes": [ + "补充 index.searchSpace 的 params/response,按 ctx.user.store_id 作为仓库上下文;keyword 为可选字符串,对 space_code 与 custom_barcode 做 %keyword% 模糊匹配;返回字段 id、space_code、custom_barcode、custom_name,最多 50 条;仅文档同步,无代码变更。" + ], + "type": "updated" + }, + { + "version": "2026.04.16-system-01", + "date": "2026-04-16", + "summary": "基础模块新增快递产品类型查询接口", + "methods": [ + "index.getExpressProductTypeList" + ], + "notes": [ + "新增 index.getExpressProductTypeList,归属基础模块(module=index),用于查询指定快递公司的产品类型列表。", + "对应服务实现:app/service/systems/express.js 中的 getExpressProductTypeList,支持传入 express_code 作为可选筛选参数(source=body)。", + "接口设置为免鉴权(isNeedAuth=false)但需登录(isNeedLogin=true),与 index.getExpressList / index.getPlatformList 一致,优先从缓存读取。" + ], + "type": "added" + }, + { + "version": "2026.04.17-system-01", + "date": "2026-04-17", + "summary": "新增快递管理模块(setting.express)及 5 个接口文档", + "methods": [ + "setting.express.list", + "setting.express.listBase", + "setting.express.create", + "setting.express.checkCodeUnique", + "setting.express.update" + ], + "notes": [ + "新增独立模块组:快递管理模块(module=setting.express),将快递映射管理相关接口独立为一组以便维护。", + "接口实现参考:app/service/systems/setting/express.js(返回结构)与 app/service/systemMethods/setting/express.js(对外方法包装)。", + "接口鉴权与上下文:isNeedAuth=false, isNeedLogin=true;需在请求中传入 Authorization 以携带登录上下文(用于获取当前仓库/货主上下文)。", + "已同步更新 methods/system.json,补充 params/response/errors,保持文档与实现一致。" + ], + "type": "added" + }, + { + "version": "2026.04.17-system-02", + "date": "2026-04-17", + "summary": "setting.express.list 分页入参统一为 pagination", + "methods": [ + "setting.express.list" + ], + "notes": [ + "将 setting.express.list 的分页入参文档从顶层 page/page_size/pageSize 迁移为 pagination 对象,主形态为 pagination;兼容 snake_case 的 page_size 与 camelCase 的 pageSize。", + "文档与当前实现一致:顶层 page/page_size/pageSize 会被归一化到 data.pagination 并转发到系统服务。" + ], + "type": "updated" + }, + { + "version": "2026.04.17-system-03", + "date": "2026-04-17", + "summary": "新增快递接口管理模块(setting.expressInterface)及 4 个接口文档", + "methods": [ + "setting.expressInterface.list", + "setting.expressInterface.create", + "setting.expressInterface.update", + "setting.expressInterface.delete" + ], + "notes": [ + "新增独立模块组:快递接口管理模块(module=setting.expressInterface),对应实现:app/service/systems/setting/expressInterface.js 与对外包装 app/service/systemMethods/setting/expressInterface.js。", + "接口为当前仓库范围(基于 ctx.user.store_id),仓库边界由系统服务强制校验;禁止通过接口指定 warehouse_id/warehouseId。操作需登录(isNeedLogin=true),无需额外鉴权(isNeedAuth=false)。", + "已在 methods/system.json 新增对应接口的 params/response/errors 文档,保持与实现一致。" + ], + "type": "added" + }, + { + "version": "2026.04.18-system-01", + "date": "2026-04-18", + "summary": "补充订单储位分配接口文档:order.storageAllocation.allocateStorage", + "methods": [ + "order.storageAllocation.allocateStorage" + ], + "notes": [ + "新增 order.storageAllocation.allocateStorage:按订单批量分配储位,支持多种入参别名(order_ids/ids/orderId 等)与仓库上下文优先级。", + "响应包含 requested_order_ids, pending_order_ids, allocated_order_ids, shortage_order_ids, skipped_orders, picking_count, stock_lock_summary, storage_lock_summary 等字段,用于前端展示分配结果与不足提示。" + ], + "type": "added" + }, + { + "version": "2026.04.18-system-02", + "date": "2026-04-18", + "summary": "新增 order.pendingOrder.allocateExpressCode:待处理订单模块的批量分配快递号入口,复用 express.createWaybillCodePipeline。", + "methods": [ + "order.pendingOrder.allocateExpressCode" + ], + "notes": [ + "该接口直接接收订单对象数组入参;订单对象应为来自待处理订单列表或详情的原始订单对象。每个订单对象必须包含 order_id 与 business_key;sys_platform_code、logistics_code 为订单对象自带字段,前端无需额外拼装或单独构造,直接原样回传订单对象即可。", + "实际的运单创建、归一化与跳过逻辑由 express.createWaybillCodePipeline 处理。", + "接口返回值与现有分配链路一致,已用统一 success 包装返回。" + ], + "type": "added" + }, + { + "version": "2026.04.18-system-03", + "date": "2026-04-18", + "summary": "将 order.storageAllocation.allocateStorage 迁移到 order.pendingOrder.allocateStorage,并移除原有公开分组。", + "methods": [ + "order.pendingOrder.allocateStorage" + ], + "notes": [ + "将对外入口从 order.storageAllocation.allocateStorage 迁移到 order.pendingOrder.allocateStorage,旧的 order.storageAllocation 分组已从 methods/system.json 中移除。", + "新的对外接口不接受 warehouse_id / warehouseId,仓库上下文由当前登录用户(ctx.user.store_id)提供。", + "本次变更仅同步文档位置与对外方法名,底层实现保留且通过新的 system 方法暴露。" + ], + "type": "changed" + }, + { + "version": "2026.04.19-system-02", + "date": "2026-04-19", + "summary": "新增待处理模块取消分配储位接口 order.pendingOrder.cancelAllocateStorage", + "methods": [ + "order.pendingOrder.cancelAllocateStorage" + ], + "notes": [ + "新增待处理模块取消分配储位接口 `order.pendingOrder.cancelAllocateStorage`,直接对接 `service.systems.orderStorageAllocation.cancelAllocateStorage` 实现。", + "接口现在仅接受订单ID(order_ids),不再接受 allow_storage_location;禁止传入 `warehouse_id/warehouseId`,仓库上下文由当前登录用户的 `store_id` 提供。", + "响应返回标准 { flag, code, message, data } 结构,data 包含取消分配的汇总结果(warehouse_id, requested_order_ids, cancellable_order_ids, skipped_orders, orders, picking_count, storage_unlock_summary, stock_unlock_summary)。" + ], + "type": "added" + }, + { + "version": "2026.04.21-system-01", + "date": "2026-04-21", + "summary": "新增 order.pendingOrder.updateOrderPlatform 方法:批量修改待处理订单平台信息", + "methods": [ + "order.pendingOrder.updateOrderPlatform" + ], + "notes": [ + "通过 code 查找 wms_platform,平台不存在时返回 404 错误。", + "仅操作当前仓库的当前订单表。", + "noNeedRight=true,noNeedAuth=true(isNeedAuth: true 在 spec 中对应权限配置 noNeedAuth=true)。" + ], + "type": "added" + }, + { + "version": "2026.04.21-system-02", + "date": "2026-04-21", + "summary": "新增方法 order.pendingOrder.updateOrderExpress:批量修改待处理订单的快递信息", + "methods": [ + "order.pendingOrder.updateOrderExpress" + ], + "notes": [ + "新增 order.pendingOrder.updateOrderExpress:批量修改待处理订单的快递信息,按 express_code 从仓库快递列表(带缓存)匹配快递项。", + "自定义映射(is_system_setting=true)时,sys_logistics_code/name 写入系统快递编码和名称,logistics_code/name 写入自定义编码和名称;系统快递(is_system_setting=false)时四个字段均写系统快递的 code/name。", + "只操作当前仓库的当前订单表,不处理其他订单表;操作后写入操作日志(ORDER_UPDATE_EXPRESS)。" + ], + "type": "added" + }, + { + "version": "2026.04.21-system-03", + "date": "2026-04-21", + "summary": "新增 order.expectionOrder.resolveException:将待处理异常订单转回正常待处理状态", + "methods": [ + "order.expectionOrder.resolveException" + ], + "notes": [ + "新增 order.expectionOrder.resolveException:批量将 step=3 的异常订单恢复为 step=2 正常待处理状态。", + "入参 ids 为订单ID 正整数数组,不能为空;仅操作当前仓库当前订单表。", + "返回 updated_count(实际更新行数)与 ids(本次操作ID列表)。", + "权限配置:noNeedLogin=false、noNeedRight=true、noNeedLog=false、noNeedAuth=true" + ], + "type": "added" + }, + { + "version": "2026.04.21-system-04", + "date": "2026-04-21", + "summary": "新增 order.pendingOrder.cloneOrder 方法:克隆待处理订单", + "methods": [ + "order.pendingOrder.cloneOrder" + ], + "notes": [ + "支持对 step 0/1/2/3 的待处理订单进行克隆操作。", + "若原订单已分配储位(storage_status=fin),克隆前自动清除已分配库存。", + "原订单取消后(step→9, status→cancel),以原订单业务数据创建新订单,流程状态字段全部重置为初始落库状态。", + "克隆订单明细含 stock_id,新订单 ID 重新绑定。", + "noNeedAuth=true,noNeedRight=true,noNeedLogin=false。" + ], + "type": "added" + }, + { + "version": "2026.04.21-system-06", + "date": "2026-04-21", + "summary": "新增 order.pendingOrder.createOrder:手动创建待处理/待审核订单", + "methods": [ + "order.pendingOrder.createOrder" + ], + "notes": [ + "新增 order.pendingOrder.createOrder:手动创建订单,step 由货主策略 need_order_approval 决定(1→待审核 step=0,0→待处理 step=1)。", + "必填字段:store_id、name、mobile/tel 至少一项、detail_address、items[](含 item_code 和 plan_qty)。", + "delivery_order_code 不传则自动生成(SYS+时间戳+随机4位);logistics_code/sys_platform_code 不传则读货主合约策略 default_express_code/default_platform_code。", + "不做库存锁定,储位分配为独立步骤。操作日志写入 ORDER_CREATE。", + "noNeedRight=true,noNeedAuth=true,noNeedLogin=false。" + ], + "type": "added" + }, + { + "version": "2026.04.21-system-07", + "date": "2026-04-21", + "summary": "新增 Excel 模板下载与批量导入创建订单接口:order.pendingOrder.downloadCreateTemplate 和 order.pendingOrder.importOrdersFromExcel", + "methods": [ + "order.pendingOrder.downloadCreateTemplate", + "order.pendingOrder.importOrdersFromExcel" + ], + "notes": [ + "新增 order.pendingOrder.downloadCreateTemplate:生成 Excel 导入模板,返回 base64 编码的 xlsx 文件,表头中带 * 的列为必填项(橙色背景),可选列为灰色背景,含示例数据行和填写说明工作表。", + "新增 order.pendingOrder.importOrdersFromExcel:接受 base64 编码的 xlsx 文件,按订单号分组,每组调用 createOrder 逻辑创建订单;不中断执行,逐条记录成功/失败结果返回。", + "多行相同订单号的行组成一个完整订单,每行代表一条商品明细;订单头信息(收件人、地址等)取每组第一行。", + "step 由货主策略 need_order_approval 决定(与 createOrder 一致);通过事务保证每个订单的主记录与明细原子写入。" + ], + "type": "added" + }, + { + "version": "2026.05.01-system-01", + "date": "2026-05-01", + "summary": "新增基础模块 IM 登录码接口文档:index.loginToIm", + "methods": [ + "index.loginToIm" + ], + "notes": [ + "新增 index.loginToIm 文档,入参为空对象({}),依赖当前登录用户上下文生成一次性 code。", + "响应增加 data.code 字段,长度固定 64 位(hex),默认有效期 5 分钟。", + "错误码补充:401(用户未登录)、400(用户信息不完整,缺 employees_id 或 employees_name)。", + "该接口仅做登录码签发,实际换取员工信息由 IM 侧 ssoCodeToId 完成并在成功后使 code 失效。" + ], + "type": "added" + }, + { + "version": "2026.05.01-system-03", + "date": "2026-05-01", + "summary": "扩展 index.loginToIm 返回字段:增加主体/主体类型/头像信息", + "methods": [ + "index.loginToIm" + ], + "notes": [ + "登录码签发接口响应新增 employees_id、employees_name、subject、store_type、avatar 字段。", + "subject 包含 id/name;store_type 严格取自 wms_store.project 字段,不再返回 subject_type 兼容字段。", + "同一批字段会写入 code 缓存,供 IM 侧 ssoCodeToId 换取并在成功后失效。" + ], + "type": "updated" + }, + { + "version": "2026.05.01-system-04", + "date": "2026-05-01", + "summary": "index.loginToIm 与 ssoCodeToId 改为严格字段模式,不再做兼容回退", + "methods": [ + "index.loginToIm" + ], + "notes": [ + "loginToIm 仅读取 ctx.user 标准字段:employees_id、employees_name、store_id、store_name、store_type、avatar。", + "不再兼容 id/real_name/username/company_name/avatar_url 等历史字段。", + "ssoCodeToId 返回值不再使用默认兜底,缺少关键字段时按 code 无效处理。" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-01", + "date": "2026-05-03", + "summary": "将 order.wave.fetch 调整为异步任务提交接口,删除同步返回抓取结果字段", + "methods": [ + "order.wave.fetch" + ], + "notes": [ + "接口从同步返回抓取结果改为提交任务并异步处理。", + "移除原方法中 result_list / total_request_quantity / total_fetched_quantity 等同步返回字段。" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-06", + "date": "2026-05-03", + "summary": "order.wave.batchList:新增 where 支持并限制传入字段", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "batchList 新增 where 支持及白名单过滤;禁止传入 warehouse_id/warehouseId。" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-08", + "date": "2026-05-03", + "summary": "order.pendingOrder.allocateStorage 改为异步提交", + "methods": [ + "order.pendingOrder.allocateStorage" + ], + "notes": [ + "接口变更为异步提交:调用后立即返回 request_id,后端异步执行储位分配;接口不再在响应中同步返回分配明细(如 requested_order_ids、allocated_order_ids 等)。客户端可后续通过任务 ID / 查询链路或事件获取最终分配结果。" + ], + "type": "updated" + }, + { + "version": "2026.05.03-system-10", + "date": "2026-05-03", + "summary": "新增订单批量移出波次接口", + "methods": [ + "order.wave.batchRemoveOrders" + ], + "notes": [ + "按订单ID批量移出波次;仅处理待处理订单表中非待审核订单(step in [1,2,3])。", + "操作在单事务内完成:清空订单的 wave_id/wave_no,并回写 wms_wave_batch 统计(重算 total_orders;当波次被清空时将 wave_status 置为 -1)。", + "仓库上下文来自当前登录用户(ctx.user.store_id)。" + ], + "type": "updated" + }, + { + "version": "2026.05.08-system-05", + "date": "2026-05-08", + "summary": "order.wave.batchList:新增 source 字段并支持 where.source 过滤,返回 list item 中新增 source 字段", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "新增 where.source(可选,number)用于按来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。", + "响应 list 每条记录新增字段 source(number),用于区分波次来源。", + "仅更新文档,业务代码不在此变更范围。" + ], + "type": "updated" + }, + { + "version": "2026.05.09-system-01", + "date": "2026-05-09", + "summary": "新增 order.wave.wavePickTaskCancelSelf;order.wave.waveStrategyList 新增预演计数字段/参数", + "methods": [ + "order.wave.wavePickTaskCancelSelf", + "order.wave.waveStrategyList" + ], + "notes": [ + "新增接口 `order.wave.wavePickTaskCancelSelf`:仅支持单个 `task_id`(number,必填),明确不支持 `task_ids` 批量参数。", + "业务约束:仅允许取消当前登录用户本人创建的拣货任务;若尝试取消非本人创建任务,接口应返回 400 错误(仅允许取消本人创建任务)。", + "返回建议:与现有取消接口风格一致,包含 `cancelled_count`(0/1)、`task_id`、`task_no`(若后端返回)或相应的取消结果汇总。", + "错误码建议:400 参数不合法(task_id 缺失或传了 task_ids);400 仅允许取消本人创建任务;500 取消失败。", + "新增参数:calculate_next_fetch_order_count(number,可选),含别名 calculateNextFetchOrderCount;取值 0=不计算(默认),1=计算并返回每条策略的 next_fetch_order_count,用于前端在策略列表中预览抓取量。", + "新增响应字段:list[*].next_fetch_order_count(number),含义:按当前策略口径预演一次自动抓取时,预计会选中的订单数量;当未开启计算时返回 0。" + ], + "type": "added" + }, + { + "version": "2026.05.11-system-01", + "date": "2026-05-11", + "summary": "新增字段 wave_prefix(策略层波次前缀),并补充 PDA 抓取波次号生成行为说明", + "methods": [ + "order.wave.waveStrategyList", + "order.wave.waveStrategyCreate", + "order.wave.waveStrategyUpdate", + "order.wave.waveStrategyFetchPda" + ], + "notes": [ + "在 wave strategy 对象中新增可选字段 wave_prefix:策略波次前缀,优先于仓库前缀。", + "校验规则:长度 1-5,仅允许 A-Z0-9;保存时会转为大写;为空时回退仓库前缀:团购使用 group_wave_prefix,散单使用 delete_order_wave_prefix。", + "在 order.wave.waveStrategyList 的返回 list[*] 中新增字段 wave_prefix(string)。", + "在 order.wave.waveStrategyCreate / waveStrategyUpdate 的入参中新增可选字段 wave_prefix(string),创建/更新成功后保存为大写且触发策略版本推进。", + "在 order.wave.waveStrategyFetchPda 的行为说明中补充:生成波次号(wave_no)时优先使用策略层 wave_prefix,否则按策略类型回退到仓库前缀;前缀校验同上。" + ], + "type": "updated" + } ] diff --git a/methods/system.json b/methods/system.json index d4d8b79..a8d531a 100644 --- a/methods/system.json +++ b/methods/system.json @@ -6823,6 +6823,277 @@ "description": "查询失败" } ] + }, + { + "method": "order.print.getWavePlatformPrintData", + "description": "按波次 IDs 获取平台打印中间态数据,自动过滤快递未完全分配的波次,返回 waveGroups(波次 -> 平台 -> 订单)结构", + "isNeedAuth": false, + "isNeedLogin": true, + "headers": [ + { + "name": "Authorization", + "type": "string", + "required": true, + "description": "Bearer token" + } + ], + "params": [ + { + "name": "warehouse_id", + "type": "number", + "required": true, + "source": "body", + "description": "仓库ID(必须与当前用户上下文 store_id 一致)" + }, + { + "name": "wave_ids", + "type": "array", + "required": true, + "source": "body", + "description": "波次ID列表(支持数字或字符串,内部自动去重与归一化)" + } + ], + "response": [ + { + "name": "summary", + "type": "object", + "description": "汇总信息", + "children": [ + { + "name": "total_waves", + "type": "number", + "description": "通过过滤的波次总数" + }, + { + "name": "total_orders", + "type": "number", + "description": "所有平台下订单总数" + }, + { + "name": "total_platforms", + "type": "number", + "description": "所有波次内平台分组总数(累加)" + } + ] + }, + { + "name": "wave_ids", + "type": "array", + "description": "通过过滤的波次ID数组" + }, + { + "name": "waveGroups", + "type": "array", + "description": "主返回结构:按波次分组(波次 -> 平台 -> 订单)", + "children": [ + { + "name": "wave_id", + "type": "number", + "description": "波次ID" + }, + { + "name": "wave_no", + "type": "string", + "description": "波次号" + }, + { + "name": "order_count", + "type": "number", + "description": "该波次下订单总数" + }, + { + "name": "platforms", + "type": "array", + "description": "波次下的平台分组", + "children": [ + { + "name": "platform", + "type": "string", + "description": "平台编码" + }, + { + "name": "platform_name", + "type": "string", + "description": "平台名称" + }, + { + "name": "order_count", + "type": "number", + "description": "该平台订单数" + }, + { + "name": "orders", + "type": "array", + "description": "订单列表(逐单中间态)", + "children": [ + { + "name": "wave_id", + "type": "number", + "description": "波次ID" + }, + { + "name": "wave_no", + "type": "string", + "description": "波次号" + }, + { + "name": "order_id", + "type": "number", + "description": "订单ID" + }, + { + "name": "order_no", + "type": "string", + "description": "订单号(delivery_order_code 或 source_order_codes)" + }, + { + "name": "store_id", + "type": "number", + "description": "货主ID" + }, + { + "name": "warehouse_id", + "type": "number", + "description": "仓库ID" + }, + { + "name": "platform", + "type": "string", + "description": "平台编码" + }, + { + "name": "platform_name", + "type": "string", + "description": "平台名称" + }, + { + "name": "waybill_code", + "type": "string", + "description": "运单号" + }, + { + "name": "print_data", + "type": "object", + "description": "打印中间态(详见 printer_data_builder.buildPlatformRequestSkeleton 输出)" + } + ] + } + ] + } + ] + }, + { + "name": "platform_groups", + "type": "array", + "description": "兼容字段:按平台分组结果(保留以兼容旧客户端)", + "children": [ + { + "name": "platform", + "type": "string", + "description": "平台编码" + }, + { + "name": "platform_name", + "type": "string", + "description": "平台名称" + }, + { + "name": "order_count", + "type": "number", + "description": "该平台订单数" + }, + { + "name": "orders", + "type": "array", + "description": "逐单中间态(字段同 order_list 元素)" + } + ] + }, + { + "name": "order_list", + "type": "array", + "description": "兼容字段:逐单平台打印中间态明细(保留以兼容旧客户端)", + "children": [ + { + "name": "wave_id", + "type": "number", + "description": "波次ID" + }, + { + "name": "wave_no", + "type": "string", + "description": "波次号" + }, + { + "name": "order_id", + "type": "number", + "description": "订单ID" + }, + { + "name": "order_no", + "type": "string", + "description": "订单号(delivery_order_code 或 source_order_codes)" + }, + { + "name": "store_id", + "type": "number", + "description": "货主ID" + }, + { + "name": "warehouse_id", + "type": "number", + "description": "仓库ID" + }, + { + "name": "platform", + "type": "string", + "description": "平台编码" + }, + { + "name": "platform_name", + "type": "string", + "description": "平台名称" + }, + { + "name": "waybill_code", + "type": "string", + "description": "运单号" + }, + { + "name": "print_data", + "type": "object", + "description": "打印中间态(详见 printer_data_builder.buildPlatformRequestSkeleton 输出)" + } + ] + }, + { + "name": "ext", + "type": "object", + "description": "扩展字段", + "children": [ + { + "name": "missing_wave_ids", + "type": "array", + "description": "传入但不存在的 wave_id 列表" + }, + { + "name": "filtered_wave_ids", + "type": "array", + "description": "被过滤掉的波次,每项含 wave_id、reason" + } + ] + } + ], + "errors": [ + { + "code": "400", + "description": "warehouse_id 或 wave_ids 缺失或格式错误" + }, + { + "code": "500", + "description": "查询失败" + } + ] } ] }, @@ -6832,7 +7103,7 @@ "list": [ { "method": "print.send", - "description": "print.send 接口", + "description": "发送打印任务到打印电脑,并记录打印单", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -6847,55 +7118,105 @@ { "name": "computerId", "type": "string", - "required": false, + "required": true, "source": "body", - "description": "computerId 参数" + "description": "打印电脑 ID" }, { "name": "count", "type": "number", "required": false, "source": "body", - "description": "count 参数" + "description": "打印份数,可选" }, { "name": "data", "type": "object", - "required": false, + "required": true, "source": "body", - "description": "data 参数" + "description": "打印业务数据对象,字段由模板和 type 决定" }, { "name": "printer", "type": "string", - "required": false, + "required": true, "source": "body", - "description": "printer 参数" + "description": "打印机名称" }, { "name": "template", "type": "object", - "required": false, + "required": true, "source": "body", - "description": "template 参数" + "description": "打印模板对象;type=customize 时通常需要包含 page_width、page_height、template_content", + "children": [ + { + "name": "page_width", + "type": "number", + "required": true, + "description": "页面宽度(mm)" + }, + { + "name": "page_height", + "type": "number", + "required": true, + "description": "页面高度(mm)" + }, + { + "name": "template_content", + "type": "array", + "required": false, + "description": "模板内容数组" + } + ] }, { "name": "timestamp", "type": "string", "required": false, "source": "body", - "description": "timestamp 参数" + "description": "业务时间戳,可选" }, { "name": "type", "type": "string", - "required": false, + "required": true, "source": "body", - "description": "type 参数" + "description": "打印类型;当前实现支持 customize、express" } ], - "response": [], - "errors": [] + "response": [ + { + "name": "flag", + "type": "string", + "description": "全局调用结果标识,成功时为 success,失败时为 failure" + }, + { + "name": "code", + "type": "number", + "description": "业务状态码;成功时为 200,失败时通常为 1001 或 504" + }, + { + "name": "message", + "type": "string", + "description": "返回信息" + }, + { + "name": "printId", + "type": "number", + "description": "打印记录 ID;任务入库成功后返回,失败时若已生成记录也会返回" + } + ], + "errors": [ + { + "code": "1001", + "description": "不支持的打印类型" + }, + { + "code": "504", + "description": "打印任务发送失败(如打印机不存在、打印机脱机、打印服务通讯失败)" + } + ] }, { "method": "print.getPrintResult", @@ -13335,7 +13656,7 @@ "type": "object", "required": true, "source": "body", - "description": "策略配置对象;仅支持 receive_mode、auto_allocate_bin、auto_allocate_express(是否自动分配快递)、auto_allocate_storage(是否自动分配储位)、allow_mix_batch、allow_temp_storage、storage_separation、print_recharge_price(面单充值元/单,支持 2 位小数)、max_daily_inbound、remark" + "description": "策略配置对象;仅支持 receive_mode、auto_allocate_bin、auto_allocate_express(是否自动分配快递)、auto_allocate_storage(是否自动分配储位)、allow_mix_batch、allow_temp_storage、storage_separation、print_recharge_price(面单充值元/单,支持 2 位小数)、max_daily_inbound、remark、waybill_custom_display_type(面单自定义显示类型:1=隐藏,2=商品名称和数量,3=拣货库位和条码和数量,4=拣货库位和条码后5位和数量,5=拣货库位商品名称条码和数量)" } ], "response": [], @@ -14497,7 +14818,7 @@ "type": "object", "required": false, "source": "body", - "description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId:\n- wave_id(等值)\n- wave_no(模糊)\n- wave_type(等值)\n- wave_status(等值,接口固定叠加状态 0/1)\n- creator(模糊)\n- logistics_name(模糊)\n- item_part_type(等值)\n- item_part(模糊)\n- item_snapshot_key(模糊)\n- item_detail_machine(模糊)\n- distinguish_express(等值)\n- total_orders_min / total_orders_max(范围)\n- processed_orders_min / processed_orders_max(范围)\n- storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。\n- source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。" + "description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId:\n- wave_id(等值)\n- wave_no(模糊)\n- wave_type(等值)\n- wave_status(等值,接口固定叠加状态 0/1)\n- creator(模糊)\n- logistics_name(模糊)\n- item_part_type(等值)\n- item_part(模糊)\n- item_snapshot_key(模糊)\n- item_detail_machine(模糊)\n- distinguish_express(等值)\n- total_orders_min / total_orders_max(范围)\n- processed_orders_min / processed_orders_max(范围)\n- express_assignment_status(等值,string,可选,英文枚举,取值:unassigned、partially_assigned、assigned;语义:按快递分配聚合判断,assigned 表示聚合后全部 fin,partially_assigned 表示部分已分配且不含 error,unassigned 表示全 none 或包含 error(异常并入未分配集合))。\n- print_assignment_status(等值,string,可选,英文枚举,取值:unprinted、partially_printed、printed;语义:按打印分配聚合判断,printed 表示聚合后全部已打印)。\n- storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。\n- source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。\n说明:express_assignment_status 与 print_assignment_status 要求使用英文枚举值;storage_assignment_status 仍向后兼容中文展示值。若传入的枚举值不在允许集合内,接口会返回 400(参数校验失败),并在 message 中说明错误字段与允许取值。" } ], "response": [ diff --git a/printer_data_template/cainiao.json b/printer_data_template/cainiao.json new file mode 100644 index 0000000..3f445ae --- /dev/null +++ b/printer_data_template/cainiao.json @@ -0,0 +1,128 @@ +{ + "cmd": "print", + "requetID": "001778509572949", + "version": "1.0", + "task": { + "taskID": "001778509572949", + "preview": {}, + "printer": "打印机", + "documents": [ + + + + { + "documentID": "773420508667648", + "contents": [{ + "templateURL": "http://cloudprint.cainiao.com/cloudprint/template/getStandardTemplate.json?template_id=288948", + + + "data": { + "_dataFrom": "waybill", + "_page_config": { + "REQUEST_LAYERED_IMAGE": false + }, + "adsInfo": { + "adId": "5376", + "advertisementType": "DEFAULT", + "bannerUrl": "https://ad-cdn.cainiao.com/img/3093/1747622191034_250.png", + "miniBannerUrl": "https://ad-cdn.cainiao.com/img/3093/1747622218523_927.png", + "useCustomArea": false + }, + "cpCode": "STO", + "extraInfo": { + "appKey": "23535631", + "displayPrivacyBackup": false, + "templateAdDisplayUp": true, + "encryptWaybillCode": "uOg1jZ401LHupUYC4i7OXw%3D%3D" + }, + "needEncrypt": false, + "needReplaceRecipientInfoToTemplate": false, + "orderChannelLogo": "https://cdn-cloudprint.cainiao.com/waybill-print/templateImages/tao.png", + "orderChannelsType": "TB", + "packageInfo": { + "goodsDescription": "商品", + "height": 1, + "id": "1", + "items": [{ + "count": 1, + "name": "商品名称" + }], + "length": 1, + "volume": 0, + "weight": 0, + "width": 1 + }, + "parent": false, + "realCpCode": "STO", + "recipient": { + "address": { + "city": "广州市", + "detail": "AES:fh/VUbbPVBtXXRLMkz/aRhq7lK7IeXsLFk4yA/E5VYjD3QjzPoO/yVzEEsyBi62kmoRUz3Z0IVirOeWr0bnKYg==", + "district": "番禺区", + "province": "广东省" + }, + "mobile": "AES:Y1keIwFeVCi7cxaZMN2kpA==", + "name": "AES:g3tXHYOSthtqY6oZ4oOqHQ==", + "secretConsigneeMobile": "18466138293-4726", + "tid": "3301304088914008581" + }, + "routingExtraInfo": {}, + "routingInfo": { + "consolidation": { + "name": "广州中转包" + }, + "origin": { + "code": "510902", + "name": "广东广州白云区太和公司" + }, + "receiveBranch": { + "code": "510075", + "name": "广东广州番禺区南村公司" + }, + "routeCode": "XX9 013", + "sortation": { + "name": "600" + }, + "startCenter": {}, + "terminalCenter": {} + }, + "secretWaybillChannel": "14", + "secretWaybillType": "recipientSecret", + "sender": { + "address": { + "city": "", + "detail": "广东省广州市白云区钟落潭良沙*****", + "district": "", + "province": "" + }, + "mobile": "13800000000", + "name": "吴**" + }, + "shippingOption": { + "code": "STANDARD_EXPRESS", + "title": "标准快递" + }, + "waybillCode": "773420508667648" + } + + + + + }, + { + + "templateURL": "http://cloudprint.cainiao.com/cloudprint/customArea/queryCustomAreaList4Top.json?custom_area_id=6474956", + "data": { + "CustomControl": "#0 D1341089-1-1 商品总数 【1】\rE1区01-19-01 988948487 【1】\r\r验视员:太和" + } + + + } + ] + } + + + + ] + } +} \ No newline at end of file diff --git a/printer_data_template/douyin.json b/printer_data_template/douyin.json new file mode 100644 index 0000000..be5d3f9 --- /dev/null +++ b/printer_data_template/douyin.json @@ -0,0 +1,61 @@ +{ + + "cmd": "print", + "requestID": "001778509854409", + "version": "1.0", + "task": { + + "taskID": "001778509854409", + "printer": "打印机", + "config": "", + + "documents": [ + + + + { + "documentID": "SF0229025049942", + "contents": [{ + + "params": "access_token=0x4ptt78ru1fyegwf91u4990001uly2a-11&app_key=6838485800921908749&method=logistics.getShopKey¶m_json={}&sign=7e8d496a0f87da2ab64e3041d96dce08×tamp=2026-05-11 22:30:54&v=2", + "signature": "WIPppuFoTwjO8agTtWcbzc1OYQU1O8ZNF6H+bpqViScGuI0KVacb/393+KHMhNT6JUtYNu0pAUaVoBlZH/fplzqqB9b9Pxu++d6B29E1gmR7ScwsS7j1KniCjq4BeeWgsi9CaIAh5zSaHH6fzMoRKpS6d93G/3lyEYEEdF4+xuWkd5OYgsWjIftknWYzVyZQyoUbRjRrYbCdJiUhLospdonF/zisGhvOSXnnxk/XFSKyaVLE6FSDfuq/EUFZQdAsEcZxs3F1nWQX9lEc4IprEIj7MdvacMSfExMTSudcbpnBcYEd/rdQoGq86Gt6AcBlIBE2ENtlfz55J/a3w9xpEw==", + "encryptedData": "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", + "templateURL": "https://lf3-cm.ecombdstatic.com/obj/logistics-davinci/template/v2/shunfeng_76_130.xml", + "addData": { + "senderInfo": { + "address": { + "cityName": "", + "countryCode": "CHN", + "detailAddress": "广州市白云区嘉禾街道永嘉路10号", + "districtName": "", + "provinceName": "" + }, + + "contact": { + "mobile": "1912437****", + "name": "夏天" + } + + + } + }, + "config": { + + "printlogo": false + } + }, + { + "data": { + "productInfo": "#0 B1340646-1-1 商品总数 【2】\nE1区06-11-01 6949517008816;6949517008342;6949517008229 【1】 0\nE1区06-08-01 69000007 【1】 0\n\n验视员:" + }, + "templateURL": "http://www.ye4s.com/mb/douyin1.xml" + } + ] + } + + + + ] + + } +} \ No newline at end of file diff --git a/printer_data_template/jd.json b/printer_data_template/jd.json new file mode 100644 index 0000000..017f62b --- /dev/null +++ b/printer_data_template/jd.json @@ -0,0 +1,48 @@ +{ + + "orderType": "PRINT", + "version": "2", + + "key": "001778509941716", + "parameters": { + + "printName": "打印机", + + + "contents": [ + + + + + + { + "tempUrl": "https://template-content.jd.com/template-oss?tempCode=jdky76x130", + + "printData": "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", + "customTempUrl": "https://storage.360buyimg.com/jdl-template/customs-1de75d30-f0ba-4260-9236-fa12fd4c2fa1.1631601180779.txt", + "customData": + + { + "GoodsInfo": "#0 B1340984-1-1 商品总数 【1】\nE2区10-03-02 6971238692630 【1】 0\n" + }, + + "addData": { + "sender": { + "name": "吴先生", + "mobile": "180****7208", + "address": "广东省广州市白云区钟落潭良沙二路32号天豹云仓供应链管理有限公司" + } + } + + } + + + + + + + + ] + + } +} \ No newline at end of file diff --git a/printer_data_template/kuaishou.json b/printer_data_template/kuaishou.json new file mode 100644 index 0000000..2e3519a --- /dev/null +++ b/printer_data_template/kuaishou.json @@ -0,0 +1,64 @@ +{ + + "cmd": "print", + "requestID": "001778509772549", + "version": "1.0", + "task": { + + "taskID": "001778509772549", + "printer": "打印机", + "preview": {}, + + "documents": [ + + + + { + "documentID": "776442886175852", + "waybillCode": "776442886175852", + "ksOrderFlag": false, + "contents": [{ + + + "addData": { + "senderInfo": { + "address": { + "cityName": "", + "countryCode": "CHN", + "detailAddress": "良****路888号", + "districtName": "", + "provinceName": "" + }, + + "contact": { + "mobile": "151****7068", + "name": "吴**" + } + + + } + }, + + + "encryptedData": "7D5F32EE40A6C4732D5AD98E4DD20BC6BE6D369BE4180B00B9C987A0E936058B393353B5F8C0CC8CD43AFFA54A9C7A0E8A717A79DF9952A90F21DBA36BE7D548F67B2255C7CA8617C4BF7604547F77A1A6180B19958A9559536AD619E3CF1E19680B031CD7CD382DD9944951C21D42B2FF60D839E8EE95217DE1B71650176724207C890475F6F8638202D5EEABA72AC77385D1FE957D3A268B41D005A229CCD91FE9FD6885F78D7C674058DB59F391A8EB22713A8D3D2CFD2A8D33A0E6FAE679518EB3021C2B44090044A623D62184339C9DDCE62DD21EB4218369C225688C7002BD1B23FBF1918DF457652529868FB4A7980EDFE66E6E360A74F349BC1569E091138CCBE33B16B526A978E777A50CAB2550A6835D320A140B28376C9B58CB16C935656729D507F69019D65C7F58E13F0A2761CD8C07E1BA439B50136414F37981213F090FB5C6E43C6A417743E8ED0FF223FB83E1FBE7F14D504562C1B874B0C47806E818EC63D0C6A11B9777AF5B5D20E3752A9396E23B375D04B27271220BC573CB43D9EB94DA72AFCC1565D4C08389FE1D63FE9418D6554E05CBD1950FD1D0096B82079BBC4A96EE9B08950B8C4FB34C8E972CE0107A2A14F7B14F8553BE28CD10DD3C33FE16282995DF97D06E6C831051C917E87324F9C90496E5B17471D66665DFE237F0B82669C4B1C8B77C81279884575FCF8D3C94FF64189B0632C349BC59E17DC919FDE15A90A08703CAD4723403909735B97C1339BE611F09FDD496DC3E78FD07A35C1EB2E71366C0A35DB9026A42B3B509BE085A88610F87D24096BF88C50F7889DD27229F38FC59C13964AA1B28A7B1FE6E09A72FE51EE25ABCAE8ABE55AB4A453BB6DB4AB0B663F34D88D2BF6B836FF77A995690DC5BB1D74498EBB3CF245D7BD652BD3AFE8027959BF523B21CBE355F9268FB8FC226C1A08A609DC30DF5B81D2257423C918CD1F1081CA5C5FFB0E2A944D28E1E1134DB6E6F14728DF7A93421FC71C22C33EF8C8570561AE34B4E47FE45D885D90A7761F7EC994DD0C1FA23E0A9033F7F465DCC13184F46FABAA2570F760103FE795D3A2631FAFF9548657310173D17AA072B16AFD9E301B5C7374D2E1FBFC2CB724C45BA457D4FF54B6799EAFDEF5CD689C4F16F1C95C369D3C5491DFBD7CD022F0F1497AB5ED1CABF3EB0BEE75333AC5268BCFC7E7F3C4BC53B340C4E3810068088D1E193E31E4A9C06141FCB638D7E49D3E6600F2879DBAEF3BC61FDACAB821729DB91A7E584DC322297B0D3C7B1B0ACF91762087AA7A143065C58B736988F7F4BD89EC8DA576D28BD5205EE976EA08387852A2797240DEF31D6D0D17C124907DEECAD27EB19E03CEC5A489C853A99DC61C063DC386C4B24EF70CBE983CE555055BE5AB05D12E3B9262299144A1E1332EF33E83E51C2BFDADAE4EEB99DBB440E463EFD41AE5559B28A653595BAA6989F949D5A20B8330A971F235F7BCBC6E4E9141FBAF948D3EA8DB973CB67095820305A38B4A2722C67C03D54A98CCC7B87835AC2CB2BD0977C9D941BE05BF4401F6B4EFEA850776392AC3CA53F9F33AB79E9E495AA808EA28BCB2D5A9E03A6C6E8E3CF435D9D2DD5546A63592D91BEFB830873A5CE21218FA5298D36EC5F4655B54B1012AB36B298386BF24942757DCE625DFD482055745EA3044E981011860AED6E298D80F87958447E66D80FF9529B93E12A790668EFFD7CE0365C5320FD8B1D93764F1D21D4257F0CE58ABA326C9CEE591D5D11CE8FC829DF8FF8DB726D9C61DD0A8EF2A440107CBD469F320163E4515BCB8F8014AED3507A94C0CC77D41E40C04CD7303433D9E5164B68B4FD6AEF6466259B9C1E6DF49F1C364473628AD9AAC9D4D937F14FE76444919E0CF75FC2271782892C9F86D6EDB8D2977F56738724D639C3DA3A02E0637542EFDC9A3F4C676E832A025CF5619207BECD22EF3A5D76D19DAC6AC06C2004213FB743FEC5120C6BB43BB83D324D7C8C839E57D741D53B045C2E791919C182C1C907145C18CA4604AD3AEBF357FB2AF71081818182D8E4C46915B526CE75712B1EDC9D4F8B053B047762F2AC2F0882A8D96C1C5170E5A43D86054A71FF1B80D54218D19EECFB2B0205D28B433868BE6E95967DCB4547BA05FCEB2B7D04C4AC552589E91EECEAE565E9B32E985D02958CD1D3067A7923A3FA54CB5AA7DD702677C8450107A4332461F3B1A3F00C7997BBAB6E25C5F0A97E4546F457B169553B528BDA04CA8022B7E5B0FF2FD13ABE238D7532AF92EB9FA7B31A90ADD2C8600DED93A1840DF938D27C8E4DDD39D8A91C0BCA7367BD3006FAA5AE02B6132894CDBA83178322B35E5E2BA9144097D85E917ECE7FE0B9D281D5A644207C0529151E5920BBDBD0D06EBA3B46179635B017905AE51B465EDFA184E3140F11C890F70EBAC1F7645446B80DD2E399AE7F5F5E0E932AE04C682A891350307D84EFB4F9C23BF974948FBE96CFB0F8F5E638B6515E96CBDFE872A5CE4BA782CDFD4F", + "signature": "d90bbd05e0d91fdc85d1ef7cdaf53400", + "key": "M2Dw9oS9oNYaoF+xTZG+ZGaDigS90LrNvF9TteDqWgx93NdBboa1VyIY6tuCoUFyYIAbInDNgQOwryWJKm/L/1gB6TGq617hxZeed2/BVVQI9RMwHMdpJ0YjWCy+71OmRXStGiFAK7VOtHNzU9lFQhYh5osrzxQQLlrN8ZOzfxM=", + "templateURL": "https://s1-11586.kwimgs.com/kos/nlav11586/EBST-EBSTO11.xml", + "ver": "waybill_print_secret_version_1" + + }, + { + "customData": { + "productInfo": "#0 B1340814-1-1 化妆品 商品总数 【2】\nE2区02-04-02 6973348850399;6974864094892 【2】 0\n\n验视员:" + }, + "templateURL": "http://www.ye4s.com/mb/kuaishou.xml" + } + ] + } + + + + ] + + } +} \ No newline at end of file diff --git a/printer_data_template/pdd.json b/printer_data_template/pdd.json new file mode 100644 index 0000000..4543976 --- /dev/null +++ b/printer_data_template/pdd.json @@ -0,0 +1,64 @@ +{ + + "ERPId": "001778509366293", + "cmd": "print", + "requestID": "001778509366293", + "task": { + "documents": [ + + + + { + "contents": [{ + "addData": { + "sender": { + "address": { + "city": "", + "detail": "广东省广州市白云区钟落潭良沙二路32号天豹云仓供应链管理有限公司", + "district": "", + "province": "" + }, + "mobile": "151****7068", + "name": "吴**" + } + }, + "encryptedData": "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?v=11&pv=1", + "signature": "MQktCwU3fF9H2C3PkcGm+eAtTIO/qOHVCUTfvbkxSVrM8VuyvYbq/Xkun4qItxUJuDsbl0oa1l8p1Wb2ZtMpQHgsOCMEQfeQrFZtzubYU1xayPv8+o4GYQ+GdPXueOJQ4hCyyrnGVjJSf/qV/LKWoUGsFrXN8jC1PapMdI93XEI=", + "templateUrl": "https://file-link.pinduoduo.com/sto_one", + + "userid": "", + "ver": "11" + }, + { + "data": { + "height": 240, + "list": [{ + "fontSize": 28, + "left": 2.08, + "text": "#0 B1341067-1-1 良田 商品总数 【2】\rE2区08-05-02 皮带黑色;665835404213 【1】 0\rE2区08-04-02 皮带金色;600507 【1】 0\r", + "top": 2.08, + "width": 550 + }], + "waterdata": { + "text": "" + }, + "width": 560 + }, + "templateURL": "http://www.ye4s.com/mb/pdd.xml" + } + ], + "documentID": "777408273892067" + } + + + + ], + "notifyType": [ + "print" + ], + "preview": null, + "previewType": "image", + "printer": "打印机名称", + "taskID": "001778509366293" + } +} \ No newline at end of file diff --git a/printer_data_template/sph.json b/printer_data_template/sph.json new file mode 100644 index 0000000..219d9a2 --- /dev/null +++ b/printer_data_template/sph.json @@ -0,0 +1,41 @@ +{ + "command": "print", + "version": "2.0", + "requestID": "001778510051691", + "taskList": [ + { + "taskID": "772062370363221", + "printInfo": "JTdCJTIycHJpbnREYXRhJTIyJTNBJTdCJTIyd2F5YmlsbElkJTIyJTNBJTIyNzcyMDYyMzcwMzYzMjIxJTIyJTJDJTIycHJpbnRUaW1lJTIyJTNBJTIyMjAyNiUyRjA1JTJGMTElMjAxOCUzQTEzJTIyJTJDJTIyc2VydmljZXMlMjIlM0ElNUIlNUQlMkMlMjJyZWNlaXZlck5hbWUlMjIlM0ElMjIlRTklOTklODgqKiUyMiUyQyUyMnJlY2VpdmVyUGhvbmUlMjIlM0ElMjIqKioqKioqNDE3OCUyMiUyQyUyMnJlY2VpdmVyQWRkcmVzcyUyMiUzQSUyMiVFOCVCRSVCRCVFNSVBRSU4MSVFNyU5QyU4MSVFNiVCMiU4OCVFOSU5OCVCMyVFNSVCOCU4MiVFNiU5NiVCMCVFNiVCMCU5MSVFNSVCOCU4MiVFNSVBNCVBNyVFNiVCMCU5MSVFNSVCMSVBRiVFOSU5NSU4NyVFNCVCQSVCRiVFOCVCRiU4OCVFNSU5MCU4OCVFNSVBRSVCNiVFNSU5QiVBRCVFNCVCOCU5QyVFNSU4QyVCQShHMjMwJUU1JThDJTk3KSUyMiUyQyUyMnNlbmRlck5hbWUlMjIlM0ElMjIlRTUlOTAlQjQqJUU3JTk0JTlGJTIyJTJDJTIyc2VuZGVyUGhvbmUlMjIlM0ElMjIxNSoqKioqKjA2OCUyMiUyQyUyMnNlbmRlckFkZHJlc3MlMjIlM0ElMjIlRTUlQjklQkYlRTQlQjglOUMlRTclOUMlODElRTUlQjklQkYlRTUlQjclOUUlRTUlQjglODIlRTclOTklQkQlRTQlQkElOTElRTUlOEMlQkElRTklOTIlOUYlRTglOTAlQkQlRTYlQkQlQUQlRTklOTUlODclRTQlQjglOUMlRTUlODclQTQlRTUlOEMlOTclRTglQjclQUYxNSVFNSU4RiVCNzAwMSUyMiUyQyUyMnNpdGVDb2RlJTIyJTNBJTIyNTI2MTI2JTIyJTJDJTIyZXdheWJpbGxPcmRlcklkJTIyJTNBJTIyMzczNjMwNTA0NTM1MzQwNjcxMiUyMiUyQyUyMnByb2R1Y3RUeXBlTmFtZSUyMiUzQSUyMiUyMiUyQyUyMnNob3J0QWRkcmVzcyUyMiUzQSUyMjIwMC1TMDQlMjAzMzMlMjIlMkMlMjJiYWdBZGRyJTIyJTNBJTIyJUU2JUIyJTg4JUU5JTk4JUIzJUU0JUI4JUFEJUU4JUJEJUFDJUU1JThDJTg1JTIyJTJDJTIybWFyayUyMiUzQSUyMjIwMC1TMDQlMjAzMzMlMjIlMkMlMjJ5dW5kYVl6bSUyMiUzQSUyMiUyMiUyQyUyMnl1bmRhSW5uZXJwcm92aW5jZSUyMiUzQSUyMiUyMiUyQyUyMnl1bmRhTWR0eXBlJTIyJTNBJTIyJTIyJTJDJTIyeXVuZGFNZGpjJTIyJTNBJTIyJTIyJTJDJTIyeXptJTIyJTNBJTIyJTIyJTJDJTIyZmluYWxBZGRyZXNzJTIyJTNBJTIyJTIyJTJDJTIycHJpbnRJbmZvJTIyJTNBJTIyJTIyJTJDJTIycHJlVHdvQ29kZSUyMiUzQSUyMiUyMiUyQyUyMnByb2R1Y3RDbnQlMjIlM0EwJTJDJTIyc3RvcmVOYW1lJTIyJTNBJTIyS0lOR0pPWSUyRiVFNSU4QSVCMiVFNiU4RCVCNyVFNiU5OSVCQSVFOCU4MyVCRCVFNiU5NSVCMCVFNyVBMCU4MSVFNSVCQSU5NyUyMiUyQyUyMmN1c3RvbWVyTm90ZXMlMjIlM0ElMjIlMjIlMkMlMjJtZXJjaGFudE5vdGVzJTIyJTNBJTIyJTIyJTJDJTIyb3JkZXJJZCUyMiUzQSUyMjM3MzYzMDUwNDUzNTM0MDY3MjAlMjIlMkMlMjJwcm9kdWN0SW5mb3NXaXRoUGFyYW1BbmRTa3UlMjIlM0ElNUIlMjJzcCUyMCUyMDAlMjAwJUU0JUJCJUI2JTIyJTVEJTJDJTIycHJvZHVjdEluZm9zV2l0aFBhcmFtJTIyJTNBJTVCJTIyc3AlMjAlMjAwJUU0JUJCJUI2JTIyJTVEJTJDJTIycHJvZHVjdEluZm9zT25seSUyMiUzQSU1QiUyMnNwJTIwMCVFNCVCQiVCNiUyMiU1RCUyQyUyMnN1bVByb2R1Y3RDbnQlMjIlM0EwJTJDJTIyaXNXeFNob3AlMjIlM0F0cnVlJTJDJTIyc2hvd0dpZnRMb2dvJTIyJTNBZmFsc2UlMkMlMjJpc09yZGVyVHlwZTElMjIlM0F0cnVlJTJDJTIydmlydHVhbFRlbE51bWJlciUyMiUzQSUyMjE4NCoqKio3Mjk3JUU4JUJEJUFDNDE3OCUyMiUyQyUyMnNpdGVOYW1lJTIyJTNBJTIyJTIyJTdEJTJDJTIydGVtcGxhdGUlMjIlM0ElN0IlMjJ0ZW1wbGF0ZUlkJTIyJTNBJTIyNjYzNDE4NzUwOCUyMiUyQyUyMnRlbXBsYXRlTmFtZSUyMiUzQSUyMiVFNyU5NCVCMyVFOSU4MCU5QSUyMiUyQyUyMnRlbXBsYXRlRGVzYyUyMiUzQSUyMiVFNCVCOCU4MCVFOCU4MSU5NCVFNSU4RCU5NSVFNiVBMCU4NyVFNSU4NyU4NiVFNiVBOCVBMSVFNiU5RCVCRiUyMiUyQyUyMnRlbXBsYXRlVHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMm9wdGlvbkxpc3QlMjIlM0ElN0IlN0QlMkMlMjJvcHRpb25zJTIyJTNBJTVCJTdCJTIyb3B0aW9uSWQlMjIlM0EwJTJDJTIyZm9udFNpemUlMjIlM0EwJTJDJTIyaXNCb2xkJTIyJTNBZmFsc2UlMkMlMjJpc09wZW4lMjIlM0F0cnVlJTdEJTJDJTdCJTIyb3B0aW9uSWQlMjIlM0ExJTJDJTIyZm9udFNpemUlMjIlM0EwJTJDJTIyaXNCb2xkJTIyJTNBZmFsc2UlMkMlMjJpc09wZW4lMjIlM0F0cnVlJTdEJTJDJTdCJTIyb3B0aW9uSWQlMjIlM0EyJTJDJTIyZm9udFNpemUlMjIlM0EwJTJDJTIyaXNCb2xkJTIyJTNBZmFsc2UlMkMlMjJpc09wZW4lMjIlM0FmYWxzZSU3RCUyQyU3QiUyMm9wdGlvbklkJTIyJTNBMyUyQyUyMmZvbnRTaXplJTIyJTNBMCUyQyUyMmlzQm9sZCUyMiUzQWZhbHNlJTJDJTIyaXNPcGVuJTIyJTNBZmFsc2UlN0QlMkMlN0IlMjJvcHRpb25JZCUyMiUzQTQlMkMlMjJmb250U2l6ZSUyMiUzQTAlMkMlMjJpc0JvbGQlMjIlM0FmYWxzZSUyQyUyMmlzT3BlbiUyMiUzQWZhbHNlJTdEJTJDJTdCJTIyb3B0aW9uSWQlMjIlM0E1JTJDJTIyZm9udFNpemUlMjIlM0EwJTJDJTIyaXNCb2xkJTIyJTNBZmFsc2UlMkMlMjJpc09wZW4lMjIlM0FmYWxzZSU3RCUyQyU3QiUyMm9wdGlvbklkJTIyJTNBNiUyQyUyMmZvbnRTaXplJTIyJTNBMCUyQyUyMmlzQm9sZCUyMiUzQWZhbHNlJTJDJTIyaXNPcGVuJTIyJTNBZmFsc2UlN0QlMkMlN0IlMjJvcHRpb25JZCUyMiUzQTclMkMlMjJmb250U2l6ZSUyMiUzQTAlMkMlMjJpc0JvbGQlMjIlM0FmYWxzZSUyQyUyMmlzT3BlbiUyMiUzQWZhbHNlJTdEJTVEJTJDJTIyY29kZSUyMiUzQTAlMkMlMjJjcmVhdGVUaW1lJTIyJTNBJTIyMTcyOTM4NjM1NSUyMiUyQyUyMnVwZGF0ZVRpbWUlMjIlM0ElMjIxNzI5Mzg2MzU1JTIyJTJDJTIyaXNEZWZhdWx0JTIyJTNBdHJ1ZSUyQyUyMmRlbGl2ZXJ5SWQlMjIlM0ElMjJTVE8lMjIlMkMlMjJ0ZW1wbGF0ZVVybCUyMiUzQSUyMmh0dHBzJTNBJTJGJTJGbW1lYy1zaG9wLTEyNTgzNDQ3MDcuY29zLmFwLXNoYW5naGFpLm15cWNsb3VkLmNvbSUyRnNob3AlMkZwdWJsaWMlMkYyMDI2LTAzLTExJTJGNjRiZTg2ZmUtMmYyMi00ZjEyLWE2YzctMGYzMmVmMmFmZGJjLmh0bWwlMjIlMkMlMjJjdXN0b21Db25maWclMjIlM0ElN0IlMjJ0b3AlMjIlM0E3NTQlMkMlMjJsZWZ0JTIyJTNBMjQlMkMlMjJ3aWR0aCUyMiUzQTcxMiUyQyUyMmhlaWdodCUyMiUzQTMwMCU3RCUyQyUyMndpZHRoJTIyJTNBNzYlMkMlMjJoZWlnaHQlMjIlM0ExMzAlN0QlN0Q=", + "printNum": { + "curNum": 1, + "sumNum": 20 + }, + "splitControl": 1, + "showDeliveryLogo": 0, + "customInfo": { + "templateUrl": "https://ye4s.wms.gztbyc.com/spa.html", + "data": { + "description": "#0 B1340938-1-1 良田-轻货 商品总数 【4】
Y区04-02-02 6957815275250 【2】 0
临时库位 清洁剂纸箱2瓶装 【1】 0
临时库位 评价有礼 【1】 0
" + } + }, + "extendData": { + "sender": { + "address": { + "provinceName": "", + "cityName": "", + "countyName": "", + "detailInfo": "广东省广州市白云区钟落潭良沙二路32号天豹云仓供应链管理有限公司" + }, + "userName": "劲捷", + "telNumber": "18025435602" + } + } + } + ], + "printType": 1, + " size": { + "width": 76, + "height": 130 + }, + "printer": "打印机" +} \ No newline at end of file diff --git a/printer_data_template/xhs.json b/printer_data_template/xhs.json new file mode 100644 index 0000000..518266c --- /dev/null +++ b/printer_data_template/xhs.json @@ -0,0 +1,37 @@ +{ + "cmd": "print", + "requetID": "001778510207128", + "version": "1.0", + "task": { + "taskID": "001778510207128", + "preview": false, + "printer": "打印机", + "documents": [ + { + "documentID": "73707922786906", + "contents": [ + { + "encryptedData": "AES:I+wXXcF3iJT+MtdqV2DAWlRLVNAWfpwNPSNezEjTLcT6/JTCQwtPEKKDz8WLiEzn/swcaoZSyytVEWFuI5T80CflTpeigjCdXlqB48v6hrdT3Et0y/N2VpbqqhrpjlRtgqbtSZU3cTCU8BcdRorHUuNG9CJ2G+bszHBxAUQGHDHDeh92kZDGEIU0DxUJq0N7NJXhMFqSl3InYr8hfIBkUdbd/A/XxKZ6nyfx0chBcZ1bWDLGqCuuNutl8uCJbzEwsq0YIZkHRn1rYZJJNkW/U9rhlG4D6v5bMHkMBeFjqEOXBFfSmKdMrsQZle/kGCh8aRmn7yrLd+XiBw0L8wamfemhGZyfS+yVndfONd5w14EYvLVwnmjmadVCuKUukm9BhdTk86j1heP0+xAEbYMPoBE0nFhi36ZTMXYo+I3MLhydEe8X8OEslt9Voy5F/zduYWsUo2kQ/y1lXQam+M4dmTKJv2SiXpdok81nfN76o57Q2v+Kxl5Zk6ES+ZsKlKNsHkEJrD7bGPPU/dHqS42rw3TZmWrniIs4A/qso79uxbi4s/gYHwLRMTphL+g52e1NydecRZ0YkhgHXlHnzFJJW9GEMq5NpYyQ5J4VDtOWj44pU38h9vA1mA/t+OfYEw+P9rrYuD0K/crmg7H1nt1g9wPnQ7myfZrbTnqVz/tCTPNGAUqTRC4zJjo72HvBwj9tIfCBtwhoiFIXVkmWVD0+l89GEox2U6D7zk/sCuvJ0gnV+NPC9jQdDlZUTPWY/MuwaA7g2T/jlC9neGiqRywhMVH5B8SKM4hZYsxHYOp8eO9IQWv0WU96CLEQyuK+dy6ZxIzbjK1DW7wSppqZLM9fvoNUF6lWZOiVfASAqqd7diLiGOMxDyppQBCkcmvuIrkoosW8Iwpju47NgDkd747RbUjEB8/Ezpln2e5x8UiLr0J2bKj0Ra5OJFhgUF8a1KLUzQ1IN9358GpWZ0AUYAa87GN7/RJTxmwI5r8d3OAb/ekxqherTP+eTMnrbHOhzm80Az/Jrb9BdZ0bdCnsuwqgvGWEknYcApZBiqwuZKk/JOOQrD3tbMJU6NOzMJvd7bvNlqZKBcCKh4fjLPuNtKb56g==", + "templateURL": "https://cloudprint.xiaohongshu.com/template/standard/15/1", + "ver": "waybill_print_xiaohongshu_secret" + }, + { + "data": { + "item": [], + "order": [ + "#0 E1341360-1-1 箱包 商品总数 【2】\nE2区23-08-02 6938215881227 【1】\nE2区22-06-01 6938215884631 【1】\n " + ], + "buyerMemo": [ + "" + ], + "sellerMemo": [ + "" + ] + }, + "templateURL": "https://cloudprint.xiaohongshu.com/template/standard/7/2" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/test/app/controller/system.order.print.platformData.test.js b/test/app/controller/system.order.print.platformData.test.js new file mode 100644 index 0000000..150e3d9 --- /dev/null +++ b/test/app/controller/system.order.print.platformData.test.js @@ -0,0 +1,97 @@ +'use strict'; + +const assert = require('node:assert/strict'); +const OrderPrintService = require('../../../app/service/systemMethods/order/print'); +const { createServiceContext } = require('../../support/order_service_test_helper'); + +describe('test/app/controller/system.order.print.platformData.test.js', () => { + it('should delegate getWavePlatformPrintData to systems.orderPrint with destructured params', async () => { + const ctx = createServiceContext(100000); + let capturedPayload = null; + const expectedData = { + summary: { + total_waves: 1, + total_orders: 1, + total_platforms: 1, + }, + waveGroups: [ + { + wave_id: 9001, + wave_no: 'W9001', + order_count: 1, + platforms: [ + { + platform: 'jd', + platform_name: '京东', + order_count: 1, + orders: [ + { + order_id: 123, + print_data: { + platform: 'jd', + }, + }, + ], + }, + ], + }, + ], + wave_ids: [ 9001 ], + platform_groups: [], + order_list: [], + ext: { + missing_wave_ids: [], + filtered_wave_ids: [], + }, + }; + + ctx.service = { + systems: { + orderPrint: { + async getWavePlatformPrintData(payload) { + capturedPayload = payload; + return expectedData; + }, + }, + }, + }; + + const service = new OrderPrintService(ctx); + const result = await service.getWavePlatformPrintData({ + wave_ids: [ 9001, '9002' ], + warehouse_id: 100000, + ignored_field: 'ignored', + }); + + assert.deepEqual(capturedPayload, { + waveIds: [ 9001, '9002' ], + warehouseId: 100000, + }); + assert.equal(result.flag, 'success'); + assert.equal(result.code, 200); + assert.equal(result.message, 'ok'); + assert.deepEqual(result.data, expectedData); + }); + + it('should reject when wave_ids is empty', async () => { + const ctx = createServiceContext(100000); + ctx.service = { + systems: { + orderPrint: { + async getWavePlatformPrintData() { + return {}; + }, + }, + }, + }; + + const service = new OrderPrintService(ctx); + + await assert.rejects(async () => { + await service.getWavePlatformPrintData({ + wave_ids: [], + warehouse_id: 100000, + }); + }, /wave_ids 必填,且必须为非空数组/); + }); +}); diff --git a/test/app/lib/printer_data_builder.test.js b/test/app/lib/printer_data_builder.test.js new file mode 100644 index 0000000..6baef64 --- /dev/null +++ b/test/app/lib/printer_data_builder.test.js @@ -0,0 +1,91 @@ +'use strict'; + +const assert = require('node:assert/strict'); +const PrinterDataBuilder = require('../../../app/lib/printer_data_builder'); + +describe('test/app/lib/printer_data_builder.test.js', () => { + it('should keep documents, taskList and contents as arrays in the skeleton', () => { + const result = PrinterDataBuilder.buildPlatformRequestSkeleton({ + platform: 'sph', + order_express: { + waybill_code: 'WB-001', + }, + order_delivery: { + name: '收件人', + mobile: '13800000000', + detail_address: '测试地址', + }, + policy_config: { + sender_name: '发件人', + sender_tel: '13900000000', + province_name: '广东省', + city_name: '深圳市', + district_name: '南山区', + address: '发件地址', + }, + template_sample: { + cmd: 'print', + requestID: 'REQ-001', + version: '1.0', + documents: [ + { + documentID: 'root-doc-001', + contents: [ + { + text: 'root contents', + }, + ], + }, + ], + taskList: [ + { + taskID: 'root-task-001', + documents: [ + { + documentID: 'task-list-doc-001', + contents: [ + { + text: 'task list contents', + }, + ], + }, + ], + }, + ], + task: { + taskID: 'task-001', + documents: [ + { + documentID: 'task-doc-001', + contents: [ + { + text: 'task contents', + }, + ], + }, + ], + }, + }, + }); + + assert.equal(result.request_skeleton.cmd, 'print'); + assert.ok(Array.isArray(result.request_skeleton.documents)); + assert.ok(Array.isArray(result.request_skeleton.taskList)); + assert.ok(Array.isArray(result.request_skeleton.task.documents)); + assert.ok(Array.isArray(result.request_skeleton.documents[0].contents)); + assert.ok(Array.isArray(result.request_skeleton.taskList[0].documents)); + assert.ok(Array.isArray(result.request_skeleton.taskList[0].documents[0].contents)); + assert.ok(Array.isArray(result.request_skeleton.task.documents[0].contents)); + assert.equal(result.request_skeleton.documents[0].documentID, 'root-doc-001'); + assert.equal(result.request_skeleton.taskList[0].taskID, 'root-task-001'); + assert.equal(result.request_skeleton.task.documents[0].documentID, 'task-doc-001'); + }); + + it('should expose the line break map for platform-specific reuse', () => { + assert.deepEqual(PrinterDataBuilder.getLineBreakMap(), { + LF: '\n', + CR: '\r', + CRLF: '\r\n', + }); + }); +}); diff --git a/test/app/service/systemMethods/order/deliveryOrder.detail.defaultDispatch.test.js b/test/app/service/systemMethods/order/deliveryOrder.detail.defaultDispatch.test.js new file mode 100644 index 0000000..5b8488c --- /dev/null +++ b/test/app/service/systemMethods/order/deliveryOrder.detail.defaultDispatch.test.js @@ -0,0 +1,133 @@ +'use strict'; + +const assert = require('node:assert/strict'); +const DeliveryOrderService = require('../../../../../app/service/systemMethods/order/deliveryOrder'); +const DeliveryExpectionOrderService = require('../../../../../app/service/systemMethods/order/deliveryExpectionOrder'); + +/** + * 创建详情查询测试桩。 + * @param {Function} ServiceClass 目标 service 类。 + * @param {number} storeId 仓库ID。 + * @return {{ service: Object, calls: Object }} service 实例与调用记录。 + */ +function createHarness(ServiceClass, storeId = 100321) { + const calls = {}; + + const ctx = { + app: { + config: {}, + Sequelize: { + Op: { + in: Symbol.for('op.in'), + }, + }, + }, + logger: { + warn() {}, + }, + user: { + store_id: storeId, + }, + service: { + systems: { + operationLog: { + async queryOrderLogs(query) { + calls.queryOrderLogs = query; + return { + list: [{ id: 9001, operation_code: 'ORDER_CREATE' }], + pagination: { + page: 1, + pageSize: 200, + total: 1, + totalPages: 1, + }, + }; + }, + }, + }, + }, + }; + + const service = new ServiceClass(ctx); + + service.getOrderModelByTableType = async (tableType, warehouseId) => { + calls.orderModelTableType = tableType; + calls.orderModelWarehouseId = warehouseId; + return { + async findOne(args) { + calls.findOrderArgs = args; + return { + id: 99, + warehouse_id: storeId, + }; + }, + }; + }; + + service.getOrderItemsModelByTableType = async (tableType, warehouseId) => { + calls.orderItemsModelTableType = tableType; + calls.orderItemsModelWarehouseId = warehouseId; + return { + async findAll(args) { + calls.findOrderItemsArgs = args; + return [{ id: 1, order_id: 99 }]; + }, + }; + }; + + service.getOrderExpressesByOrderId = async orderId => { + calls.expressOrderId = orderId; + return [{ id: 11, order_id: 99, waybill_code: 'WB-001' }]; + }; + + return { + service, + calls, + }; +} + +describe('test/app/service/systemMethods/order/deliveryOrder.detail.defaultDispatch.test.js', () => { + it('deliveryOrder.detail should use dispatch table by default and keep detail/items/expresses/logs shape', async () => { + const { service, calls } = createHarness(DeliveryOrderService, 100321); + + const result = await service.detail({ + id: 99, + }); + + assert.equal(calls.orderModelTableType, 'dispatch'); + assert.equal(calls.orderItemsModelTableType, 'dispatch'); + assert.notEqual(calls.orderModelTableType, 'current'); + assert.notEqual(calls.orderItemsModelTableType, 'current'); + + assert.equal(calls.orderModelWarehouseId, 100321); + assert.equal(calls.orderItemsModelWarehouseId, 100321); + assert.equal(calls.findOrderArgs.where.id, 99); + assert.equal(calls.findOrderItemsArgs.where.order_id, 99); + assert.equal(calls.expressOrderId, 99); + + assert.ok(result && typeof result === 'object'); + assert.ok(result.detail && typeof result.detail === 'object'); + assert.ok(Array.isArray(result.items)); + assert.ok(Array.isArray(result.expresses)); + assert.ok(Array.isArray(result.logs)); + }); + + it('deliveryExpectionOrder.detail should also use dispatch table by default', async () => { + const { service, calls } = createHarness(DeliveryExpectionOrderService, 100321); + + const result = await service.detail({ + id: 99, + }); + + assert.equal(calls.orderModelTableType, 'dispatch'); + assert.equal(calls.orderItemsModelTableType, 'dispatch'); + assert.notEqual(calls.orderModelTableType, 'current'); + assert.notEqual(calls.orderItemsModelTableType, 'current'); + + assert.ok(result && typeof result === 'object'); + assert.ok(result.detail && typeof result.detail === 'object'); + assert.ok(Array.isArray(result.items)); + assert.ok(Array.isArray(result.expresses)); + assert.ok(Array.isArray(result.logs)); + }); +}); diff --git a/test/app/service/systemMethods/order/entrustArchiveOrder.detail.defaultTableType.test.js b/test/app/service/systemMethods/order/entrustArchiveOrder.detail.defaultTableType.test.js new file mode 100644 index 0000000..e4f0fc6 --- /dev/null +++ b/test/app/service/systemMethods/order/entrustArchiveOrder.detail.defaultTableType.test.js @@ -0,0 +1,163 @@ +'use strict'; + +const assert = require('node:assert/strict'); +const EntrustOrderService = require('../../../../../app/service/systemMethods/order/entrustOrder'); +const ArchiveOrderService = require('../../../../../app/service/systemMethods/order/archiveOrder'); + +/** + * 创建订单详情查询测试桩。 + * @param {Function} ServiceClass 目标 service 类。 + * @param {number} storeId 仓库ID。 + * @return {{ service: Object, calls: Object }} service 实例与调用记录。 + */ +function createHarness(ServiceClass, storeId = 100321) { + const calls = {}; + + const ctx = { + app: { + config: {}, + Sequelize: { + Op: { + in: Symbol.for('op.in'), + }, + }, + }, + logger: { + warn() {}, + }, + user: { + store_id: storeId, + }, + service: { + systems: { + operationLog: { + async queryOrderLogs(query) { + calls.queryOrderLogs = query; + return { + list: [{ id: 9001, operation_code: 'ORDER_CREATE' }], + pagination: { + page: 1, + pageSize: 200, + total: 1, + totalPages: 1, + }, + }; + }, + }, + }, + }, + }; + + const service = new ServiceClass(ctx); + + service.getOrderModelByTableType = async (tableType, warehouseId) => { + calls.orderModelTableType = tableType; + calls.orderModelWarehouseId = warehouseId; + return { + async findOne(args) { + calls.findOrderArgs = args; + return { + id: 99, + warehouse_id: storeId, + }; + }, + }; + }; + + service.getOrderItemsModelByTableType = async (tableType, warehouseId) => { + calls.orderItemsModelTableType = tableType; + calls.orderItemsModelWarehouseId = warehouseId; + return { + async findAll(args) { + calls.findOrderItemsArgs = args; + return [{ id: 1, order_id: 99 }]; + }, + }; + }; + + service.getOrderExpressesByOrderId = async orderId => { + calls.expressOrderId = orderId; + return [{ id: 11, order_id: 99, waybill_code: 'WB-001' }]; + }; + + return { + service, + calls, + }; +} + +describe('test/app/service/systemMethods/order/entrustArchiveOrder.detail.defaultTableType.test.js', () => { + it('entrustOrder.detail 未传表位参数时应默认走 outsourced,且返回结构正确', async () => { + const { service, calls } = createHarness(EntrustOrderService, 100321); + + const result = await service.detail({ + id: 99, + }); + + assert.equal(calls.orderModelTableType, 'outsourced'); + assert.equal(calls.orderItemsModelTableType, 'outsourced'); + assert.notEqual(calls.orderModelTableType, 'current'); + assert.notEqual(calls.orderItemsModelTableType, 'current'); + + assert.equal(calls.orderModelWarehouseId, 100321); + assert.equal(calls.orderItemsModelWarehouseId, 100321); + assert.equal(calls.findOrderArgs.where.id, 99); + assert.equal(calls.findOrderItemsArgs.where.order_id, 99); + assert.equal(calls.expressOrderId, 99); + + assert.ok(result && typeof result === 'object'); + assert.ok(result.detail && typeof result.detail === 'object'); + assert.ok(Array.isArray(result.items)); + assert.ok(Array.isArray(result.expresses)); + assert.ok(Array.isArray(result.logs)); + }); + + it('archiveOrder.detail 未传表位参数时应默认走 history,且返回结构正确', async () => { + const { service, calls } = createHarness(ArchiveOrderService, 100321); + + const result = await service.detail({ + id: 99, + }); + + assert.equal(calls.orderModelTableType, 'history'); + assert.equal(calls.orderItemsModelTableType, 'history'); + assert.notEqual(calls.orderModelTableType, 'current'); + assert.notEqual(calls.orderItemsModelTableType, 'current'); + + assert.equal(calls.orderModelWarehouseId, 100321); + assert.equal(calls.orderItemsModelWarehouseId, 100321); + assert.equal(calls.findOrderArgs.where.id, 99); + assert.equal(calls.findOrderItemsArgs.where.order_id, 99); + assert.equal(calls.expressOrderId, 99); + + assert.ok(result && typeof result === 'object'); + assert.ok(result.detail && typeof result.detail === 'object'); + assert.ok(Array.isArray(result.items)); + assert.ok(Array.isArray(result.expresses)); + assert.ok(Array.isArray(result.logs)); + }); + + it('entrustOrder.detail 显式传入 tableType 时应尊重调用方参数', async () => { + const { service, calls } = createHarness(EntrustOrderService, 100321); + + await service.detail({ + id: 99, + tableType: 'current', + }); + + assert.equal(calls.orderModelTableType, 'current'); + assert.equal(calls.orderItemsModelTableType, 'current'); + }); + + it('archiveOrder.detail 显式传入 moduleName 时应尊重调用方参数', async () => { + const { service, calls } = createHarness(ArchiveOrderService, 100321); + + await service.detail({ + id: 99, + moduleName: 'outsourced', + }); + + assert.equal(calls.orderModelTableType, 'outsourced'); + assert.equal(calls.orderItemsModelTableType, 'outsourced'); + }); +}); diff --git a/test/app/service/systemMethods/order/wave.batchList.assignmentStatus.test.js b/test/app/service/systemMethods/order/wave.batchList.assignmentStatus.test.js index eff037f..08f5a05 100644 --- a/test/app/service/systemMethods/order/wave.batchList.assignmentStatus.test.js +++ b/test/app/service/systemMethods/order/wave.batchList.assignmentStatus.test.js @@ -14,42 +14,113 @@ function createHarness(orderRows = []) { const capturedSqls = []; /** - * 根据 SQL 中的聚合条件模拟库位分配状态过滤。 + * 统计单个波次下订单分配状态计数。 + * + * @param {Array} rows 订单行。 + * @return {{ total: number, storage: { none: number, fin: number, error: number }, express: { none: number, fin: number, error: number }, print: { none: number, fin: number, error: number } }} 统计结果。 + */ + function buildWaveOrderStats(rows) { + const normalizedRows = Array.isArray(rows) ? rows : []; + const stats = { + total: normalizedRows.length, + storage: { none: 0, fin: 0, error: 0 }, + express: { none: 0, fin: 0, error: 0 }, + print: { none: 0, fin: 0, error: 0 }, + }; + + for (const row of normalizedRows) { + const storageStatus = String(row && row.storage_status || '').trim(); + const expressStatus = String(row && row.post_status || '').trim(); + const printStatus = String(row && row.print_status || '').trim(); + + if (storageStatus === 'none') { + stats.storage.none += 1; + } else if (storageStatus === 'fin') { + stats.storage.fin += 1; + } else if (storageStatus === 'error') { + stats.storage.error += 1; + } + + if (expressStatus === 'none') { + stats.express.none += 1; + } else if (expressStatus === 'fin') { + stats.express.fin += 1; + } else if (expressStatus === 'error') { + stats.express.error += 1; + } + + if (printStatus === 'none') { + stats.print.none += 1; + } else if (printStatus === 'fin') { + stats.print.fin += 1; + } else if (printStatus === 'error') { + stats.print.error += 1; + } + } + + return stats; + } + + /** + * 根据 SQL 中的聚合条件模拟分配状态过滤。 * * @param {string} sql 原始 SQL。 - * @param {Array} rows 订单行。 + * @param {{ total: number, storage: { none: number, fin: number, error: number }, express: { none: number, fin: number, error: number }, print: { none: number, fin: number, error: number } }} stats 统计结果。 + * @param {'storage'|'express'|'print'} type 分配类型。 * @return {boolean} 是否命中过滤条件。 */ - function matchStorageAssignmentFilter(sql, rows) { - const normalizedRows = Array.isArray(rows) ? rows : []; - const total = normalizedRows.length; - const noneCount = normalizedRows.filter(row => String(row && row.storage_status || '').trim() === 'none').length; - const finCount = normalizedRows.filter(row => String(row && row.storage_status || '').trim() === 'fin').length; - const errorCount = normalizedRows.filter(row => String(row && row.storage_status || '').trim() === 'error').length; + function matchAssignmentFilter(sql, stats, type) { + const normalizedType = String(type || '').trim(); + const total = Number(stats && stats.total || 0); + const typeStats = stats && stats[normalizedType] ? stats[normalizedType] : { none: 0, fin: 0, error: 0 }; + const noneCount = Number(typeStats.none || 0); + const finCount = Number(typeStats.fin || 0); + const errorCount = Number(typeStats.error || 0); const totalExpr = 'COALESCE(wave_order_stats.order_total, 0)'; - const noneExpr = 'COALESCE(wave_order_stats.storage_none_count, 0)'; - const finExpr = 'COALESCE(wave_order_stats.storage_fin_count, 0)'; - const errorExpr = 'COALESCE(wave_order_stats.storage_error_count, 0)'; + const fieldMap = { + storage: { + noneExpr: 'COALESCE(wave_order_stats.storage_none_count, 0)', + finExpr: 'COALESCE(wave_order_stats.storage_fin_count, 0)', + errorExpr: 'COALESCE(wave_order_stats.storage_error_count, 0)', + withError: true, + }, + express: { + noneExpr: 'COALESCE(wave_order_stats.post_none_count, 0)', + finExpr: 'COALESCE(wave_order_stats.post_fin_count, 0)', + errorExpr: 'COALESCE(wave_order_stats.post_error_count, 0)', + withError: true, + }, + print: { + noneExpr: 'COALESCE(wave_order_stats.print_none_count, 0)', + finExpr: 'COALESCE(wave_order_stats.print_fin_count, 0)', + errorExpr: '', + withError: false, + }, + }; + const config = fieldMap[normalizedType]; + if (!config) { + return true; + } + + const { noneExpr, finExpr, errorExpr, withError } = config; if (sql.includes(`${finExpr} = ${totalExpr}`) && sql.includes(`${totalExpr} > 0`)) { return total > 0 && finCount === total; } if ( - sql.includes(`${errorExpr} = 0`) - && sql.includes(`${noneExpr} <> ${totalExpr}`) + sql.includes(`${noneExpr} <> ${totalExpr}`) && sql.includes(`${finExpr} <> ${totalExpr}`) ) { - return errorCount === 0 && noneCount !== total && finCount !== total; + if (withError && !sql.includes(`${errorExpr} = 0`)) { + return true; + } + return (!withError || errorCount === 0) && noneCount !== total && finCount !== total; } - if ( - sql.includes(`${totalExpr} = 0`) - && sql.includes(`${errorExpr} > 0`) - && sql.includes(`${noneExpr} = ${totalExpr}`) - ) { - return total === 0 || errorCount > 0 || noneCount === total; + if (sql.includes(`${totalExpr} = 0`) && sql.includes(`${noneExpr} = ${totalExpr}`)) { + return total === 0 || (withError && errorCount > 0) || noneCount === total; } return true; @@ -65,7 +136,10 @@ function createHarness(orderRows = []) { model: { async query(sql) { capturedSqls.push(String(sql)); - const matched = matchStorageAssignmentFilter(sql, orderRows); + const stats = buildWaveOrderStats(orderRows); + const matched = matchAssignmentFilter(sql, stats, 'storage') + && matchAssignmentFilter(sql, stats, 'express') + && matchAssignmentFilter(sql, stats, 'print'); if (sql.includes('COUNT(1) AS total')) { return [[{ total: matched ? 1 : 0 }]]; } @@ -81,6 +155,15 @@ function createHarness(orderRows = []) { wave_status: 0, total_orders: orderRows.length, processed_orders: 0, + order_total: stats.total, + storage_none_count: stats.storage.none, + storage_fin_count: stats.storage.fin, + storage_error_count: stats.storage.error, + post_none_count: stats.express.none, + post_fin_count: stats.express.fin, + post_error_count: stats.express.error, + print_none_count: stats.print.none, + print_fin_count: stats.print.fin, item_detail_machine: '', item_part_type: 'items_hash', item_part: 'hash-x', @@ -218,6 +301,69 @@ describe('test/app/service/systemMethods/order/wave.batchList.assignmentStatus.t ); }); + it('should support where.express_assignment_status with english enums', async () => { + const { result } = await getBatchListResult([ + { wave_id: 1, storage_status: 'none', post_status: 'fin', print_status: 'none' }, + { wave_id: 1, storage_status: 'none', post_status: 'fin', print_status: 'none' }, + ], { + express_assignment_status: 'assigned', + }); + + assert.equal(result.flag, 'success'); + assert.equal(result.list.length, 1); + assert.equal(result.list[0].express_assignment_status, '已分配'); + }); + + it('should filter print assignment status by unprinted', async () => { + const { result } = await getBatchListResult([ + { wave_id: 1, storage_status: 'none', post_status: 'none', print_status: 'none' }, + { wave_id: 1, storage_status: 'none', post_status: 'none', print_status: 'none' }, + ], { + print_assignment_status: 'unprinted', + }); + + assert.equal(result.flag, 'success'); + assert.equal(result.list.length, 1); + assert.equal(result.list[0].print_assignment_status, '未打印'); + }); + + it('should filter print assignment status by partially_printed', async () => { + const { result } = await getBatchListResult([ + { wave_id: 1, storage_status: 'none', post_status: 'none', print_status: 'none' }, + { wave_id: 1, storage_status: 'none', post_status: 'none', print_status: 'fin' }, + ], { + print_assignment_status: 'partially_printed', + }); + + assert.equal(result.flag, 'success'); + assert.equal(result.list.length, 1); + assert.equal(result.list[0].print_assignment_status, '部分打印'); + }); + + it('should filter print assignment status by printed', async () => { + const { result } = await getBatchListResult([ + { wave_id: 1, storage_status: 'none', post_status: 'none', print_status: 'fin' }, + { wave_id: 1, storage_status: 'none', post_status: 'none', print_status: 'fin' }, + ], { + print_assignment_status: 'printed', + }); + + assert.equal(result.flag, 'success'); + assert.equal(result.list.length, 1); + assert.equal(result.list[0].print_assignment_status, '已打印'); + }); + + it('should throw readable error when where.print_assignment_status is invalid', async () => { + await assert.rejects( + async () => { + await getBatchListResult([], { + print_assignment_status: 'invalid_enum', + }); + }, + /print_assignment_status 参数不合法,仅支持: unprinted、partially_printed、printed/ + ); + }); + it('should use aggregate join SQL and avoid correlated subquery when filtering 未分配 with wave_type', async () => { const { capturedSqls } = await getBatchListResult([ { wave_id: 1, storage_status: 'error', post_status: 'none', print_status: 'none' }, diff --git a/test/app/service/systems/order_print.getWavePlatformPrintData.test.js b/test/app/service/systems/order_print.getWavePlatformPrintData.test.js new file mode 100644 index 0000000..fce0acb --- /dev/null +++ b/test/app/service/systems/order_print.getWavePlatformPrintData.test.js @@ -0,0 +1,451 @@ +'use strict'; + +const assert = require('node:assert/strict'); +const OrderPrintSystemService = require('../../../../app/service/systems/order_print'); + +function createOrderPrintServiceHarness() { + const ctx = { + app: { + baseDir: 'd:/wms', + }, + user: { + store_id: 100000, + }, + logger: { + info() {}, + warn() {}, + error() {}, + }, + model: { + QueryTypes: { + SELECT: 'SELECT', + }, + }, + service: { + systems: { + storeWarehouse: { + async getContractConfig() { + return { + policy_config: {}, + }; + }, + }, + }, + }, + }; + + return new OrderPrintSystemService(ctx); +} + +describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js', () => { + it('should map kuaishou encryptedData/signature/key from order_express fields', () => { + const service = createOrderPrintServiceHarness(); + + const result = service.buildOrderPlatformPrintItem({ + orderRow: { + id: 101, + wave_id: 10, + wave_no: 'W010', + delivery_order_code: 'DO101', + store_id: 1, + warehouse_id: 100000, + items: JSON.stringify([ + { + item_name: '化妆品', + pick_location: 'E2区02-04-02', + barcode: '6973348850399', + quantity: 2, + }, + ]), + }, + orderExpress: { + waybill_code: 'WB101', + printinfo: 'ENC_FROM_DB', + signature: 'SIG_FROM_DB', + encryptprintinfo: 'KEY_FROM_DB', + }, + policyConfig: { + province_name: '浙江省', + city_name: '杭州市', + district_name: '滨江区', + address: '网商路 699 号', + sender_name: '张三', + sender_tel: '13800000000', + waybill_custom_display_type: '5', + }, + platformCode: 'kuaishou', + templateSample: { + cmd: 'print', + requestID: 'sample-request', + version: '1.0', + taskID: 'sample-task', + task: { + documents: [ + { + documentID: 'sample-doc', + contents: [ + { + encryptedData: 'SAMPLE_ENCRYPTED_DATA', + signature: 'SAMPLE_SIGNATURE', + key: 'SAMPLE_KEY', + templateURL: 'https://example.com/kuaishou.xml', + data: { + productInfo: '#0 sample product info', + }, + }, + { + templateURL: 'http://www.ye4s.com/mb/kuaishou.xml', + customData: { + productInfo: '#1 sample custom product info', + }, + }, + ], + }, + ], + }, + }, + }); + + assert.equal(result.print_data.documentID, 'WB101'); + assert.equal(result.print_data.waybillCode, 'WB101'); + assert.ok(Array.isArray(result.print_data.contents)); + + const mappedContent = result.print_data.contents[0]; + assert.equal(mappedContent.encryptedData, 'ENC_FROM_DB'); + assert.equal(mappedContent.signature, 'SIG_FROM_DB'); + assert.equal(mappedContent.key, 'KEY_FROM_DB'); + assert.equal(mappedContent.templateURL, 'https://example.com/kuaishou.xml'); + assert.equal(mappedContent.data.productInfo, '__SAMPLE__'); + assert.equal(mappedContent.addData.senderInfo.address.countryCode, 'CHN'); + assert.equal(mappedContent.addData.senderInfo.address.detailAddress, '网商路 699 号'); + assert.equal(mappedContent.addData.senderInfo.contact.name, '张三'); + assert.equal(mappedContent.addData.senderInfo.contact.mobile, '13800000000'); + + const customDataContent = result.print_data.contents.find(content => content && content.customData); + assert.ok(customDataContent); + assert.equal(customDataContent.templateURL, 'http://www.ye4s.com/mb/kuaishou.xml'); + assert.ok(customDataContent.customData.productInfo.includes('商品总数 【2】')); + assert.ok(customDataContent.customData.productInfo.includes('E2区02-04-02 化妆品 6973348850399 【2】')); + }); + + it('should map pdd encryptedData/signature and sender fields from order_express and policy_config', () => { + const service = createOrderPrintServiceHarness(); + + const result = service.buildOrderPlatformPrintItem({ + orderRow: { + id: 201, + wave_id: 20, + wave_no: 'W020', + delivery_order_code: 'DO201', + store_id: 1, + warehouse_id: 100000, + items: JSON.stringify([ + { + pick_location: 'A1-01-01', + barcode: '1234567890123', + quantity: 1, + }, + ]), + }, + orderExpress: { + waybill_code: ' WB201 ', + printinfo: ' ENC_FROM_DB_PDD ', + signature: ' SIG_FROM_DB_PDD ', + }, + policyConfig: { + province_name: '广东省', + city_name: '深圳市', + district_name: '南山区', + address: '科技园南区 1 号', + sender_name: '李四', + sender_tel: '13900000000', + waybill_custom_display_type: '4', + }, + platformCode: 'pdd', + templateSample: { + cmd: 'print', + requestID: 'sample-request', + version: '1.0', + taskID: 'sample-task', + task: { + documents: [ + { + documentID: 'sample-doc', + contents: [ + { + addData: { + sender: { + address: { + province: '', + city: '', + district: '', + detail: '', + }, + mobile: '', + name: '', + }, + }, + encryptedData: 'SAMPLE_ENCRYPTED_DATA', + signature: 'SAMPLE_SIGNATURE', + templateURL: 'https://example.com/pdd.xml', + data: { + productInfo: '#0 sample product info', + }, + }, + ], + }, + ], + }, + }, + }); + + assert.equal(result.print_data.documentID, 'WB201'); + assert.equal(result.print_data.contents[0].encryptedData, 'ENC_FROM_DB_PDD'); + assert.equal(result.print_data.contents[0].signature, 'SIG_FROM_DB_PDD'); + assert.equal(result.print_data.contents[0].addData.sender.address.province, '广东省'); + assert.equal(result.print_data.contents[0].addData.sender.address.city, '深圳市'); + assert.equal(result.print_data.contents[0].addData.sender.address.district, '南山区'); + assert.equal(result.print_data.contents[0].addData.sender.address.detail, '科技园南区 1 号'); + assert.equal(result.print_data.contents[0].addData.sender.mobile, '13900000000'); + assert.equal(result.print_data.contents[0].addData.sender.name, '李四'); + + const customContent = result.print_data.contents.find(content => { + return content && content.data && Array.isArray(content.data.list); + }); + assert.ok(customContent); + assert.equal(customContent.templateURL, 'http://www.ye4s.com/mb/pdd.xml'); + assert.ok(customContent.data.list[0].text.includes('\r')); + assert.ok(customContent.data.list[0].text.includes('商品总数 【1】')); + assert.ok(customContent.data.list[0].text.includes('A1-01-01 90123 【1】')); + }); + + it('should query order_express with kuaishou encrypted payload columns', async () => { + const service = createOrderPrintServiceHarness(); + let capturedAttributes = []; + let capturedWhere = {}; + service.ctx.model.OrderExpress = { + async findAll(options) { + capturedAttributes = Array.isArray(options && options.attributes) ? options.attributes : []; + capturedWhere = options && options.where || {}; + return []; + }, + }; + + await service.queryOrderExpressByOrderIds([ 101 ]); + + assert.ok(capturedAttributes.includes('printinfo')); + assert.ok(capturedAttributes.includes('signature')); + assert.ok(capturedAttributes.includes('encryptprintinfo')); + assert.equal(capturedWhere.business_key, 1); + }); + + it('should throw when business_key=1 waybill data is missing', async () => { + const service = createOrderPrintServiceHarness(); + + service.queryWavesByIds = async () => ([ + { wave_id: 1, wave_no: 'W001' }, + ]); + service.queryOrdersByWaveIds = async () => ([ + { + id: 101, + wave_id: 1, + wave_no: 'W001', + warehouse_id: 100000, + store_id: 1, + delivery_order_code: 'O101', + post_status: 'fin', + sys_platform_code: 'kuaishou', + }, + { + id: 102, + wave_id: 1, + wave_no: 'W001', + warehouse_id: 100000, + store_id: 1, + delivery_order_code: 'O102', + post_status: 'fin', + sys_platform_code: 'kuaishou', + }, + ]); + service.filterFullyAssignedExpressWaves = () => ({ + validWaveIds: [ 1 ], + filteredWaveIds: [], + }); + service.queryOrderExpressByOrderIds = async () => ([ + { + order_id: 101, + business_key: 1, + waybill_code: 'WB101', + }, + { + order_id: 102, + business_key: 1, + waybill_code: '', + }, + ]); + + await assert.rejects( + async () => service.getWavePlatformPrintData({ + waveIds: [ 1 ], + warehouseId: 100000, + }), + error => { + assert.ok(error instanceof Error); + assert.ok(error.message.includes('业务id为1的运单号数据缺失')); + return true; + } + ); + }); + + it('should return waveGroups grouped by wave then platform and keep summary counters correct', async () => { + const service = createOrderPrintServiceHarness(); + + service.queryWavesByIds = async () => ([ + { wave_id: 2, wave_no: 'W002' }, + { wave_id: 1, wave_no: 'W001' }, + ]); + + service.queryOrdersByWaveIds = async () => ([ + { + id: 11, + wave_id: 1, + wave_no: 'W001', + warehouse_id: 100000, + store_id: 1, + delivery_order_code: 'O11', + post_status: 'fin', + sys_platform_code: 'jd', + }, + { + id: 12, + wave_id: 1, + wave_no: 'W001', + warehouse_id: 100000, + store_id: 1, + delivery_order_code: 'O12', + post_status: 'fin', + sys_platform_code: 'cainiao', + }, + { + id: 21, + wave_id: 2, + wave_no: 'W002', + warehouse_id: 100000, + store_id: 2, + delivery_order_code: 'O21', + post_status: 'fin', + sys_platform_code: 'jd', + }, + ]); + + service.filterFullyAssignedExpressWaves = () => ({ + validWaveIds: [ 2, 1 ], + filteredWaveIds: [], + }); + + service.queryOrderExpressByOrderIds = async () => ([ + { + order_id: 11, + business_key: 1, + waybill_code: 'WB11', + }, + { + order_id: 12, + business_key: 1, + waybill_code: 'WB12', + }, + { + order_id: 21, + business_key: 1, + waybill_code: 'WB21', + }, + ]); + service.buildOrderExpressMap = () => new Map(); + service.getPolicyConfigMapByStore = async () => new Map([ + [ 1, {}], + [ 2, {}], + ]); + service.resolvePrintPlatformCode = orderRow => String(orderRow && orderRow.sys_platform_code || '').trim(); + service.loadTemplateSampleByPlatform = () => ({}); + service.buildOrderPlatformPrintItem = ({ orderRow, platformCode }) => ({ + wave_id: Number(orderRow.wave_id), + wave_no: String(orderRow.wave_no), + order_id: Number(orderRow.id), + order_no: String(orderRow.delivery_order_code), + platform: String(platformCode), + platform_name: platformCode === 'jd' ? '京东' : '菜鸟', + print_data: { + platform: String(platformCode), + order_id: Number(orderRow.id), + }, + }); + + const result = await service.getWavePlatformPrintData({ + waveIds: [ 2, 1 ], + warehouseId: 100000, + }); + + assert.deepEqual(result.summary, { + total_waves: 2, + total_orders: 3, + total_platforms: 3, + }); + + assert.equal(result.waveGroups.length, 2); + assert.deepEqual(result.waveGroups.map(item => item.wave_no), [ 'W001', 'W002' ]); + + assert.deepEqual(result.waveGroups[0], { + wave_id: 1, + wave_no: 'W001', + order_count: 2, + platforms: [ + { + platform: 'cainiao', + platform_name: '菜鸟', + order_count: 1, + orders: [ + { + platform: 'cainiao', + order_id: 12, + }, + ], + }, + { + platform: 'jd', + platform_name: '京东', + order_count: 1, + orders: [ + { + platform: 'jd', + order_id: 11, + }, + ], + }, + ], + }); + + assert.deepEqual(result.waveGroups[1], { + wave_id: 2, + wave_no: 'W002', + order_count: 1, + platforms: [ + { + platform: 'jd', + platform_name: '京东', + order_count: 1, + orders: [ + { + platform: 'jd', + order_id: 21, + }, + ], + }, + ], + }); + + assert.deepEqual(result.ext, { + missing_wave_ids: [], + filtered_wave_ids: [], + }); + }); +});