diff --git a/AI_METHOD_ROUTING.md b/AI_METHOD_ROUTING.md index ebe992d..0ee6c9a 100644 --- a/AI_METHOD_ROUTING.md +++ b/AI_METHOD_ROUTING.md @@ -124,9 +124,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods | method | 实现文件 | 函数 | 登录 | 鉴权/权限 | |---|---|---|---|---| -| report.generate | app/service/systemMethods/report.js | generate | 需登录 | 免权限(systemInit 声明 generate/generateTaskProgress/meta 免权限) | +| report.generate | app/service/systemMethods/report.js | generate | 需登录 | 免权限(systemInit 声明 generate/generateTaskProgress 免权限) | | report.generateTaskProgress | app/service/systemMethods/report.js | generateTaskProgress | 需登录 | 免权限 | -| report.meta | app/service/systemMethods/report.js | meta | 需登录 | 免权限(_noNeedRight/_noNeedAuth 含 meta;未列入 _noNeedLog,保留审计日志) | | report.definition.typeList | app/service/systemMethods/report/definition.js | typeList | 需登录 | 免权限(_noNeedRight/_noNeedAuth/_noNeedLog 含 typeList;同模块 save/list/delete 仍需授权) | | report.deliveryPlan.save | app/service/systemMethods/report/deliveryPlan.js | save | 需登录 | 需授权(未声明免权限) | | report.deliveryPlan.list | app/service/systemMethods/report/deliveryPlan.js | list | 需登录 | 需授权 | @@ -138,7 +137,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - 底层编排:`app/service/systems/report.js`(报表定义读取/类型注册表解析/工作簿生成,含 listRegisteredTypes/saveDefinition/listDefinitions/deleteDefinition 定义管理)、`app/service/systems/reportDelivery.js`(投递计划/记录 CRUD 与分钟级投递调度,含文本通知模板渲染与定向群/成员推送)、`app/lib/report/notifyTemplate.js`(标签白名单 {time}/{url}/{report_name}/{biz_date} 渲染) - 配置与口径:`wms_report_definition` 极简配置(name/type/file_name/fields/is_enabled/remark,唯一性由主键 id 承担),注册类型与字段规格见 `app/service/systems/report/queries/index.js`(当前仅 stockFlow),详见 `docs/report-config-guide.md` -- 接口文档:`methods/system.json` 分组「通用报表模块」(module=report),变更记录见 `methods/changes/system.json` 版本 `2026.08.30-report-delivery-plan-copy`、`2026.08.30-report-delivery-plan-name-field`、`2026.08.30-report-type-list-merge-into-definition`、`2026.08.30-report-definition-model-refactor`、`2026.08.29-report-config-driven-generate-delivery`、`2026.08.29-report-meta`、`2026.08.29-report-delivery-notify-template-targets`、`2026.08.29-report-delivery-channel-converge`、`2026.08.29-report-definition-management`、`2026.08.29-report-channel-normalize-doc-audit` +- 接口文档:`methods/system.json` 分组「通用报表模块」(module=report),变更记录见 `methods/changes/system.json` 版本 `2026.08.31-report-meta-removed`、`2026.08.30-report-delivery-plan-copy`、`2026.08.30-report-delivery-plan-name-field`、`2026.08.30-report-type-list-merge-into-definition`、`2026.08.30-report-definition-model-refactor`、`2026.08.29-report-config-driven-generate-delivery`、`2026.08.29-report-meta`、`2026.08.29-report-delivery-notify-template-targets`、`2026.08.29-report-delivery-channel-converge`、`2026.08.29-report-definition-management`、`2026.08.29-report-channel-normalize-doc-audit` +- 接口移除(2026-08-31,破坏性变更):`report.meta` 已下线移除(免权限列元数据接口),前端获取注册字段/窗口参数改由 `report.definition.typeList` 提供、某报表定义勾选字段经 `report.definition.list` 的 `fields` 数组获取;代码层删除 `systemMethods/report.js` 的 `meta` 方法与 `systems/report.js` 的 `getMeta`,`methods/system.json` 条目同步移除,详见 `docs/report-config-guide.md` 第 7 节 - 报表定义模型重构(2026-08-30,破坏性变更):报表定义由 code 编码改为主键 id 关联,`report.generate`/`report.meta`/`report.deliveryPlan.save` 入参 `report_code` 改为 `report_id`(=报表定义ID,兼容 reportId 驼峰,前端需同步改);`code/scope` 与 `output_config/source_config/sheet_config` 三段 JSON 配置已随模型删除,列渲染由类型硬编码字段规格自动完成;`report.definition.save` 入参 `{id?,name,type,file_name/fileName,fields,is_enabled?,remark?}`(type 须命中注册表、fields 须为该类型注册字段子集),`report.definition.list` where 改 `{name,type,is_enabled}` + sort 白名单 id/name/type/is_enabled/created_at/updated_at,`report.definition.delete` 入参 id 且引用拦截按 report_definition_id 统计;`report.deliveryPlan.*`/`report.deliveryLog.list` 关联键改 report_definition_id(log 响应带 report_name 快照);新增免权限只读 `report.definition.typeList` 返回注册类型清单(由独立模块 report/type.js 并入 report/definition.js);详见 `docs/report-config-guide.md` 第 1/2/3/6/7/8 节 - 投递渠道收敛(2026-08-29):`report.deliveryPlan.save` 的 channel 仅支持 inbox(默认 inbox,wecom/link 已弃用,非法渠道报「投递渠道仅支持 inbox: 」);历史 wecom/link 计划投递时按 inbox 兜底;inbox 推送失败经 inbox.message.retry 自动重推一次,仍失败进入 failed 退避(MAX_RETRY=3) - 文本通知(2026-08-29):`report.deliveryPlan.save` 可选入参 notify_template/notify_group_ids/notify_member_ids(仅入参存在时生效),`report.deliveryLog.list` 响应带 notify_targets 投递目标快照,详见 `docs/report-config-guide.md` 5.1 节 diff --git a/app/model/notification_webhook.js b/app/model/notification_webhook.js index ce94b33..e49b41a 100644 --- a/app/model/notification_webhook.js +++ b/app/model/notification_webhook.js @@ -43,6 +43,7 @@ module.exports = app => { Object.freeze({ code: 'receiving_reviewed', name: '收货审核完成', business: 'receiving', description: '收货单批量审核通过后的通知' }), Object.freeze({ code: 'receiving_store_bound', name: '收货单创建/绑定货主', business: 'receiving', description: '收货单创建或首次绑定货主时的通知(展示车牌号/快递单号登记状态,未登记显示无)' }), Object.freeze({ code: 'receiving_store_unmatched', name: '收货完成未匹配商品提醒', business: 'receiving', description: '收货单完成时存在未匹配商品明细,通知货主核实商品资料' }), + Object.freeze({ code: 'entry_order_completed', name: '入库单完成入库', business: 'entry_order', description: '入库单完成入库后的通知,提示货主入库单已完成入库请注意查收' }), Object.freeze({ code: 'order_sync_completed', name: '订单同步完成', business: 'order', description: '本地创建入口同步完成后的通知' }), Object.freeze({ code: 'order_cancel_intercepted', name: '订单取消拦截', business: 'order', description: '订单取消失败并触发拦截执行后的通知' }), Object.freeze({ code: 'wave_strategy_quick_scan_failed', name: '波次策略兜底扫描失败', business: 'order', description: '定时兜底扫描任务在仓库维度触发失败时通知' }), diff --git a/app/schedule/notice_stock_remaining.js b/app/schedule/notice_stock_remaining.js index 735fe88..a945716 100644 --- a/app/schedule/notice_stock_remaining.js +++ b/app/schedule/notice_stock_remaining.js @@ -83,6 +83,30 @@ function readRecordValue(record, fieldNames) { return undefined; } +/** + * 从仓库/货主关联记录中读取名称,兼容下划线与驼峰字段命名。 + * @param {object} record 仓库或货主关联记录对象 + * @return {string} 名称字符串,读取不到时返回空字符串 + */ +function readAssociatedName(record) { + return String(readRecordValue(record, [ 'company_name', 'companyName', 'name', 'custom_name' ]) || '').trim(); +} + +/** + * 生成“名称(ID)”形式的实体展示标签,名称缺失时优雅回退为 ID。 + * @param {string} label 实体标签前缀,如“仓库”“货主” + * @param {string} name 实体名称 + * @param {number} id 实体 ID + * @return {string} 展示标签 + */ +function buildEntityLabel(label, name, id) { + if (name) { + return id > 0 ? `${label}:${name}(ID:${id})` : `${label}:${name}`; + } + + return `${label}ID:${id > 0 ? id : '未知'}`; +} + /** * 将数值安全转换为数字。 * @param {*} value 原始值 @@ -239,14 +263,18 @@ function buildNoticeContent({ ctx, storageRecord, stockRecord, remainingDays, th const spaceCode = String(readRecordValue(spaceRecord, [ 'space_code', 'spaceCode' ]) || '').trim(); const spaceName = String(readRecordValue(spaceRecord, [ 'custom_name', 'customName' ]) || '').trim(); const spaceLabel = [ spaceCode, spaceName ].filter(Boolean).join(' / ') || '无'; + const warehouseRecord = readRecordValue(storageRecord, [ 'warehouse' ]) || storageRecord.warehouse || {}; + const storeRecord = readRecordValue(storageRecord, [ 'store' ]) || storageRecord.store || {}; + const warehouseName = readAssociatedName(warehouseRecord); + const storeName = readAssociatedName(storeRecord); return [ `库存效期预警:${itemName}`, `商品编码:${itemCode}`, `库存ID:${storageId || '未知'}`, `批次号:${batchNo}`, - `仓库ID:${warehouseId || '未知'}`, - `货主ID:${storeId || '未知'}`, + buildEntityLabel('仓库', warehouseName, warehouseId), + buildEntityLabel('货主', storeName, storeId), `库位:${spaceLabel}`, `库存数量:${quantity}`, `可用数量:${availableQuantity}`, @@ -456,6 +484,18 @@ module.exports = { const storageRows = await ctx.model.Storage.findAll({ where: storageWhere, include: [ + { + model: ctx.model.Store, + as: 'warehouse', + attributes: [ 'company_name' ], + required: false, + }, + { + model: ctx.model.Store, + as: 'store', + attributes: [ 'company_name' ], + required: false, + }, { model: ctx.model.LocationSpace, as: 'space', @@ -604,6 +644,10 @@ module.exports = { const warehouseId = toNumber(readRecordValue(storageRecord, [ 'warehouse_id', 'warehouseId' ]) || stockRecord.warehouse_id, 0); const storeId = toNumber(readRecordValue(storageRecord, [ 'store_id', 'storeId' ]) || stockRecord.store_id, 0); + const warehouseRecord = readRecordValue(storageRecord, [ 'warehouse' ]) || storageRecord.warehouse || {}; + const storeRecord = readRecordValue(storageRecord, [ 'store' ]) || storageRecord.store || {}; + const warehouseName = readAssociatedName(warehouseRecord); + const storeName = readAssociatedName(storeRecord); const title = `库存效期预警:${stockRecord.item_name || '未命名商品'}`; const content = buildNoticeContent({ ctx, @@ -630,7 +674,7 @@ module.exports = { subject: { id: warehouseId, type: 'warehouse', - name: `仓库${warehouseId || '未知'}`, + name: buildEntityLabel('仓库', warehouseName, warehouseId), }, businessName: 'storage', event: NOTICE_EVENT, @@ -647,7 +691,9 @@ module.exports = { thresholdDays, remainingDays, warehouseId, + warehouseName, storeId, + storeName, stock: { id: stockRecord.id, item_code: stockRecord.item_code, diff --git a/app/service/systemMethods/report.js b/app/service/systemMethods/report.js index 8c219af..8ee4078 100644 --- a/app/service/systemMethods/report.js +++ b/app/service/systemMethods/report.js @@ -23,9 +23,9 @@ class ReportMethodService extends MainService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = 'generate,generateTaskProgress,meta'; + const _noNeedRight = 'generate,generateTaskProgress'; const _noNeedLog = 'generate,generateTaskProgress'; - const _noNeedAuth = 'generate,generateTaskProgress,meta'; + const _noNeedAuth = 'generate,generateTaskProgress'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); // 显式挂载子目录服务实例(与 storeWarehouse.js 挂载 store/warehouse 的模式一致) this.deliveryPlan = new ReportDeliveryPlanMethodService(ctx); @@ -119,34 +119,6 @@ class ReportMethodService extends MainService { }); } - /** - * 查询报表前端可读的列元数据(全量注册字段 + 勾选标记 + 窗口参数,不执行真实数据查询)。 - * @param {Object} data 请求体 - * @param {number} data.report_id 报表定义ID(必填,兼容 reportId) - * @param {number} [data.reportId] 报表定义ID(驼峰写法,优先级高于 report_id) - * @return {Promise} 统一 success 包装,data 为报表元数据 - */ - async meta(data = {}) { - const { service } = this; - const { - report_id: reportIdSnake, - reportId: reportIdCamel, - } = data; - - const reportId = Number(reportIdCamel ?? reportIdSnake ?? 0) || 0; - if (!Number.isInteger(reportId) || reportId <= 0) { - return this.fail('报表ID report_id 必须为正整数'); - } - - const reportMeta = await service.systems.report.getMeta({ reportId }); - const { id, ...rest } = reportMeta; - - return this.success('ok', { - report_id: id, - ...rest, - }); - } - /** * 查询报表导出任务进度。 * @param {Object} data 请求体 diff --git a/app/service/systemMethods/report/definition.js b/app/service/systemMethods/report/definition.js index 94ce9af..e301408 100644 --- a/app/service/systemMethods/report/definition.js +++ b/app/service/systemMethods/report/definition.js @@ -10,7 +10,7 @@ class ReportDefinitionMethodService extends MainService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - // typeList 为只读公共元数据:免权限/免鉴权/免日志(与 report.meta 惯例一致),仍要求登录; + // typeList 为只读公共元数据:免权限/免鉴权/免日志(与 report 模块免权限只读接口惯例一致),仍要求登录; // save/list/delete 属定义管理类操作:不声明免权限,仅通配符角色(超级管理员/仓库管理员)可用, // 后续由 wms_permission 同步流程按需授权,不扩大任何角色授权范围 const _noNeedRight = 'typeList'; diff --git a/app/service/systemMethods/storeWarehouse/store.js b/app/service/systemMethods/storeWarehouse/store.js index efb2e1e..02de554 100644 --- a/app/service/systemMethods/storeWarehouse/store.js +++ b/app/service/systemMethods/storeWarehouse/store.js @@ -29,9 +29,9 @@ class StoreWarehouseStoreService extends MainService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = 'list,sign,confirmSign,unbind,rename,openAccount,createUser,getPolicyConfig,getPolicyConfigFields,savePolicyConfig,listApiConfig,saveApiConfig,deleteQimenConfig,queryPrintQuantityLogs,queryStorePrintQuantityLogs,exportStorePrintQuantityLogs,exportStorePrintQuantityLogsTaskProgress,adjustPrintQuantity'; + const _noNeedRight = 'list,export,exportTaskProgress,sign,confirmSign,unbind,rename,openAccount,createUser,getPolicyConfig,getPolicyConfigFields,savePolicyConfig,listApiConfig,saveApiConfig,deleteQimenConfig,queryPrintQuantityLogs,queryStorePrintQuantityLogs,exportStorePrintQuantityLogs,exportStorePrintQuantityLogsTaskProgress,adjustPrintQuantity'; const _noNeedLog = '*'; - const _noNeedAuth = 'list,sign,confirmSign,unbind,rename,openAccount,createUser,getPolicyConfig,getPolicyConfigFields,savePolicyConfig,listApiConfig,saveApiConfig,deleteQimenConfig,queryPrintQuantityLogs,queryStorePrintQuantityLogs,exportStorePrintQuantityLogs,exportStorePrintQuantityLogsTaskProgress,adjustPrintQuantity'; + const _noNeedAuth = 'list,export,exportTaskProgress,sign,confirmSign,unbind,rename,openAccount,createUser,getPolicyConfig,getPolicyConfigFields,savePolicyConfig,listApiConfig,saveApiConfig,deleteQimenConfig,queryPrintQuantityLogs,queryStorePrintQuantityLogs,exportStorePrintQuantityLogs,exportStorePrintQuantityLogsTaskProgress,adjustPrintQuantity'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); } @@ -458,6 +458,136 @@ class StoreWarehouseStoreService extends MainService { } } + /** + * 提交货主签约列表导出任务(异步)。 + * 入参筛选条件与 storeWarehouse.store.list 的 listForStore 语义一致 + * (keyword/counterparty_id/store_id/auth_status/use_status/warehouse_use_status/id 等), + * page/page_size 忽略(全量导出)。提交后立即返回 task_id,后台异步生成 Excel 并上传, + * 导出进度/下载请通过 exportTaskProgress 查询。 + * + * @param {Object} data 请求数据。 + * @return {Promise} 统一响应结果(包含 task_id)。 + */ + async export(data = {}) { + const { service } = this; + const targetService = service && service.systems && service.systems.storeWarehouse; + + if (!targetService || typeof targetService.exportListForStore !== 'function') { + return this.fail('导出签约列表失败', { code: 500 }); + } + + try { + const requestData = normalizeStoreWarehousePayload(data); + const taskId = this.generateExportTaskId('', { base: 'store_relation_list' }); + const taskPayload = { + task_id: taskId, + status: 'submitted', + progress: 0, + message: '导出任务已提交', + result: null, + error: '', + }; + + await this.setExportTaskProgress(taskId, taskPayload); + + setImmediate(async () => { + try { + await this.setExportTaskProgress(taskId, { + task_id: taskId, + status: 'running', + progress: 10, + message: '导出任务执行中', + result: null, + error: '', + }); + + const result = await targetService.exportListForStore(requestData); + + await this.setExportTaskProgress(taskId, { + task_id: taskId, + status: 'success', + progress: 100, + message: '导出任务完成', + result, + error: '', + }); + } catch (error) { + const errorMessage = error && error.message ? error.message : `${error}`; + await this.setExportTaskProgress(taskId, { + task_id: taskId, + status: 'failed', + progress: 100, + message: '导出任务失败', + result: null, + error: errorMessage, + }); + } + }); + + return this.success('ok', { + ...taskPayload, + update_time: Date.now(), + }); + } catch (error) { + return this.fail(error.message || '导出签约列表失败', { + code: Number(error.code) || 500, + }); + } + } + + /** + * 查询货主签约列表导出任务进度。 + * + * @param {Object} data 请求数据。 + * @param {string} [data.task_id] 任务ID(下划线写法)。 + * @param {string} [data.taskId] 任务ID(驼峰写法)。 + * @return {Promise} 统一响应结果。 + */ + async exportTaskProgress(data = {}) { + const taskId = this.normalizeExportTaskId(data); + if (!taskId) { + return this.success('ok', { + task_id: '', + status: 'not_found', + progress: 0, + message: '任务不存在', + result: null, + error: '', + download_url: '', + update_time: Date.now(), + }); + } + + const cachedTask = await this.getExportTaskProgress(taskId); + if (!cachedTask) { + return this.success('ok', { + task_id: taskId, + status: 'not_found', + progress: 0, + message: '任务不存在', + result: null, + error: '', + download_url: '', + update_time: Date.now(), + }); + } + + const safeResult = this.isPlainObject(cachedTask.result) ? cachedTask.result : {}; + const downloadUrl = String( + safeResult.url + || safeResult.cdnUrl + || safeResult.cosUrl + || safeResult.fileKey + || '' + ); + + return this.success('ok', { + task_id: taskId, + ...cachedTask, + download_url: downloadUrl, + }); + } + /** * 提交面单余额变更日志导出任务。 * 入参条件与 queryPrintQuantityLogs 的 where 语义一致,异步执行,立即返回 task_id。 @@ -803,15 +933,19 @@ class StoreWarehouseStoreService extends MainService { /** * 生成导出任务ID。 - * @param {string} [prefix=''] 任务类型前缀(如 'store') + * @param {string} [prefix=''] 任务类型子前缀(如 'store')。 + * @param {Object} [options={}] 配置项。 + * @param {string} [options.base='print_qty_log'] 任务基础前缀,用于区分不同导出业务。 * @return {string} 导出任务ID。 */ - generateExportTaskId(prefix = '') { + generateExportTaskId(prefix = '', options = {}) { const storeId = this.ctx?.user?.store_id || 'unknown'; const timestamp = Date.now(); const randomToken = Math.random().toString(36).slice(2, 10); + const safeOptions = this.isPlainObject(options) ? options : {}; + const basePrefix = String(safeOptions.base || '').trim() || 'print_qty_log'; const typePrefix = prefix ? `${prefix}_` : ''; - return `print_qty_log_${typePrefix}export_${storeId}_${timestamp}_${randomToken}`; + return `${basePrefix}_${typePrefix}export_${storeId}_${timestamp}_${randomToken}`; } /** diff --git a/app/service/systems/entry_order.js b/app/service/systems/entry_order.js index 1f2db70..fd820d7 100644 --- a/app/service/systems/entry_order.js +++ b/app/service/systems/entry_order.js @@ -1,9 +1,47 @@ 'use strict'; const Service = require('egg').Service; +/** + * 校验商品 ID 是否合法:必须是纯数字且未超出 BIGINT(20) 有符号范围。 + * @param {string|number|null|undefined} value 待校验的商品 ID + * @return {boolean} 合法返回 true,否则返回 false + */ +function isValidItemId(value) { + if (value === null || value === undefined || value === '') return false; + const str = String(value); + // 纯数字校验 + if (!/^\d+$/.test(str)) return false; + try { + // BIGINT(20) 有符号上限 9223372036854775807,超出范围视为非法 + return BigInt(str) <= BigInt('9223372036854775807'); + } catch (error) { + return false; + } +} + +/** + * 提取商品编码开头的连续数字,作为归一化条码用于商品匹配。 + * 用于剥离中文后缀(如 "6934864201409-新品" → "6934864201409"): + * - 纯数字编码原样返回(与精确匹配等价); + * - 编码不以数字开头时无法归一化,返回 null; + * - 只取开头连续数字段,后续任意字符(中英文、符号、空格)一律视为后缀丢弃。 + * @param {string|number|null|undefined} value 原始商品编码(itemCode) + * @return {string|null} 归一化后的纯数字条码;无法归一化返回 null + */ +function normalizeItemCodeForMatch(value) { + if (value === null || value === undefined) return null; + const str = String(value).trim(); + if (!str) return null; + const matched = str.match(/^\d+/); + return matched ? matched[0] : null; +} + class entryOrderService extends Service { /** * 创建入库单(含明细行校验与插入)。 + * 明细行商品匹配优先级:itemId 主键 > itemCode 精确匹配 > itemCode 归一化条码匹配; + * 带中文后缀的编码(如 6934864201409-新品)在精确匹配不到时剥离后缀按纯数字条码对齐, + * 归一化条码对应多个商品时按失败处理,避免错配。 * @param {Object} data 请求体,包含 request.entryOrder 与 request.orderLines * @param {Object} info 上下文信息 { storeId, warehouseId, appKey, customerId, warehouseCode } * @param {string} fromCode 来源标识(WMS / API / QM) @@ -30,44 +68,76 @@ class entryOrderService extends Service { // 验证商品 for (let i = 0; i < orderLine.length; i++) { + const line = orderLine[i]; + const lineNo = line.orderLineNo || i + 1; + // 请求行展示信息:取自原始报文,保证失败提示展示真实 SKU/商品/编码 + const lineItemId = line.itemId ?? ''; + const lineItemName = line.itemName || ''; + const lineItemCode = line.itemCode || ''; let wms_stock = null; // ERP不处理WMS的外部商品编码 - // 查找唯一键 - const findByItemCode = async () => { - if (!orderLine[i].itemCode) return null; + // 查找唯一键:按商品编码精确查找(限定 appKey/仓库/货主作用域,作用域内 item_code 唯一) + const findByItemCode = async itemCode => { + if (!itemCode) return null; return await app.model.StockStore.findOne({ where: { - item_code: orderLine[i].itemCode, + item_code: itemCode, app_key: appKey, warehouse_id: warehouseId, store_id: storeId, }, transaction }); }; - if (!orderLine[i].itemId) { - wms_stock = await findByItemCode(); - } else { - wms_stock = await app.model.StockStore.findByPk(orderLine[i].itemId, { transaction }); + // itemId 必须是纯数字且在 BIGINT 范围内才可作为商品主键使用, + // 非法值(如带中文后缀的编码)视为未提供,降级按 item_code 匹配 + const validItemId = isValidItemId(line.itemId) ? String(line.itemId) : null; + if (validItemId) { + wms_stock = await app.model.StockStore.findByPk(validItemId, { transaction }); // 校验 StockStore 记录的 store_id 与当前上下文一致,防止跨货主越权 if (wms_stock && Number(wms_stock.store_id) !== Number(storeId)) { wms_stock = null; } - // 外部渠道 itemId 可能是平台商品标识或条码而非 WMS 主键, - // 主键查不到或跨货主时降级按 item_code 查找,避免误报“未同步推送到仓库” - if (!wms_stock) { - wms_stock = await findByItemCode(); + } + // 匹配优先级:itemId 主键 > itemCode 精确匹配 > itemCode 归一化条码匹配 + // 外部渠道 itemId 可能是平台商品标识或条码而非 WMS 主键,主键查不到时降级按 item_code 查找 + if (!wms_stock) { + wms_stock = await findByItemCode(lineItemCode); + } + // 带中文后缀的编码(如 6934864201409-新品)精确匹配不到时, + // 剥离后缀按纯数字条码与 StockStore.item_code 对齐匹配 + if (!wms_stock) { + const normalizedBarcode = normalizeItemCodeForMatch(lineItemCode); + if (normalizedBarcode && normalizedBarcode !== lineItemCode) { + const normalizedRows = await app.model.StockStore.findAll({ + where: { + item_code: normalizedBarcode, + app_key: appKey, + warehouse_id: warehouseId, + store_id: storeId, + }, + transaction, + }); + if (normalizedRows.length === 1) { + wms_stock = normalizedRows[0]; + } else if (normalizedRows.length > 1) { + // 同一归一化条码对应多个商品,无法确定唯一 SKU,按失败处理,避免错配 + errors.push(`订单行${lineNo}:编码《${lineItemCode}》归一化条码《${normalizedBarcode}》匹配到多个商品,请人工核对后重试`); + continue; + } } } if (!wms_stock) { - errors.push(`SKU${orderLine[i].itemId}商品《${orderLine[i].itemName}》编码《${orderLine[i].itemCode}》\n未同步推送到仓库`); + errors.push(`订单行${lineNo}:SKU${lineItemId}商品《${lineItemName}》编码《${lineItemCode}》\n未同步推送到仓库`); continue; } if (!wms_stock.stock_id) { - errors.push(`SKU${orderLine[i].itemId}商品《${orderLine[i].itemName}》编码《${orderLine[i].itemCode}》wms无对应关系\n请联系仓库关联创建商品`); + errors.push(`订单行${lineNo}:SKU${lineItemId}商品《${lineItemName}》编码《${lineItemCode}》wms无对应关系\n请联系仓库关联创建商品`); continue; } - wms_stock.inventory_type = orderLine[i].inventoryType || 'ZP'; - wms_stock.order_line_no = orderLine[i].orderLineNo || i + 1; - wms_stock.count = orderLine[i].planQty; - wms_stock.item_id = orderLine[i].itemId || wms_stock.id; + wms_stock.inventory_type = line.inventoryType || 'ZP'; + wms_stock.order_line_no = line.orderLineNo || i + 1; + wms_stock.count = line.planQty; + // item_id 统一写入实际匹配到的 StockStore 主键 id(纯数字), + // 避免中文后缀等非数字值写入 BIGINT 列触发 MySQL 严格模式报错 + wms_stock.item_id = wms_stock.id; items.push(wms_stock); } if (errors.length > 0) { @@ -114,7 +184,9 @@ class entryOrderService extends Service { const item = items[i]; const res = await this.addItems(item, orderId, transaction); if (!res.success) { - errors.push(`SKU${item.itemId}商品《${item.itemName}》编码《${item.itemCode}》入库失败,错误信息:${res.error}`); + // item.item_id / item.item_name / item.item_code 均取自校验阶段实际匹配到的 StockStore 实例, + // 保证失败行展示真实的 SKU 主键、商品名称与商品编码 + errors.push(`订单行${item.order_line_no}:SKU${item.item_id}商品《${item.item_name}》编码《${item.item_code}》入库失败,错误信息:${res.error}`); } } @@ -797,6 +869,15 @@ class entryOrderService extends Service { } } + /** + * 添加入库单明细行(按 order_line_no 幂等去重)。 + * 写入前将 item_id 强制转为合法数字,非法值兜底为 0, + * 避免中文后缀等非数字值写入 BIGINT 列触发 MySQL 严格模式报错。 + * @param {Object} item 明细行数据(来自 StockStore 实例并附加了 order_line_no / count / item_id 等字段) + * @param {number} orderId 入库单 ID + * @param {Object|null} [transaction=null] 可选事务对象 + * @return {Promise} { success, code, message? } 成功时 code=1 + */ async addItems(item, orderId, transaction = null) { const { ctx } = this; @@ -814,6 +895,8 @@ class entryOrderService extends Service { if (!existingOrderItem) { try { + // item_id 必须是合法数字(StockStore 主键),非法值兜底为 0 + const numericItemId = Number(item.item_id); // 构建入库明细数据 const entryItemsData = { order_id: orderId, @@ -821,7 +904,7 @@ class entryOrderService extends Service { order_line_no: item.order_line_no || '', owner_code: item.owner_code || '', item_code: item.item_code || '', - item_id: item.item_id || 0, + item_id: Number.isFinite(numericItemId) ? numericItemId : 0, count: item.count || 0, inventory_type: item.inventory_type || '', stock_id: item.stock_id || '', diff --git a/app/service/systems/inbound_direct_log.js b/app/service/systems/inbound_direct_log.js index 0b9e309..c51b69c 100644 --- a/app/service/systems/inbound_direct_log.js +++ b/app/service/systems/inbound_direct_log.js @@ -1193,6 +1193,13 @@ class InboundDirectLogService extends Service { }); await transaction.commit(); + + // 入库完成通知货主(失败不影响主流程) + try { + await this.notifyEntryOrderCompleted(eo); + } catch (noticeErr) { + ctx.logger.warn('[inbound_direct_log.commit] 入库完成通知货主失败,不影响业务', noticeErr); + } } catch (error) { if (transaction && typeof transaction.rollback === 'function') { await transaction.rollback(); @@ -1229,6 +1236,72 @@ class InboundDirectLogService extends Service { }; } + /** + * 发送入库单完成入库通知(entry_order_completed)。 + * 文案固定为:入库单号{入库单号}已完成入库,请注意查收。 + * 路由由 notice 固定订阅回退链处理:货主收货群 → 无则货主售后群 → 均无则仓库异常群。 + * 通知失败不影响入库主流程(由调用方 try/catch 包裹)。 + * @param {Object} entryOrder 入库单快照(含 entry_order_code / warehouse_id / store_id) + * @return {Promise} 通知发送结果,通知服务不可用或参数不完整时返回 null + */ + async notifyEntryOrderCompleted(entryOrder = {}) { + const { ctx } = this; + const { + id = null, + entry_order_code: entryOrderCodeRaw = '', + warehouse_id: warehouseIdRaw = 0, + store_id: storeIdRaw = 0, + } = entryOrder || {}; + + const rawNoticeService = ctx && ctx.service && ctx.service.systems && ctx.service.systems.notice; + const noticeService = rawNoticeService && typeof rawNoticeService.send === 'function' + ? rawNoticeService + : (rawNoticeService && rawNoticeService.index && typeof rawNoticeService.index.send === 'function' + ? rawNoticeService.index + : null); + + if (!noticeService) return null; + + const warehouseId = Number(warehouseIdRaw || (ctx.user && ctx.user.store_id) || 0); + const storeId = Number(storeIdRaw || 0); + if (!Number.isFinite(warehouseId) || warehouseId <= 0 || !Number.isFinite(storeId) || storeId <= 0) { + return null; + } + + const entryOrderCode = String(entryOrderCodeRaw || id || '').trim(); + if (!entryOrderCode) return null; + + const content = `入库单号${entryOrderCode}已完成入库,请注意查收`; + + return await noticeService.send({ + warehouseId, + storeId, + messageType: 'text', + businessName: 'entry_order', + event: 'entry_order_completed', + channel: 'warehouse', + title: `入库单${entryOrderCode}已完成入库`, + content, + storeContent: content, + businessId: id, + subject: { + id: warehouseId, + type: 'warehouse', + name: String((ctx.user && (ctx.user.store_name || ctx.user.company_name)) || ''), + }, + sender: { + id: (ctx.user && (ctx.user.employees_id || ctx.user.id)) || null, + name: (ctx.user && ctx.user.employees_name) || '', + }, + metadata: { + entryOrderId: id, + entryOrderCode, + warehouseId, + storeId, + }, + }); + } + /** * OpenAPI 回传:查询 ApiApp 回调地址并 POST 回传。 * @param {Object} entryOrder 入库单 diff --git a/app/service/systems/notice/index.js b/app/service/systems/notice/index.js index ed67f7d..3f6c5ef 100644 --- a/app/service/systems/notice/index.js +++ b/app/service/systems/notice/index.js @@ -28,6 +28,7 @@ const DEFAULT_REGISTERED_EVENT_CODES = Object.freeze([ 'receiving_reviewed', 'receiving_store_bound', 'receiving_store_unmatched', + 'entry_order_completed', 'order_cancel_intercepted', 'wave_strategy_quick_scan_failed', 'store_warehouse_print_quantity_adjusted', @@ -73,6 +74,15 @@ const FIXED_GROUP_SUBSCRIPTIONS = Object.freeze({ ]), }), ]), + entry_order_completed: Object.freeze([ + Object.freeze({ + groupType: 'store', + subType: 'receiving', + fallbackTargets: Object.freeze([ + Object.freeze({ groupType: 'store', subType: 'after_sales' }), + ]), + }), + ]), order_cancel_intercepted: Object.freeze([ Object.freeze({ groupType: 'warehouse', subType: 'exception' }), ]), diff --git a/app/service/systems/report.js b/app/service/systems/report.js index 318c041..024f0e9 100644 --- a/app/service/systems/report.js +++ b/app/service/systems/report.js @@ -303,33 +303,6 @@ class ReportService extends Service { }; } - /** - * 读取报表前端可读的列元数据(全量注册字段 + 勾选标记 + 窗口参数,不执行真实数据查询)。 - * @param {Object} options 入参 - * @param {number|string} options.reportId 报表定义ID - * @return {Promise} { id, name, type, file_name, window: {dayCount, cutoverHour}, fields } - */ - async getMeta({ reportId }) { - const definition = await this.getDefinition(reportId); - const entry = this.resolveTypeEntry(definition.type); - const selectedSet = new Set(definition.fields); - - return { - id: definition.id, - name: definition.name, - type: definition.type, - file_name: definition.file_name, - window: { - dayCount: Number((entry.window && entry.window.dayCount) || 7), - cutoverHour: Number((entry.window && entry.window.cutoverHour) || 7), - }, - fields: (Array.isArray(entry.fields) ? entry.fields : []).map(field => ({ - ...field, - selected: selectedSet.has(field.key), - })), - }; - } - /** * 新增/更新报表定义(按 id upsert;未传 id 视为新增)。 * 更新语义:未传入的字段(undefined)不覆盖既有值;传入非法值会校验报错。 diff --git a/app/service/systems/report/queries/index.js b/app/service/systems/report/queries/index.js index 45c85a5..36d80f2 100644 --- a/app/service/systems/report/queries/index.js +++ b/app/service/systems/report/queries/index.js @@ -8,7 +8,7 @@ const sevenDayStockFlow = require('./sevenDayStockFlow'); * 新增查询器时在此登记,签名统一为 * async ({ ctx, storeId, warehouseId, params }) => ({ windows, rows, meta })。 * 每个查询器需在模块上挂载静态字段清单 `fields`(如 module.exports.fields) - * 与缺省窗口参数 `defaultWindow`,供报表引擎 report.meta / report.definition.typeList 读取。 + * 与缺省窗口参数 `defaultWindow`,供报表引擎 report.definition.typeList 读取。 * 注意:该对象会作为 service 模块导出,egg 加载器需要在其上挂载 * `Symbol(EGG_LOADER_ITEM_FULLPATH)` 等内部符号,因此禁止对导出对象使用 * Object.freeze / Object.seal / Object.preventExtensions。 @@ -36,7 +36,7 @@ const DESCRIPTIONS = [ ]; /** - * 输出注册表可读描述(含全量字段清单),供 report.definition.typeList / report.meta 复用。 + * 输出注册表可读描述(含全量字段清单),供 report.definition.typeList 复用。 * 返回副本,避免调用方误改注册表元数据。 * @return {Array<{key: string, title: string, description: string, window: Object, fields: Array}>} 注册描述列表 */ diff --git a/app/service/systems/report/queries/sevenDayStockFlow.js b/app/service/systems/report/queries/sevenDayStockFlow.js index 6d541d4..c18d620 100644 --- a/app/service/systems/report/queries/sevenDayStockFlow.js +++ b/app/service/systems/report/queries/sevenDayStockFlow.js @@ -278,5 +278,5 @@ async function sevenDayStockFlow({ ctx, storeId = null, warehouseId = null, para module.exports = sevenDayStockFlow; // 静态字段清单挂到查询器模块上,供报表引擎与注册表 describe 读取(不执行真实数据查询) module.exports.fields = FIELDS; -// 缺省窗口参数挂到查询器模块上,供注册表 describe 与 report.meta 读取 +// 缺省窗口参数挂到查询器模块上,供注册表 describe 与 report.definition.typeList 读取 module.exports.defaultWindow = DEFAULT_WINDOW; diff --git a/app/service/systems/reportDelivery.js b/app/service/systems/reportDelivery.js index ee00c6b..9fed600 100644 --- a/app/service/systems/reportDelivery.js +++ b/app/service/systems/reportDelivery.js @@ -424,8 +424,8 @@ class ReportDeliveryService extends Service { * 2. storeIds 必须为非空数组且元素为正整数,自动去重; * 与源计划 store_id 相同的项计入 skipped(原因:与源计划货主相同), * 全部剔除后为空时仍正常返回(created=[],skipped 标注原因); - * 3. 目标货主必须在 wms_store 存在且状态正常(status=1,软删自动排除), - * 不存在或不合法者计入 skipped(原因:货主不存在或状态异常); + * 3. 目标货主必须在 wms_store 存在且状态有效(status 为 1 或 2(正常/审核中), + * 软删自动排除),不存在或状态不合法者计入 skipped(原因:货主不存在或状态异常); * 4. 目标货主已存在同 report_definition_id 的计划(软删排除)时跳过 * (原因:已存在同报表定义计划),不覆盖不报错; * 5. 新建计划时 notify_group_ids / notify_member_ids 置空(null,通知配置不复制), @@ -486,7 +486,7 @@ class ReportDeliveryService extends Service { } } - // 目标货主存在性校验(wms_store 状态正常 status=1,软删自动排除) + // 目标货主存在性校验(wms_store status 为 1 或 2(正常/审核中)均有效,软删自动排除) const validTargets = []; if (candidates.length > 0) { const storeModel = ctx.model && ctx.model.Store; @@ -495,7 +495,7 @@ class ReportDeliveryService extends Service { } const { Op } = ctx.app.Sequelize; const storeRows = await storeModel.findAll({ - where: { id: { [Op.in]: candidates }, status: 1 }, + where: { id: { [Op.in]: candidates }, status: { [Op.in]: [ 1, 2 ] } }, attributes: [ 'id' ], raw: true, }); diff --git a/app/service/systems/storage/entry.js b/app/service/systems/storage/entry.js index 02c09dd..e8c73da 100644 --- a/app/service/systems/storage/entry.js +++ b/app/service/systems/storage/entry.js @@ -1872,6 +1872,13 @@ class EntryService extends Service { }); await transaction.commit(); + + // 入库完成通知货主(失败不影响主流程) + try { + await ctx.service.systems.inboundDirectLog.notifyEntryOrderCompleted(eo); + } catch (noticeErr) { + ctx.logger.warn('[storage.entry.quickInbound] 入库完成通知货主失败,不影响业务', noticeErr); + } } catch (error) { if (transaction && typeof transaction.rollback === 'function') { await transaction.rollback(); diff --git a/app/service/systems/storage/inventory.js b/app/service/systems/storage/inventory.js index 5b2e918..8a11bb5 100644 --- a/app/service/systems/storage/inventory.js +++ b/app/service/systems/storage/inventory.js @@ -2434,6 +2434,13 @@ class InventoryService extends Service { // ────────── 13. 提交事务 ────────── await transaction.commit(); + // 入库完成通知货主(失败不影响主流程) + try { + await ctx.service.systems.inboundDirectLog.notifyEntryOrderCompleted(entryOrder); + } catch (noticeErr) { + ctx.logger.warn('[inventory.directPutaway] 入库完成通知货主失败,不影响业务', noticeErr); + } + ctx.logger.info(`[inventory.directPutaway] 直入库存完成 entryOrderId=${entryOrderId} receivingId=${receivingId} lines=${pendingDetails.length}`); return { diff --git a/app/service/systems/store_warehouse.js b/app/service/systems/store_warehouse.js index 8ca8be5..57b04b1 100644 --- a/app/service/systems/store_warehouse.js +++ b/app/service/systems/store_warehouse.js @@ -1439,20 +1439,16 @@ class SettingStoreWarehouseService extends Service { } /** - * 货主侧查询签约关系列表(兼容新旧签约数据)。 + * 构建货主侧签约列表查询条件(仓库在 warehouse_id 方,对方货主在 store_id 方)。 * - * 使用 OR 查询 store_id / warehouse_id 两边,确保新旧签约数据都能被正确展示。 + * 供 listForStore / exportListForStore 复用,保证列表与导出的筛选语义一致。 * - * @param {Object} [data={}] 请求参数。 - * @return {Promise} 接口响应对象。 + * @param {Object} data 请求参数。 + * @param {Object} currentSubject 当前主体。 + * @return {Object} where 查询条件。 */ - async listForStore(data = {}) { - const { ctx, app } = this; - const { Op } = app.Sequelize; - const currentSubject = await this.getCurrentSubject(); - const page = this.normalizePage(data.page, 'page', 1, 1000000); - const pageSize = this.normalizePage(data.page_size || data.pageSize, 'page_size', 20, 200); - const offset = (page - 1) * pageSize; + buildListForStoreWhere(data = {}, currentSubject) { + const { Op } = this.app.Sequelize; // 仓库查看自己签约的货主列表:仓库在 warehouse_id 方,货主在 store_id 方 const where = { @@ -1491,6 +1487,27 @@ class SettingStoreWarehouseService extends Service { ]; } + return where; + } + + /** + * 货主侧查询签约关系列表(兼容新旧签约数据)。 + * + * 使用 OR 查询 store_id / warehouse_id 两边,确保新旧签约数据都能被正确展示。 + * + * @param {Object} [data={}] 请求参数。 + * @return {Promise} 接口响应对象。 + */ + async listForStore(data = {}) { + const { ctx } = this; + const currentSubject = await this.getCurrentSubject(); + const page = this.normalizePage(data.page, 'page', 1, 1000000); + const pageSize = this.normalizePage(data.page_size || data.pageSize, 'page_size', 20, 200); + const offset = (page - 1) * pageSize; + + // 仓库查看自己签约的货主列表:仓库在 warehouse_id 方,货主在 store_id 方 + const where = this.buildListForStoreWhere(data, currentSubject); + const { rows, count } = await ctx.model.StoreWarehouse.findAndCountAll({ where, include: this.getRelationIncludes(), @@ -1541,6 +1558,174 @@ class SettingStoreWarehouseService extends Service { }; } + /** + * 导出货主侧签约列表(与 storeWarehouse.store.list / listForStore 筛选语义一致)。 + * + * 全量查询当前主体(仓库在 warehouse_id 方)可见的签约关系,生成 Excel 上传至 COS。 + * 忽略分页参数,复用 buildListForStoreWhere 的筛选条件;每行输出与 listForStore 对齐的 + * 序列化字段(含 has_qimen_config、needs_my_confirm),并对角色/启用状态/有效性等做中文展示。 + * + * @param {Object} [data={}] 请求参数(与 listForStore 一致,page/page_size 被忽略)。 + * @return {Promise} 包含 filename、fileKey、url、cdnUrl、cosUrl、total_count 的对象。 + */ + async exportListForStore(data = {}) { + const { ctx } = this; + const currentSubject = await this.getCurrentSubject(); + const where = this.buildListForStoreWhere(data, currentSubject); + + // 全量查询所有匹配记录(不翻页),与列表使用相同关联与排序 + const rows = await ctx.model.StoreWarehouse.findAll({ + where, + include: this.getRelationIncludes(), + order: [[ 'updated_at', 'DESC' ], [ 'id', 'DESC' ]], + }); + + // 奇门配置映射(与列表一致) + const contractIds = rows.map(item => Number(item.id || 0)).filter(id => id > 0); + const qimenConfigMap = contractIds.length + ? await this.getQimenConfigMap(contractIds) + : new Map(); + + // 生成 Excel + const tempDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'store_relation_export_')); + const filename = `货主签约列表_${currentSubject.id}_${Date.now()}.xlsx`; + const filePath = path.join(tempDir, filename); + + const workbook = new ExcelJS.stream.xlsx.WorkbookWriter({ + filename: filePath, + useStyles: true, + useSharedStrings: true, + }); + const worksheet = workbook.addWorksheet('货主签约列表'); + + worksheet.columns = [ + { header: '签约关系ID', key: 'id', width: 14 }, + { header: '货主ID', key: 'store_id', width: 10 }, + { header: '货主名称', key: 'store_name', width: 24 }, + { header: '仓库ID', key: 'warehouse_id', width: 10 }, + { header: '仓库名称', key: 'warehouse_name', width: 24 }, + { header: '对方主体ID', key: 'counterparty_id', width: 12 }, + { header: '对方主体名称', key: 'counterparty_name', width: 24 }, + { header: '对方主体角色', key: 'counterparty_role_label', width: 12 }, + { header: '备注名', key: 'remask', width: 20 }, + { header: '当前视角启用状态', key: 'use_status_label', width: 16 }, + { header: '货主侧启用状态', key: 'store_use_status_label', width: 16 }, + { header: '仓库侧启用状态', key: 'warehouse_use_status_label', width: 16 }, + { header: '签约状态', key: 'auth_status_label', width: 12 }, + { header: '签约是否有效', key: 'is_auth_valid_label', width: 14 }, + { header: '剩余有效天数', key: 'remaining_days', width: 14 }, + { header: '面单余额', key: 'print_quantity', width: 12 }, + { header: '锁定面单余额', key: 'print_quantity_locked', width: 14 }, + { header: '授权开始时间', key: 'auth_start', width: 22 }, + { header: '授权结束时间', key: 'auth_end', width: 22 }, + { header: '实际结束时间', key: 'actual_end', width: 22 }, + { header: '申请时间', key: 'apply_time', width: 22 }, + { header: '审核时间', key: 'review_time', width: 22 }, + { header: '申请原因', key: 'apply_reason', width: 30 }, + { header: '审核评语', key: 'review_comment', width: 30 }, + { header: '是否已配置奇门', key: 'has_qimen_config_label', width: 16 }, + { header: '是否需要我确认', key: 'needs_my_confirm_label', width: 16 }, + ]; + + const roleLabel = role => { + if (role === 'warehouse') return '仓库'; + if (role === 'store') return '货主'; + return role ? String(role) : ''; + }; + const statusLabel = value => (Number(value) === 1 ? '启用' : '禁用'); + const yesNoLabel = value => (value ? '是' : '否'); + + for (const item of rows) { + const serialized = this.serializeRelation(item, currentSubject); + const hasQimenConfig = qimenConfigMap.has(serialized.id); + worksheet.addRow({ + id: serialized.id, + store_id: serialized.store_id, + store_name: serialized.store_name || '', + warehouse_id: serialized.warehouse_id, + warehouse_name: serialized.warehouse_name || '', + counterparty_id: serialized.counterparty_id, + counterparty_name: serialized.counterparty_name || '', + counterparty_role_label: roleLabel(serialized.counterparty_role), + remask: serialized.remask || '', + use_status_label: statusLabel(serialized.use_status), + store_use_status_label: statusLabel(serialized.store_use_status), + warehouse_use_status_label: statusLabel(serialized.warehouse_use_status), + auth_status_label: serialized.auth_status_label || '', + is_auth_valid_label: yesNoLabel(serialized.is_auth_valid), + remaining_days: serialized.remaining_days, + print_quantity: serialized.print_quantity, + print_quantity_locked: serialized.print_quantity_locked, + auth_start: serialized.auth_start ? String(serialized.auth_start) : '', + auth_end: serialized.auth_end ? String(serialized.auth_end) : '', + actual_end: serialized.actual_end ? String(serialized.actual_end) : '', + apply_time: serialized.apply_time ? String(serialized.apply_time) : '', + review_time: serialized.review_time ? String(serialized.review_time) : '', + apply_reason: serialized.apply_reason || '', + review_comment: serialized.review_comment || '', + has_qimen_config_label: yesNoLabel(hasQimenConfig), + needs_my_confirm_label: yesNoLabel( + Number(item.auth_status || 0) === 1 + && Number(item.initiator_subject_id || 0) !== currentSubject.id + ), + }).commit(); + } + + worksheet.commit(); + await workbook.commit(); + + // 上传至 COS + const uploadService = ctx.service && ctx.service.systems && ctx.service.systems.upload; + let uploadResult = {}; + if (uploadService && typeof uploadService.uploadFile === 'function') { + const stat = await fsp.stat(filePath); + const uploadStream = fs.createReadStream(filePath); + uploadStream.filename = filename; + uploadStream.mimeType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + uploadStream.fileSize = stat.size; + + uploadResult = await uploadService.uploadFile(uploadStream, { + key: `export/store_relation/${currentSubject.id}/${filename}`, + category: 'document', + mimetype: 'xls,xlsx,csv', + }); + + if (typeof uploadService.uploadSuccessNotify === 'function') { + await uploadService.uploadSuccessNotify({ + url: uploadResult.fileName, + fileKey: uploadResult.fileName, + fileName: filename, + fileType: 'document', + mimeType: uploadStream.mimeType, + fileSize: stat.size, + category: 'document', + businessType: 'storeRelationListExport', + businessId: String(currentSubject.id), + uploaderType: ctx.user?.role || 'system_api', + uploaderDept: ctx.user?.department || '', + }).catch(err => { + ctx.logger.warn('[storeWarehouse.exportListForStore] 上传通知失败: %s', err.message); + }); + } + } + + // 清理临时文件 + try { + await fsp.rm(tempDir, { recursive: true, force: true }); + } catch (cleanErr) { + ctx.logger.warn('[storeWarehouse.exportListForStore] 清理临时文件失败: %s', cleanErr.message); + } + + return { + filename, + fileKey: uploadResult.fileName || '', + url: uploadResult.url || uploadResult.cdnUrl || uploadResult.cosUrl || '', + cdnUrl: uploadResult.cdnUrl || uploadResult.url || '', + cosUrl: uploadResult.cosUrl || '', + total_count: rows.length, + }; + } + /** * 仓库侧查询签约关系列表(兼容新旧签约数据)。 * @@ -3100,7 +3285,7 @@ class SettingStoreWarehouseService extends Service { * @param {string} [data.auth_end] 可选,授权结束日期。 * @param {number} [data.print_quantity=0] 可选,初始面单余额。 * @param {string} [data.apply_reason='仓库代开户'] 可选,申请原因。 - * @param {string} [data.store_remask] 可选,货主备注名(≤50字符)。 + * @param {string} [data.store_remask] 可选,货主备注名(≤50字符);不传或为空时默认取公司全称(截断 50 字符)填充。 * @param {string} [data.warehouse_remask] 可选,仓库备注名(≤50字符)。 * @return {Promise} 包含 store_id、account_id、contract_id、company_name、username 的响应对象。 * @throws {Error} 当前主体不是仓库时抛出 403,账号/公司名重复时抛出 409,参数校验失败时抛出 400。 @@ -3216,9 +3401,11 @@ class SettingStoreWarehouseService extends Service { store_use_status: 1, }; - if (storeRemask !== null) { - relationData.store_remask = storeRemask; - } + // store_remask 兜底:代开户未传货主备注名(或传空)时,默认取公司全称前 50 字符, + // 保证货主名称(签约表 store_remask 优先)在列表/导出中始终有值,与项目回退 company_name 口径一致 + relationData.store_remask = storeRemask + ? storeRemask + : String(store.company_name || '').slice(0, 50); if (warehouseRemask !== null) { relationData.warehouse_remask = warehouseRemask; } diff --git a/app/service/systems/workbench.js b/app/service/systems/workbench.js index 2acffba..7242da6 100644 --- a/app/service/systems/workbench.js +++ b/app/service/systems/workbench.js @@ -1483,6 +1483,7 @@ class WorkbenchService extends Service { stock_unit: stock.stock_unit || '', barcodes: stock.barcodes || [], image_url: stock.image_url || '', + packing_requirements: String(stock.packing_requirements || '').trim(), }; }); } diff --git a/docs/report-config-guide.md b/docs/report-config-guide.md index f3fdb05..6c7e328 100644 --- a/docs/report-config-guide.md +++ b/docs/report-config-guide.md @@ -53,7 +53,7 @@ report.generate(method 层,异步任务,入参 report_id) `stockFlow` 缺省窗口参数:`window = { dayCount: 7, cutoverHour: 7 }`。 -`stockFlow` 全量字段清单(16 个顶层字段,`report.definition.typeList` / `report.meta` 直接返回该规格): +`stockFlow` 全量字段清单(16 个顶层字段,`report.definition.typeList` 直接返回该规格): | key | label | type | computed | asText | 说明 | |---|---|---|---|---|---| @@ -226,38 +226,30 @@ report.generate(method 层,异步任务,入参 report_id) - 保存成功后响应即报表定义视图: `{ id, name, type, file_name, fields, is_enabled, remark, created_at, updated_at }`。 -## 7. report.definition.typeList / report.meta(前端元数据接口) +## 7. report.definition.typeList(前端元数据接口) ### 7.1 用途 -- `report.definition.typeList`:免权限只读(仅登录),返回注册类型清单 - `[{ key, title, description, window, fields }]`,供前端报表设计器渲染「报表类型」选择与字段树。 -- `report.meta`:免权限只读(仅登录,保留审计日志),按 `report_id` 返回 - `report_id/name/type/file_name/window/fields`(fields 含 `selected` 勾选标记与 `asText` 标记), - **不执行真实数据查询**。 +`report.definition.typeList`:免权限只读(仅登录),返回注册类型清单 +`[{ key, title, description, window, fields }]`,供前端报表设计器渲染「报表类型」选择与字段树。 -实现:`report.definition.typeList` → `app/service/systemMethods/report/definition.js` → `systems/report.js listRegisteredTypes`; -`report.meta` → `app/service/systemMethods/report.js` → `systems/report.js getMeta`。 +实现:`report.definition.typeList` → `app/service/systemMethods/report/definition.js` → `systems/report.js listRegisteredTypes`。 > 鉴权/日志口径:`report.definition.typeList` 在 `definition.js` 的 `systemInit` 名单内 > (`_noNeedRight/_noNeedAuth/_noNeedLog='typeList'`:免权限 + 免鉴权 + 不写审计日志,仅登录; -> 同模块 `save/list/delete` 未声明免权限,仍需授权);`report.meta` 在 `_noNeedRight/_noNeedAuth` 名单内 -> (免权限 + 免仓库有效期校验,仅登录),未列入 `_noNeedLog` → **保留审计日志** -> (`generate`/`generateTaskProgress` 不写审计日志,二者行为不同)。 +> 同模块 `save/list/delete` 未声明免权限,仍需授权)。 + +> 历史:`report.meta` 已于 2026-08-31 移除(下线)。前端获取窗口参数 +> `window.dayCount/cutoverHour` 请用 `report.definition.typeList`;某报表定义勾选字段 +> 请用 `report.definition.list` 响应中的 `fields` 数组(与 `typeList` 字段树 key 对照)。 ### 7.2 请求示例 ```json // report.definition.typeList(无必填参数) {} - -// report.meta -{ "report_id": 1 } ``` -- `report_id` 与 `reportId` 二选一(均传时优先 `reportId`);为空返回 - `flag=failure, code=0, message=报表ID report_id 必须为正整数`(HTTP 200)。 -- 定义不存在或已停用 → HTTP 500,`接口错误: 报表定义不存在或已停用: id=`。 ### 7.3 响应示例 @@ -284,38 +276,21 @@ report.generate(method 层,异步任务,入参 report_id) } ] } - -// report.meta -{ - "flag": "success", - "code": 1, - "message": "ok", - "report_id": 1, - "name": "库存变化以及补货报表", - "type": "stockFlow", - "file_name": "库存变化_{date}.xlsx", - "window": { "dayCount": 7, "cutoverHour": 7 }, - "fields": [ - { "key": "item_code", "label": "商品编码", "type": "string", "asText": true, "selected": true }, - { "key": "barcode", "label": "条码", "type": "string", "asText": true, "selected": false } - ] -} ``` -字段元素结构:`{ key, label, type, computed?, asText?, children?, selected? }`: +字段元素结构:`{ key, label, type, computed?, asText?, children? }`: - `type`:`string` / `number` / `boolean` / `array`; - `computed: true`:预计算字段(非原始表字段,如 `suggest`/`warn`); - `asText: true`:该列以文本单元格落地(由类型字段规格硬编码,如 `item_code`/`barcode`); -- `children`:数组类型字段的子字段(如 `daily` 的 `ck`/`rk`); -- `selected`(仅 `report.meta` 返回):该报表定义是否勾选此字段。 +- `children`:数组类型字段的子字段(如 `daily` 的 `ck`/`rk`)。 ### 7.4 前端如何获取可用字段 1. 调用 `method=report.definition.typeList`(`POST /system`,header 带 `Authorization: Bearer ` 与 `platform`) - 获取全部注册类型与字段树; + 获取全部注册类型与字段树(含窗口参数 `window.dayCount/cutoverHour`); 2. 保存报表定义时按类型字段树勾选 `fields`(`method=report.definition.save`); -3. 渲染/导出前调用 `method=report.meta`(入参 `report_id`)取窗口参数 `window.dayCount/cutoverHour` 与勾选标记 `selected`; +3. 渲染/导出前用 `report.definition.list` 取该报表定义已勾选的 `fields` 数组(与 `typeList` 字段树 key 对照); 4. 导出 sheet 的列由「勾选字段 × 类型硬编码规格」自动生成,前端无需下发任何列配置。 ## 8. 报表定义管理接口(report.definition.save / list / delete) diff --git a/methods/changes/openapi.json b/methods/changes/openapi.json index 02014e4..920c880 100644 --- a/methods/changes/openapi.json +++ b/methods/changes/openapi.json @@ -1,4 +1,22 @@ [ + { + "version": "2026.08.30-openapi-entryorder-create-item-match-fix", + "date": "2026-08-30", + "summary": "entryorder.create 商品匹配修复文档同步(与奇门渠道共用 addOrder 逻辑):三级匹配策略(itemId 主键直查 > itemCode 精确匹配 > 归一化条码匹配)、编码支持中文后缀、item_id 统一写入 StockStore 数字主键、失败信息回显真实 SKU/商品/编码并附订单行号", + "methods": [ + "entryorder.create" + ], + "notes": [ + "商品匹配三级策略:itemId 主键直查(纯数字且不超 BIGINT 范围、货主一致)> itemCode 精确匹配 > itemCode 归一化条码匹配(取编码开头连续数字)", + "带中文后缀编码精确匹配不到时按归一化条码对齐;归一化命中多商品时报错不静默", + "item_id 统一写入实际匹配到的 StockStore 数字主键 id,修复 Data truncated for column 'item_id'", + "itemId 字段类型说明更新为 string|number(可接收带后缀的字符串,非纯数字视为未提供)", + "失败信息回显真实 SKU/商品/编码并附订单行号(未同步推送到仓库 / wms无对应关系 / 归一化匹配到多个商品)", + "测试:OpenAPI 渠道中文后缀编码重放回归通过(T5),10 passing / 0 failing(2026-08-30)" + ], + "type": "updated", + "module": "entryorder" + }, { "version": "2026.08.27-openapi-service-conflict-fix", "date": "2026-08-27", diff --git a/methods/changes/qimen.json b/methods/changes/qimen.json index e92ae8d..11388bd 100644 --- a/methods/changes/qimen.json +++ b/methods/changes/qimen.json @@ -1,4 +1,22 @@ [ + { + "version": "2026.08.30-entryorder-create-item-match-fix", + "date": "2026-08-30", + "summary": "entryorder.create 商品匹配修复文档同步:明细行商品匹配三级策略(itemId 主键直查 > itemCode 精确匹配 > itemCode 归一化条码匹配)、编码支持中文后缀、item_id 统一写入 StockStore 数字主键、失败信息回显真实 SKU/商品/编码并附订单行号", + "methods": [ + "entryorder.create" + ], + "notes": [ + "商品匹配三级策略:itemId 主键直查(纯数字且不超 BIGINT 范围、货主一致)> itemCode 精确匹配 > itemCode 归一化条码匹配(取编码开头连续数字)", + "带中文后缀编码(如 6934864201409-新品、6902226688892-赠品装)精确匹配不到时按归一化条码对齐;归一化命中多商品时报错不静默", + "item_id 统一写入实际匹配到的 StockStore 数字主键 id,修复 Data truncated for column 'item_id'", + "失败信息回显真实 SKU/商品/编码并附订单行号(未同步推送到仓库 / wms无对应关系 / 归一化匹配到多个商品)", + "测试:新增 qimen.entryorder.match.regression.test.js、entry_order.match.unit.test.js,修正 qimen.entryorder.create.status.test.js,10 passing / 0 failing(2026-08-30)", + "代码依据:app/service/systems/entry_order.js addOrder,qimenMethods/entryorder.js 与 openapiMethods/entryorder.js 共用同一逻辑" + ], + "type": "updated", + "module": "entryorder" + }, { "version": "2026.08.25-stockout-create-express-fallback-zt", "date": "2026-08-25", diff --git a/methods/changes/system.json b/methods/changes/system.json index 3e99e45..61979c9 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,95 @@ [ + { + "version": "2026.08.31-storeWarehouse.store.openAccount-remask", + "date": "2026-08-31", + "type": "updated", + "summary": "优化 storeWarehouse.store.openAccount:未传 store_remask(或传空)时默认用公司全称填充 wms_store_warehouse.store_remask(截断 50 字符),保证货主名称在列表/导出中始终有值", + "methods": [ + "storeWarehouse.store.openAccount" + ], + "notes": [ + "app/service/systems/store_warehouse.js openAccount:签约关系创建时 store_remask 兜底为 store.company_name 前 50 字符(仅当未传 store_remask 或传空时),与项目“货主名称 store_remask 优先、无备注回退 company_name”口径一致", + "methods/system.json 货主-仓库签约模块(module=storeWarehouse.store):openAccount 的 store_remask 参数描述补充默认值说明,版本 0.3.62 -> 0.3.63(docMeta.version),updatedAt 保持 2026-08-31", + "本次为行为变更:新开户且未传 store_remask 时签约表 store_remask 将写入公司全称;已存在的历史开户数据不受影响(如需回填需另行处理)", + "未执行数据库/Redis 操作,未运行测试;测试数据保留不清理" + ], + "module": "storeWarehouse" + }, + { + "version": "2026.08.31-report-meta-removed", + "date": "2026-08-31", + "type": "removed", + "summary": "移除 report.meta(免权限只读列元数据接口):接口下线,前端获取注册字段/窗口参数改由 report.definition.typeList 提供、某报表定义勾选字段经 report.definition.list 的 fields 数组获取。", + "methods": [ + "report.meta" + ], + "notes": [ + "app/service/systemMethods/report.js:删除 meta 方法(含 JSDoc);_noNeedRight/_noNeedAuth 清单移除 meta(保留 generate,generateTaskProgress),免权限口径收窄", + "app/service/systems/report.js:删除 getMeta 方法(仅被 systemMethods report.meta 调用),getDefinition/resolveTypeEntry 仍被 generate/buildWorkbookSheets/定义管理复用不受影响", + "app/service/systemMethods/report/definition.js、app/service/systems/report/queries/index.js、app/service/systems/report/queries/sevenDayStockFlow.js:注释中 report.meta 引用同步清理(改指 report.definition.typeList)", + "methods/system.json 通用报表模块(module=report):删除 report.meta 条目,版本 0.3.61 -> 0.3.62(docMeta.version),updatedAt 保持 2026-08-31", + "AI_METHOD_ROUTING.md:删除 report.meta 表格行,更新 report.generate 鉴权描述(不再提 meta),新增接口移除说明并登记变更版本", + "docs/report-config-guide.md:第 7 节标题与 7.1-7.4 移除 report.meta 相关内容(响应示例/字段 selected 标记/调用步骤),保留 report.definition.typeList 并补充替代说明(窗口参数取 typeList、勾选字段取 definition.list 的 fields)", + "test/report_method_layer.cjs:删除 systemMethods.report.meta 套件;test/report_systems_engine.cjs:删除 systems/report.getMeta 套件并更新文件头覆盖说明;test/scripts/verify_report_delivery_gateway.cjs:移除 report.meta 冒烟调用(generateTaskProgress 保留)", + "权限说明:report.meta 原为免权限(isNeedAuth=false、无 wms_permission 记录),移除后无需任何权限回收操作", + "本次为破坏性变更:前端若仍调用 report.meta 将得到 method 不存在错误,需同步改为 report.definition.typeList + report.definition.list;未执行数据库/Redis 操作,未运行测试,测试数据保留不清理" + ], + "module": "report" + }, + { + "version": "2026.08.31-storeWarehouse.store.export", + "date": "2026-08-31", + "type": "added", + "summary": "新增 storeWarehouse.store.export(提交货主签约列表异步导出任务)与 storeWarehouse.store.exportTaskProgress(按 task_id 查询导出进度与下载链接):筛选条件与 storeWarehouse.store.list 语义一致(keyword/counterparty_id/store_id/auth_status/use_status/warehouse_use_status/id),page/page_size 忽略全量导出;后台生成 26 列中文表头 Excel 并上传 COS。", + "methods": [ + "storeWarehouse.store.export", + "storeWarehouse.store.exportTaskProgress" + ], + "notes": [ + "app/service/systems/store_warehouse.js:抽取 buildListForStoreWhere(data, currentSubject)(仓库在 warehouse_id 方、对方货主在 store_id 方,支持 id/contract_id/relation_id、counterparty_id/store_id、auth_status、use_status/warehouse_use_status、keyword 筛选),listForStore 改用它(行为不变);新增 exportListForStore(data):复用 buildListForStoreWhere + getRelationIncludes 全量查询(updated_at/id 倒序,不翻页、无行数上限),奇门配置经 getQimenConfigMap 映射 has_qimen_config,每行经 serializeRelation 序列化并输出 needs_my_confirm;ExcelJS 流式写入 26 列中文表头(签约关系ID/货主ID/货主名称/仓库ID/仓库名称/对方主体ID/对方主体名称/对方主体角色/备注名/当前视角启用状态/货主侧启用状态/仓库侧启用状态/签约状态/签约是否有效/剩余有效天数/面单余额/锁定面单余额/授权开始时间/授权结束时间/实际结束时间/申请时间/审核时间/申请原因/审核评语/是否已配置奇门/是否需要我确认,角色/启用状态/有效性/奇门/需确认为中文展示),经 systems.upload.uploadFile 上传(key=export/store_relation/{storeId}/{timestamp}_{filename}.xlsx,mimetype xlsx,category=document)并 uploadSuccessNotify 通知,返回 filename/fileKey/url/cdnUrl/cosUrl/total_count", + "app/service/systemMethods/storeWarehouse/store.js:新增 export(提交异步任务,task_id 前缀 store_relation_list_export_,setImmediate 异步执行并逐阶段回写进度:submitted→running(10)→success(100)/failed+error;失败 error 记录 message)与 exportTaskProgress(入参兼容 task_id/taskId,download_url 从 result.url/cdnUrl/cosUrl/fileKey 兜底取,task_id 缺失或缓存未命中返回 status=not_found 正常响应);generateExportTaskId 增加 options.base 自定义基础前缀(默认 print_qty_log 不变,现有 exportPrintQuantityLogs/exportStorePrintQuantityLogs 调用不受影响);systemInit 免权限声明:_noNeedRight/_noNeedAuth 加入 export,exportTaskProgress(异步任务模式,与 order.export 口径一致,无 wms_permission 记录),_noNeedLogin 不含(两接口均需登录,isNeedAuth=false、isNeedLogin=true)", + "methods/system.json 货主-仓库签约模块(module=storeWarehouse.store):新增 storeWarehouse.store.export 与 storeWarehouse.store.exportTaskProgress 两个 method 条目(追加于 createUser 之后),版本 0.3.60 -> 0.3.61(docMeta.version),updatedAt 保持 2026-08-31", + "AI_METHOD_ROUTING.md 本次未同步(storeWarehouse.store 相关行未覆盖导出能力,待后续补)", + "权限说明:export/exportTaskProgress 免权限(无 wms_permission 记录),仅登录可用;本次未扩任何角色授权,不执行权限同步 apply", + "本次仅文档同步,业务代码由 wms-dev-agent 完成,未执行数据库/Redis 操作,未运行测试;测试数据保留不清理" + ], + "module": "storeWarehouse" + }, + { + "version": "2026.08.31-workbench-queryOrder-item-packing-requirements", + "date": "2026-08-31", + "type": "enhanced", + "summary": "workbench.business(queryOrder/query) 响应 items 每项新增 packing_requirements 字段(stock 打包要求,来自 wms_stock_warehouse.packing_requirements,经 getStockDetails 返回,未命中/异常时归一化为空字符串),纯增量字段,不破坏既有调用方。", + "methods": [ + "workbench.business" + ], + "notes": [ + "app/service/systems/workbench.js _queryOrder 步骤4 items 组装:新增 1 行 packing_requirements: String(stock.packing_requirements || '').trim(),stock 未命中(stockMap 兜底 {})或 getStockDetails 异常时取值为空字符串、不抛错;与 items 既有 sku_property/stock_unit 取值风格一致", + "methods/system.json workbench.business queryOrder/query 响应结构:items 字段 description 末尾追加 packing_requirements 字段说明(打包要求,来自 stock,未命中/异常时为空字符串)", + "纯增量字段,params/headers/errors/权限口径(isNeedAuth=false、isNeedLogin=false)均不变,不破坏既有调用方", + "methods/system.json 文档版本 0.3.59 -> 0.3.60(docMeta.version),updatedAt 更新为 2026-08-31", + "本次仅文档同步,业务代码由 wms-dev-agent 完成,未修改 app/ 下任何代码,未执行数据库/Redis 操作,未运行测试" + ], + "module": "workbench" + }, + { + "version": "2026.08.30-report-delivery-plan-copy-target-store-status", + "date": "2026-08-30", + "type": "changed", + "summary": "report.deliveryPlan.copy 目标货主校验语义调整(放宽):目标货主有效性由仅 status=1(正常)放宽为 status 为 1 或 2(正常/审核中)均有效;其余状态(0/3 等)或已软删货主仍计入 skipped(reason「货主不存在或状态异常」文案不变);源计划校验、store_ids 校验、同源跳过、同报表定义计划跳过、通知配置不复制、enabled 原样复制等其余口径均不变。", + "methods": [ + "report.deliveryPlan.copy" + ], + "notes": [ + "app/service/systems/reportDelivery.js copyPlan:目标货主存在性校验由 where: { id: { [Op.in]: candidates }, status: 1 } 调整为 status: { [Op.in]: [1, 2] }(1=正常、2=审核中均有效),软删自动排除不变;未命中者仍计入 skipped(reason「货主不存在或状态异常」文案不变);方法注释同步更新为 status 为 1 或 2(正常/审核中)均有效口径", + "app/service/systemMethods/report/deliveryPlan.js copy:包装层无变化(解构 id/store_ids 透传 copyPlan),无需改动", + "methods/system.json 通用报表模块(module=report):report.deliveryPlan.copy description 目标货主校验口径由「状态正常(status=1)」改为「status 为 1 或 2(正常/审核中)均有效,其余状态或已软删自动排除」;response skipped.reason 枚举「货主不存在或状态异常」name 同步更新为 status∈{1,2} 口径;params/headers/errors/权限口径不变;版本 0.3.58 -> 0.3.59(docMeta.version),updatedAt 保持 2026-08-30", + "AI_METHOD_ROUTING.md:copy 相关行未提货主状态口径(仅概括「货主不存在或状态异常跳过」,与放宽后语义一致),无需改动", + "权限口径不变:report.deliveryPlan.copy 与 save/list 相同(isNeedAuth=true、isNeedLogin=true),未执行权限变更、未扩大任何角色授权", + "本次仅文档同步,业务代码由 wms-dev-agent 完成,未修改 app/ 下任何代码,未执行数据库/Redis 操作,未运行测试" + ], + "module": "report" + }, { "version": "2026.08.30-report-delivery-plan-copy", "date": "2026-08-30", diff --git a/methods/openapi.json b/methods/openapi.json index 0eb5cae..bb47a08 100644 --- a/methods/openapi.json +++ b/methods/openapi.json @@ -1,8 +1,8 @@ { "module": "openapi", "description": "开放 API 统一入口,独立链路,HTTP POST /openapi,记录入口校验/鉴权规则与返回格式。", - "version": "1.1.0", - "updatedAt": "2026-06-23", + "version": "1.1.1", + "updatedAt": "2026-08-30", "http": { "path": "/openapi", "method": "POST" @@ -1464,7 +1464,7 @@ "list": [ { "method": "entryorder.create", - "description": "entryorder 模块 创建入库单接口,支持传入入库单主信息和商品明细。创建成功后返回的状态 status 为 CREATING(明细行未全部插入)或 CREATED(明细行已全部插入完成)。", + "description": "entryorder 模块 创建入库单接口,支持传入入库单主信息和商品明细。创建成功后返回的状态 status 为 CREATING(明细行未全部插入)或 CREATED(明细行已全部插入完成)。明细行商品匹配三级策略:itemId 主键直查 > itemCode 精确匹配 > itemCode 归一化条码匹配(取编码开头连续数字,剥离中文后缀)", "isNeedAuth": false, "isNeedLogin": false, "headers": [], @@ -1572,14 +1572,14 @@ "type": "string", "required": false, "source": "body", - "description": "商品编码,与 itemId 二选一,用于匹配仓库中的商品" + "description": "商品编码,可含中文后缀(如 6934864201409-新品):精确匹配不到时取编码开头的连续数字作为归一化条码与商品主数据对齐匹配" }, { "name": "[].orderLine.itemId", - "type": "number", + "type": "string|number", "required": false, "source": "body", - "description": "仓库商品主键ID,与 itemCode 二选一,优先使用 itemId" + "description": "仓库商品主键 ID。纯数字且不超 BIGINT 范围时按 StockStore 主键直查(校验货主一致);非纯数字值(如带中文后缀的编码)视为未提供,降级按 itemCode 匹配。主键查不到或货主不一致时同样降级按 itemCode 匹配" }, { "name": "[].orderLine.itemName", @@ -1714,14 +1714,14 @@ "type": "string", "required": false, "source": "body", - "description": "商品编码,与 itemId 二选一" + "description": "商品编码,可含中文后缀(如 6934864201409-新品):精确匹配不到时取编码开头的连续数字作为归一化条码与商品主数据对齐匹配" }, { "name": "[].orderLine.itemId", - "type": "number", + "type": "string|number", "required": false, "source": "body", - "description": "仓库商品主键ID,与 itemCode 二选一,优先使用 itemId" + "description": "仓库商品主键 ID。纯数字且不超 BIGINT 范围时按 StockStore 主键直查(校验货主一致);非纯数字值(如带中文后缀的编码)视为未提供,降级按 itemCode 匹配。主键查不到或货主不一致时同样降级按 itemCode 匹配" }, { "name": "[].orderLine.itemName", @@ -1783,7 +1783,15 @@ }, { "code": 400, - "message": "商品未同步推送到仓库" + "message": "创建入库单失败,失败原因:订单行N:SKU{itemId}商品《itemName》编码《itemCode》未同步推送到仓库" + }, + { + "code": 400, + "message": "创建入库单失败,失败原因:订单行N:SKU{itemId}商品《itemName》编码《itemCode》wms无对应关系,请联系仓库关联创建商品" + }, + { + "code": 400, + "message": "创建入库单失败,失败原因:订单行N:编码《itemCode》归一化条码《barcode》匹配到多个商品,请人工核对后重试" } ], "notes": [ @@ -1791,7 +1799,10 @@ "方法部署位置:openapiMethods/entryorder.create", "创建渠道固定为 API", "orderLines.orderLine 支持单对象或数组格式", - "itemCode 与 itemId 二选一,优先使用 itemId", + "明细行商品匹配三级策略:itemId 主键直查(纯数字且不超 BIGINT 范围、货主一致)> itemCode 精确匹配 > itemCode 归一化条码匹配(取编码开头连续数字)", + "带中文后缀的编码(如 6934864201409-新品)精确匹配不到时按归一化条码对齐;归一化条码命中多个商品时报错,不静默取第一条", + "item_id 统一写入实际匹配到的 StockStore 数字主键 id,避免非数字值写入 BIGINT 列触发 MySQL 严格模式报错(Data truncated for column 'item_id')", + "失败信息回显真实 SKU/商品/编码并附订单行号;与奇门渠道共用 app/service/systems/entry_order.js addOrder 同一逻辑", "timestamp 时间戳时效校验:与服务器时间差不得超过 ±10 分钟(600 秒),否则返回 400" ] }, diff --git a/methods/qimen.json b/methods/qimen.json index 27468be..5dd6cee 100644 --- a/methods/qimen.json +++ b/methods/qimen.json @@ -1,8 +1,8 @@ { "module": "qimen", "description": "奇门接口标准入口,method 对应 qimenMethods 异步方法,全部使用 POST 请求,参数包含 query 与 XML body(request 节点)", - "version": "0.3.6", - "updatedAt": "2026-06-30", + "version": "0.3.7", + "updatedAt": "2026-08-30", "headers": [], "methods": { "groups": [ @@ -240,7 +240,7 @@ "list": [ { "method": "entryorder.create", - "description": "创建入库单。奇门 XML 推送创建入库单及明细,返回入库单 ID、单号、创建时间和状态", + "description": "创建入库单。奇门 XML 推送创建入库单及明细,返回入库单 ID、单号、创建时间和状态。明细行商品匹配三级策略:itemId 主键直查 > itemCode 精确匹配 > itemCode 归一化条码匹配(取编码开头连续数字,剥离中文后缀)", "isNeedAuth": false, "isNeedLogin": false, "headers": [], @@ -348,14 +348,14 @@ "type": "string", "required": true, "source": "body", - "description": "商品编码" + "description": "商品编码。支持带中文后缀的编码(如 6934864201409-新品):精确匹配不到时取编码开头的连续数字(6934864201409)作为归一化条码与商品主数据对齐匹配" }, { "name": "request.orderLines.orderLine.itemId", "type": "string", "required": false, "source": "body", - "description": "商品 ID(StockStore 主键),建议必传以避免编码匹配问题" + "description": "商品 ID。纯数字且不超 BIGINT 范围时按 StockStore 主键直查(校验货主一致);非法值(如带中文后缀的编码)视为未提供,降级按 itemCode 匹配。主键查不到或货主不一致时同样降级按 itemCode 匹配" }, { "name": "request.orderLines.orderLine.itemName", @@ -415,12 +415,27 @@ "errors": [ { "code": 400, - "message": "创建入库单失败:商品未同步推送到仓库 / wms无对应关系" + "message": "创建入库单失败,失败原因:订单行N:SKU{itemId}商品《itemName》编码《itemCode》未同步推送到仓库" + }, + { + "code": 400, + "message": "创建入库单失败,失败原因:订单行N:SKU{itemId}商品《itemName》编码《itemCode》wms无对应关系,请联系仓库关联创建商品" + }, + { + "code": 400, + "message": "创建入库单失败,失败原因:订单行N:编码《itemCode》归一化条码《barcode》匹配到多个商品,请人工核对后重试" }, { "code": 500, "message": "服务器异常" } + ], + "notes": [ + "明细行商品匹配三级策略:itemId 主键直查(纯数字且不超 BIGINT 范围、货主一致)> itemCode 精确匹配 > itemCode 归一化条码匹配(取编码开头连续数字)", + "带中文后缀的编码(如 6934864201409-新品)精确匹配不到时按归一化条码对齐;归一化条码命中多个商品时报错,不静默取第一条", + "item_id 统一写入实际匹配到的 StockStore 数字主键 id,避免非数字值写入 BIGINT 列触发 MySQL 严格模式报错(Data truncated for column 'item_id')", + "失败信息回显真实 SKU/商品/编码并附订单行号", + "入口 app/service/qimenMethods/entryorder.js,核心 app/service/systems/entry_order.js addOrder(OpenAPI 渠道共用同一逻辑)" ] }, { diff --git a/methods/system.json b/methods/system.json index 4ab019d..3bdebe4 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,8 +1,8 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.58", - "updatedAt": "2026-08-30", + "version": "0.3.63", + "updatedAt": "2026-08-31", "headers": [ { "name": "platform", @@ -27043,7 +27043,7 @@ "type": "string", "required": false, "source": "body", - "description": "货主备注名,最长 50 字符" + "description": "货主备注名,最长 50 字符;不传或为空时默认取公司全称(截断 50 字符)填充" }, { "name": "warehouse_remask", @@ -27309,6 +27309,204 @@ "message": "服务内部错误" } ] + }, + { + "method": "storeWarehouse.store.export", + "description": "提交货主签约列表导出任务(异步)。入参筛选条件与 storeWarehouse.store.list 一致(keyword/counterparty_id/store_id/auth_status/use_status/warehouse_use_status/id 等,语义同 listForStore);page/page_size 忽略(全量导出)。提交后立即返回 task_id,后台异步生成 Excel 并上传,导出进度/下载请通过 storeWarehouse.store.exportTaskProgress 查询。数据来源 wms_store_warehouse 签约关系表;货主/仓库名称优先取签约备注名(store_remask/warehouse_remask),无则取 wms_store.company_name;角色/启用状态/是否有效/是否已配置奇门/是否需要我确认为中文展示列;全量导出无行数上限。任务缓存 Redis TTL 30 分钟;状态口径 submitted → running(10) → success(100),失败 failed + error。免权限免日志口径与 order.export 一致(isNeedAuth=false、isNeedLogin=true)。", + "isNeedAuth": false, + "isNeedLogin": true, + "headers": [ + { + "name": "Authorization", + "type": "string", + "required": true, + "description": "Bearer token" + } + ], + "params": [ + { + "name": "keyword", + "type": "string", + "required": false, + "source": "body", + "description": "签约备注或主体名称关键字(与 list 一致,模糊匹配 store_remask/warehouse_remask/双方 company_name)" + }, + { + "name": "counterparty_id", + "type": "number", + "required": false, + "source": "body", + "description": "对方主体ID(兼容 store_id),导出时过滤指定货主" + }, + { + "name": "store_id", + "type": "number", + "required": false, + "source": "body", + "description": "货主ID(counterparty_id 的别名,两者传一即可)" + }, + { + "name": "auth_status", + "type": "number", + "required": false, + "source": "body", + "description": "签约状态过滤:1=申请中 2=已通过 3=已拒绝 4=已解除 5=已过期" + }, + { + "name": "use_status", + "type": "number", + "required": false, + "source": "body", + "description": "启用状态过滤:0=禁用 1=启用(兼容 warehouse_use_status)" + }, + { + "name": "warehouse_use_status", + "type": "number", + "required": false, + "source": "body", + "description": "仓库侧启用状态过滤(use_status 的别名,两者传一即可)" + }, + { + "name": "id", + "type": "number", + "required": false, + "source": "body", + "description": "签约关系ID,兼容 contract_id/relation_id;导出时仅导出该签约关系" + } + ], + "response": [ + { + "name": "task_id", + "type": "string", + "required": true, + "description": "任务 ID(后端生成,格式 store_relation_list_export_{storeId}_{timestamp}_{random})" + }, + { + "name": "status", + "type": "string", + "required": true, + "description": "任务状态,枚举:submitted/running/success/failed/not_found(提交成功时为 submitted)" + }, + { + "name": "progress", + "type": "number", + "required": true, + "description": "当前进度百分比(0-100),提交时返回 0" + }, + { + "name": "message", + "type": "string", + "required": true, + "description": "任务提示信息" + }, + { + "name": "result", + "type": "object", + "required": true, + "description": "任务执行结果(提交时为 null;后台完成后为上传信息对象,含 filename/fileKey/url/cdnUrl/cosUrl/total_count)" + }, + { + "name": "error", + "type": "string", + "required": true, + "description": "失败时的错误信息(可选,非失败时为空字符串)" + }, + { + "name": "update_time", + "type": "number", + "required": true, + "description": "任务更新时间(Unix 毫秒时间戳)" + } + ], + "errors": [ + { + "code": "400", + "message": "参数格式不正确或筛选条件非法" + }, + { + "code": "500", + "message": "导出任务提交失败" + } + ] + }, + { + "method": "storeWarehouse.store.exportTaskProgress", + "description": "按 task_id 查询货主签约列表导出任务进度,返回 task_id、status、progress、message、result、error、download_url、update_time;上传完成后 download_url 返回下载链接(从 result.url/cdnUrl/cosUrl/fileKey 兜底取);任务缓存 Redis TTL 30 分钟,task_id 缺失或缓存未命中时 status=not_found(正常响应,非报错)。状态口径 submitted → running(10) → success(100),失败 failed + error。免权限免日志口径与 order.exportTaskProgress 一致。", + "isNeedAuth": false, + "isNeedLogin": true, + "headers": [ + { + "name": "Authorization", + "type": "string", + "required": true, + "description": "Bearer token" + } + ], + "params": [ + { + "name": "task_id / taskId", + "type": "string", + "required": true, + "source": "body|query", + "description": "任务 ID,兼容 task_id(下划线)与 taskId(驼峰)两种写法" + } + ], + "response": [ + { + "name": "task_id", + "type": "string", + "required": true, + "description": "任务 ID(task_id 缺失时为回显的空字符串,status=not_found)" + }, + { + "name": "status", + "type": "string", + "required": true, + "description": "任务状态:submitted/running/success/failed/not_found" + }, + { + "name": "progress", + "type": "number", + "required": true, + "description": "进度百分比(0-100)" + }, + { + "name": "message", + "type": "string", + "required": true, + "description": "任务提示信息" + }, + { + "name": "result", + "type": "object", + "required": true, + "description": "任务执行结果对象(完成后含 filename/fileKey/url/cdnUrl/cosUrl/total_count 等;未完成或 not_found 时为 null)" + }, + { + "name": "error", + "type": "string", + "required": true, + "description": "失败时的错误信息(可选,非失败时为空字符串)" + }, + { + "name": "download_url", + "type": "string", + "required": true, + "description": "任务完成后下载链接(从 result.url/cdnUrl/cosUrl/fileKey 兜底取);未完成或不存在时为空字符串" + }, + { + "name": "update_time", + "type": "number", + "required": true, + "description": "最近一次状态更新时间(Unix 毫秒时间戳)" + } + ], + "errors": [ + { + "code": "500", + "message": "查询失败或内部错误" + } + ] } ] }, @@ -31651,7 +31849,7 @@ "name": "items", "type": "array", "required": true, - "description": "订单商品明细,每项含 id/order_id/item_id/item_code/item_name/plan_qty/actual_price/stock_id/order_line_no/inventory_type/sku_property/stock_unit/barcodes/image_url" + "description": "订单商品明细,每项含 id/order_id/item_id/item_code/item_name/plan_qty/actual_price/stock_id/order_line_no/inventory_type/sku_property/stock_unit/barcodes/image_url/packing_requirements(打包要求,来自 stock,未命中/异常时为空字符串)" }, { "name": "source_table", @@ -39724,142 +39922,6 @@ } ] }, - { - "method": "report.meta", - "description": "查询报表前端可读的列元数据(全量注册字段 + 勾选标记 + 窗口参数,不执行真实数据查询):按报表定义ID读取 wms_report_definition(is_enabled=1),返回 report_id/name/type/file_name 与窗口参数 window{dayCount,cutoverHour},以及注册类型全量字段清单 fields(含 selected 勾选标记与 asText 文本单元格标记),供前端报表设计器拉取可用字段。仅登录即可调用(免权限:systemInit 声明 _noNeedRight/_noNeedAuth 含 meta,免权限校验 + 免仓库有效期校验);meta 未列入 _noNeedLog,保留审计日志(generate/generateTaskProgress 不写审计日志,行为不同)。", - "isNeedAuth": false, - "isNeedLogin": true, - "headers": [ - { - "name": "Authorization", - "type": "string", - "required": true, - "description": "Bearer token" - } - ], - "params": [ - { - "name": "report_id", - "type": "number", - "required": false, - "source": "body", - "description": "报表定义ID(必填,与 reportId 二选一;均传时优先 reportId)。须为 wms_report_definition 中已启用(is_enabled=1)的报表定义" - }, - { - "name": "reportId", - "type": "number", - "required": false, - "source": "body", - "description": "报表定义ID驼峰别名(兼容,优先级高于 report_id)" - } - ], - "response": [ - { - "name": "report_id", - "type": "number", - "required": true, - "description": "报表定义ID(回显,即报表定义 id)" - }, - { - "name": "name", - "type": "string", - "required": true, - "description": "报表名称" - }, - { - "name": "type", - "type": "string", - "required": true, - "description": "报表类型(注册 key,如 stockFlow)" - }, - { - "name": "file_name", - "type": "string", - "required": true, - "description": "导出文件名模板(支持 {date} 占位)" - }, - { - "name": "window", - "type": "object", - "required": true, - "description": "日窗口参数对象(来自类型注册表缺省 window)" - }, - { - "name": "window.dayCount", - "type": "number", - "required": true, - "description": "窗口数量(stockFlow 默认 7)" - }, - { - "name": "window.cutoverHour", - "type": "number", - "required": true, - "description": "切点小时 0-23(stockFlow 默认 7,窗口为 [D 07:00, D+1 07:00) 本地时区半开区间)" - }, - { - "name": "fields", - "type": "array", - "required": true, - "description": "注册类型全量字段清单(含 selected 勾选标记与 asText 文本单元格标记),供前端报表设计器渲染可用字段" - }, - { - "name": "fields[].key", - "type": "string", - "required": true, - "description": "字段键(与查询器返回行字段一一对应,如 item_code)" - }, - { - "name": "fields[].label", - "type": "string", - "required": true, - "description": "字段中文名(如 商品编码)" - }, - { - "name": "fields[].type", - "type": "string", - "required": true, - "description": "字段类型:string/number/boolean/array(array 类型字段含 children 子字段,如 daily)" - }, - { - "name": "fields[].computed", - "type": "boolean", - "required": false, - "description": "是否预计算字段(非原始表字段),仅 true 时返回(如 suggest/warn)" - }, - { - "name": "fields[].asText", - "type": "boolean", - "required": false, - "description": "是否按文本单元格渲染落地(长数字串防科学计数法),仅 true 时返回(如 item_code/barcode)" - }, - { - "name": "fields[].children", - "type": "array", - "required": false, - "description": "数组类型字段的子字段清单(如 daily 的 ck/rk),仅数组类型字段返回" - }, - { - "name": "fields[].selected", - "type": "boolean", - "required": true, - "description": "该报表定义是否勾选此字段(true=已勾选,与定义 fields 数组对照)" - } - ], - "errors": [ - { - "code": 0, - "message": "报表ID report_id 必须为正整数" - }, - { - "code": 401, - "message": "未提供有效的认证令牌" - }, - { - "code": 500, - "message": "接口错误: 报表定义不存在或已停用: id=" - } - ] - }, { "method": "report.definition.save", "description": "新增/更新报表定义(wms_report_definition 管理侧写接口,按 id upsert:未传 id 视为新增,未传字段不覆盖):name 必填 ≤100;type 为注册类型 key(新增必填,必须命中注册表,未知报「未知的报表类型: 」);file_name 导出文件名模板支持 {date} 占位(新增必填 ≤200,兼容 fileName 驼峰写法,驼峰优先);fields 为勾选字段 key 数组(新增必填,必须为该类型注册字段子集,含非法 key 报可读错误并列出该类型可用字段);is_enabled 仅 0/1;remark ≤500 超出截断。软删记录命中时自动恢复(paranoid:false 按主键 id 查重)。模型已移除 code/scope 与 output_config/source_config/sheet_config 三段 JSON 配置(极简配置:type + fields)。需授权接口(管理类操作,systemInit 未声明免权限,仅通配符角色或已授权角色可用)。", @@ -40357,7 +40419,7 @@ }, { "method": "report.deliveryPlan.copy", - "description": "快速复制货主报表投递计划到其他货主(批量复制):传入源计划ID id 与目标货主ID数组 store_ids(元素自动去重,支持 JSON 字符串数组)。源计划必须存在(软删排除);与源计划货主相同的目标计入 skipped(原因:与源计划货主相同);目标货主须在 wms_store 存在且状态正常(status=1,软删自动排除),否则计入 skipped(原因:货主不存在或状态异常);目标货主已存在同 report_definition_id 计划(软删排除)时跳过不覆盖不报错(原因:已存在同报表定义计划)。新建计划 notify_group_ids/notify_member_ids 置空(通知配置不复制),enabled 原样复制(保持复制语义),其余字段 report_definition_id/schedule_times/channel/late_grace_minutes/name/remark/notify_template 原样复制;批量创建使用事务包裹,并发撞 uk_store_report_definition 唯一索引时单条降级 skipped、不中断其余创建。统一 success 包装,data={created:[{id,store_id}],skipped:[{store_id,reason}]}。需授权接口(管理类操作,systemInit 未声明免权限,仅通配符角色或已授权角色可用)。", + "description": "快速复制货主报表投递计划到其他货主(批量复制):传入源计划ID id 与目标货主ID数组 store_ids(元素自动去重,支持 JSON 字符串数组)。源计划必须存在(软删排除);与源计划货主相同的目标计入 skipped(原因:与源计划货主相同);目标货主须在 wms_store 存在且状态有效(status 为 1 或 2(正常/审核中)均有效,其余状态或已软删自动排除),否则计入 skipped(原因:货主不存在或状态异常);目标货主已存在同 report_definition_id 计划(软删排除)时跳过不覆盖不报错(原因:已存在同报表定义计划)。新建计划 notify_group_ids/notify_member_ids 置空(通知配置不复制),enabled 原样复制(保持复制语义),其余字段 report_definition_id/schedule_times/channel/late_grace_minutes/name/remark/notify_template 原样复制;批量创建使用事务包裹,并发撞 uk_store_report_definition 唯一索引时单条降级 skipped、不中断其余创建。统一 success 包装,data={created:[{id,store_id}],skipped:[{store_id,reason}]}。需授权接口(管理类操作,systemInit 未声明免权限,仅通配符角色或已授权角色可用)。", "isNeedAuth": true, "isNeedLogin": true, "headers": [ @@ -40436,7 +40498,7 @@ }, { "value": "货主不存在或状态异常", - "name": "目标货主不存在或状态异常(wms_store.status=1)" + "name": "目标货主不存在或状态异常(wms_store.status 为 1 或 2(正常/审核中)均有效,其余状态或已软删)" }, { "value": "已存在同报表定义计划", diff --git a/test/app/schedule/notice_stock_remaining.test.js b/test/app/schedule/notice_stock_remaining.test.js index 3b642d5..186bdf6 100644 --- a/test/app/schedule/notice_stock_remaining.test.js +++ b/test/app/schedule/notice_stock_remaining.test.js @@ -96,6 +96,7 @@ async function withFixedDate(fixedDate, handler) { function createScheduleHarness(options = {}) { const noticePayloads = []; const cacheWrites = []; + const storageQueryOptions = []; const cacheStore = new Map(Object.entries(options.cacheStore || {})); const ctx = { @@ -128,10 +129,12 @@ function createScheduleHarness(options = {}) { }, }, Storage: { - async findAll() { + async findAll(queryOptions) { + storageQueryOptions.push(queryOptions); return options.storageRows || []; }, }, + Store: {}, LocationSpace: {}, }, service: { @@ -173,6 +176,7 @@ function createScheduleHarness(options = {}) { noticePayloads, cacheWrites, cacheStore, + storageQueryOptions, }; } @@ -245,6 +249,13 @@ describe('test/app/schedule/notice_stock_remaining.test.js', () => { assert.equal(noticePayloads[0].metadata.notifyKey, 'stock:2001'); assert.equal(noticePayloads[0].metadata.cacheKey, expectedCacheKey); + assert.ok(noticePayloads[0].content.includes('仓库ID:20'), '缺少仓库 ID 回退文案'); + assert.ok(noticePayloads[0].content.includes('货主ID:10'), '缺少货主 ID 回退文案'); + assert.ok(!noticePayloads[0].content.includes('undefined'), '正文不应出现 undefined'); + assert.ok(!noticePayloads[0].content.includes('null'), '正文不应出现 null'); + assert.equal(noticePayloads[0].metadata.warehouseName, ''); + assert.equal(noticePayloads[0].metadata.storeName, ''); + assert.equal(cacheWrites.length, 1); assert.equal(cacheWrites[0].cacheKey, expectedCacheKey); assert.deepEqual(cacheWrites[0].data, { @@ -445,4 +456,133 @@ describe('test/app/schedule/notice_stock_remaining.test.js', () => { assert.equal(noticePayloads[0].metadata.notifyKey, 'stock:2001'); assert.equal(ctx.app._noticeStockRemainingRunning, false); }); + + it('should render warehouse/store names with IDs when associated records provide company_name', async () => { + const fixedDate = new Date(2026, 3, 14, 9, 0, 0); + const { ctx, noticePayloads } = createScheduleHarness({ + stockRows: [ + { + id: 2001, + item_code: 'SKU-2001', + item_name: '测试商品A', + store_id: 10, + warehouse_id: 20, + remaining_threshold_days: 7, + }, + ], + storageRows: [ + createSequelizeInstanceLikeRecord( + { + id: 9001, + stock_id: 2001, + batch_no: 'BATCH-1', + warehouse_id: 20, + store_id: 10, + quantity: 5, + available_quantity: 5, + expiry_date: new Date(2026, 3, 16, 9, 0, 0), + inbound_time: new Date(2026, 3, 13, 9, 0, 0), + is_enabled: 1, + delete_at: null, + }, + { + warehouse: createSequelizeInstanceLikeRecord({ company_name: '测试中心仓' }), + store: createSequelizeInstanceLikeRecord({ company_name: '测试货主公司' }), + space: createSequelizeInstanceLikeRecord({ + space_code: 'A-01', + custom_name: '一号位', + }), + } + ), + ], + }); + + await withFixedDate(fixedDate, async () => { + await schedule.task(ctx); + }); + + assert.equal(noticePayloads.length, 1); + const noticePayload = noticePayloads[0]; + assert.ok(noticePayload.content.includes('仓库:测试中心仓(ID:20)'), '正文应包含仓库名称与 ID'); + assert.ok(noticePayload.content.includes('货主:测试货主公司(ID:10)'), '正文应包含货主名称与 ID'); + assert.equal(noticePayload.subject.name, '仓库:测试中心仓(ID:20)'); + assert.equal(noticePayload.metadata.warehouseName, '测试中心仓'); + assert.equal(noticePayload.metadata.storeName, '测试货主公司'); + }); + + it('should fallback to 未知 when both name and ID are missing', async () => { + const fixedDate = new Date(2026, 3, 14, 9, 0, 0); + const { ctx, noticePayloads } = createScheduleHarness({ + stockRows: [ + { + id: 2001, + item_code: 'SKU-2001', + item_name: '测试商品A', + remaining_threshold_days: 7, + }, + ], + storageRows: [ + { + id: 9001, + stock_id: 2001, + batch_no: 'BATCH-1', + quantity: 5, + available_quantity: 5, + expiry_date: new Date(2026, 3, 16, 9, 0, 0), + inbound_time: new Date(2026, 3, 13, 9, 0, 0), + is_enabled: 1, + delete_at: null, + space: { + space_code: 'A-01', + custom_name: '一号位', + }, + }, + ], + }); + + await withFixedDate(fixedDate, async () => { + await schedule.task(ctx); + }); + + assert.equal(noticePayloads.length, 1); + const noticePayload = noticePayloads[0]; + assert.ok(noticePayload.content.includes('仓库ID:未知'), '仓库名称与 ID 缺失时应回退为未知'); + assert.ok(noticePayload.content.includes('货主ID:未知'), '货主名称与 ID 缺失时应回退为未知'); + assert.ok(!noticePayload.content.includes('undefined'), '正文不应出现 undefined'); + assert.ok(!noticePayload.content.includes('null'), '正文不应出现 null'); + assert.equal(noticePayload.subject.name, '仓库ID:未知'); + }); + + it('should query storage with LEFT JOIN store associations for name resolution', async () => { + const fixedDate = new Date(2026, 3, 14, 9, 0, 0); + const { ctx, storageQueryOptions } = createScheduleHarness({ + stockRows: [ + { + id: 2001, + item_code: 'SKU-2001', + item_name: '测试商品A', + store_id: 10, + warehouse_id: 20, + remaining_threshold_days: 7, + }, + ], + storageRows: [], + }); + + await withFixedDate(fixedDate, async () => { + await schedule.task(ctx); + }); + + assert.equal(storageQueryOptions.length, 1); + const includeList = storageQueryOptions[0].include; + assert.ok(Array.isArray(includeList), '查询应包含 include 配置'); + const warehouseInclude = includeList.find(entry => entry && entry.as === 'warehouse'); + const storeInclude = includeList.find(entry => entry && entry.as === 'store'); + assert.ok(warehouseInclude, '应包含 warehouse 关联'); + assert.equal(warehouseInclude.required, false); + assert.deepEqual(warehouseInclude.attributes, [ 'company_name' ]); + assert.ok(storeInclude, '应包含 store 关联'); + assert.equal(storeInclude.required, false); + assert.deepEqual(storeInclude.attributes, [ 'company_name' ]); + }); });