diff --git a/app/service/systemMethods/order/wave.js b/app/service/systemMethods/order/wave.js index d8b1dc3..866799c 100644 --- a/app/service/systemMethods/order/wave.js +++ b/app/service/systemMethods/order/wave.js @@ -1545,7 +1545,7 @@ class WaveService extends OrderBaseService { * 构建波次列表 where 条件(白名单字段)。 * * @param {Object} whereData 查询 where 入参。 - * @return {{ sql: string, replacements: Object, storageAssignmentStatus: string, expressAssignmentStatus: string, printAssignmentStatus: string }} SQL 条件片段、参数与分配状态筛选值。 + * @return {{ sql: string, replacements: Object, storageAssignmentStatus: string, expressAssignmentStatus: string, printAssignmentStatus: string, reviewAssignmentStatus: string, storeIds: number[] }} SQL 条件片段、参数与分配状态筛选值。 */ buildBatchListWhereClause(whereData = {}) { const normalizedWhere = this.isPlainObject(whereData) ? whereData : {}; @@ -1576,6 +1576,7 @@ class WaveService extends OrderBaseService { 'express_assignment_status', 'print_assignment_status', 'review_assignment_status', + 'store_id', ]; const invalidFields = whereKeys.filter(key => !allowedFields.includes(key)); @@ -1700,6 +1701,37 @@ class WaveService extends OrderBaseService { appendMinCondition('processed_orders_min', 'processed_orders', 'whereProcessedOrdersMin'); appendMaxCondition('processed_orders_max', 'processed_orders', 'whereProcessedOrdersMax'); + // store_id 货主筛选:支持单值/数组/{operator,value} 结构,归一化为正整数数组(去重)。 + // 过滤语义:返回包含任一筛选货主订单的波次(含混合货主波次)。 + const normalizeStoreIdList = value => { + if (value === undefined || value === null || value === '') { + return []; + } + + const rawValue = this.isPlainObject(value) && Object.prototype.hasOwnProperty.call(value, 'value') + ? value.value + : value; + const sourceList = Array.isArray(rawValue) ? rawValue : [ rawValue ]; + const normalizedIds = []; + + for (const item of sourceList) { + if (item === undefined || item === null || item === '') { + continue; + } + + const numberValue = Number(String(item).trim()); + if (!Number.isInteger(numberValue) || numberValue <= 0) { + throw new Error('store_id 参数不合法'); + } + + normalizedIds.push(numberValue); + } + + return [ ...new Set(normalizedIds) ]; + }; + + const storeIds = normalizeStoreIdList(normalizedWhere.store_id); + const storageAssignmentStatus = this.normalizeBatchListStorageAssignmentStatusFilter( normalizedWhere.storage_assignment_status ); @@ -1720,6 +1752,7 @@ class WaveService extends OrderBaseService { expressAssignmentStatus, printAssignmentStatus, reviewAssignmentStatus, + storeIds, }; } @@ -4265,6 +4298,83 @@ class WaveService extends OrderBaseService { }); } + /** + * 解析波次列表的货主名称映射(store_id → 名称)。 + * + * 货主名称口径与售后/库存列表一致:合约表 wms_store_warehouse.store_remask + * (货主备注名称,store_id+warehouse_id 维度)优先,无合约或备注为空时回退 + * wms_store.company_name(公司全称)。 + * + * @param {Object[]} batchRows 波次行数据(含 order_total/owner_distinct_count/owner_named_count/owner_store_id)。 + * @param {number|string} [warehouseId=0] 当前仓库ID。 + * @return {Promise>} store_id → 货主名称。 + */ + async resolveWaveBatchOwnerStoreNameMap(batchRows = [], warehouseId = 0) { + const nameMap = new Map(); + const ownerStoreIds = []; + + for (const batch of batchRows) { + const orderCount = Number(batch && batch.order_total || 0); + const ownerDistinctCount = Number(batch && batch.owner_distinct_count || 0); + const ownerNamedCount = Number(batch && batch.owner_named_count || 0); + const ownerStoreId = Number(batch && batch.owner_store_id || 0); + if (orderCount > 0 && ownerDistinctCount === 1 && ownerNamedCount === orderCount && ownerStoreId > 0) { + ownerStoreIds.push(ownerStoreId); + } + } + + const uniqueStoreIds = [ ...new Set(ownerStoreIds) ]; + if (uniqueStoreIds.length === 0) { + return nameMap; + } + + const normalizedWarehouseId = Number(warehouseId || 0); + try { + // 1. 合约表货主备注名称(store_id + warehouse_id 维度) + const contractMap = new Map(); + if (normalizedWarehouseId > 0) { + const contractRows = await this.ctx.model.StoreWarehouse.findAll({ + where: { + store_id: { [Op.in]: uniqueStoreIds }, + warehouse_id: normalizedWarehouseId, + }, + attributes: [ 'store_id', 'store_remask' ], + raw: true, + }); + for (const row of contractRows) { + const remask = String(row.store_remask || '').trim(); + if (remask) { + contractMap.set(Number(row.store_id), remask); + } + } + } + + // 2. 货主公司全称兜底 + const storeRows = await this.ctx.model.Store.findAll({ + where: { id: { [Op.in]: uniqueStoreIds } }, + attributes: [ 'id', 'company_name' ], + raw: true, + }); + for (const row of storeRows) { + const companyName = String(row.company_name || '').trim(); + if (companyName) { + nameMap.set(Number(row.id), companyName); + } + } + + // 3. 备注名称覆盖公司全称 + for (const storeId of uniqueStoreIds) { + if (contractMap.has(storeId)) { + nameMap.set(storeId, contractMap.get(storeId)); + } + } + } catch (error) { + this.ctx.logger?.warn?.('resolveWaveBatchOwnerStoreNameMap 解析货主名称失败:', error?.message || error); + } + + return nameMap; + } + /** * 波次列表查询。 * @@ -4300,6 +4410,20 @@ class WaveService extends OrderBaseService { AND wave_status IN (:waveStatusList) ${whereClause.sql} `; + const storeIdFilter = Array.isArray(whereClause.storeIds) ? whereClause.storeIds : []; + const ownerFilterJoinSql = storeIdFilter.length > 0 ? ` + INNER JOIN ( + SELECT candidate_wave.wave_id + FROM ( + SELECT wave_id + FROM wms_wave_batch + WHERE ${baseBatchWhereSql} + ) candidate_wave + INNER JOIN ${orderTableName} od ON od.wave_id = candidate_wave.wave_id + AND od.store_id IN (:whereStoreIds) + GROUP BY candidate_wave.wave_id + ) wave_owner_filter ON wave_owner_filter.wave_id = wb.wave_id + ` : ''; const batchListFromSql = ` FROM ( SELECT @@ -4337,7 +4461,10 @@ class WaveService extends OrderBaseService { SUM(CASE WHEN od.inspection_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS review_none_count, SUM(CASE WHEN od.pick_status = 'none' THEN 1 ELSE 0 END) AS pick_none_count, SUM(CASE WHEN od.pick_status = 'fin' THEN 1 ELSE 0 END) AS pick_fin_count, - SUM(CASE WHEN od.pick_status = 'error' THEN 1 ELSE 0 END) AS pick_error_count + SUM(CASE WHEN od.pick_status = 'error' THEN 1 ELSE 0 END) AS pick_error_count, + COUNT(DISTINCT NULLIF(od.store_id, 0)) AS owner_distinct_count, + MAX(NULLIF(od.store_id, 0)) AS owner_store_id, + SUM(CASE WHEN NULLIF(od.store_id, 0) IS NOT NULL THEN 1 ELSE 0 END) AS owner_named_count FROM ( SELECT wave_id FROM wms_wave_batch @@ -4346,6 +4473,7 @@ class WaveService extends OrderBaseService { LEFT JOIN ${orderTableName} od ON od.wave_id = candidate_wave.wave_id GROUP BY candidate_wave.wave_id ) wave_order_stats ON wave_order_stats.wave_id = wb.wave_id + ${ownerFilterJoinSql} LEFT JOIN wms_express e ON e.code = wb.logistics_name WHERE 1 = 1 ${storageAssignmentFilterClause.sql} @@ -4386,7 +4514,10 @@ class WaveService extends OrderBaseService { COALESCE(wave_order_stats.review_none_count, 0) AS review_none_count, COALESCE(wave_order_stats.pick_none_count, 0) AS pick_none_count, COALESCE(wave_order_stats.pick_fin_count, 0) AS pick_fin_count, - COALESCE(wave_order_stats.pick_error_count, 0) AS pick_error_count + COALESCE(wave_order_stats.pick_error_count, 0) AS pick_error_count, + COALESCE(wave_order_stats.owner_distinct_count, 0) AS owner_distinct_count, + wave_order_stats.owner_store_id, + COALESCE(wave_order_stats.owner_named_count, 0) AS owner_named_count ${batchListFromSql} ORDER BY wb.total_orders DESC, wb.wave_id DESC LIMIT :limit OFFSET :offset @@ -4407,6 +4538,7 @@ class WaveService extends OrderBaseService { ...expressAssignmentFilterClause.replacements, ...printAssignmentFilterClause.replacements, ...reviewAssignmentFilterClause.replacements, + ...(storeIdFilter.length > 0 ? { whereStoreIds: storeIdFilter } : {}), limit: pageSize, offset, }, @@ -4420,6 +4552,7 @@ class WaveService extends OrderBaseService { ...expressAssignmentFilterClause.replacements, ...printAssignmentFilterClause.replacements, ...reviewAssignmentFilterClause.replacements, + ...(storeIdFilter.length > 0 ? { whereStoreIds: storeIdFilter } : {}), }, }), ]); @@ -4443,6 +4576,8 @@ class WaveService extends OrderBaseService { }); } + const ownerStoreNameMap = await this.resolveWaveBatchOwnerStoreNameMap(rawList, warehouseId); + const list = rawList.map(batch => { const waveId = Number(batch && batch.wave_id || 0); const orderCount = Number(batch && batch.order_total || 0); @@ -4460,6 +4595,17 @@ class WaveService extends OrderBaseService { const reviewFinCount = Number(batch && batch.review_fin_count || 0); const reviewErrorCount = Number(batch && batch.review_error_count || 0); const unreviewedOrderCount = orderCount - reviewFinCount; + const ownerDistinctCount = Number(batch && batch.owner_distinct_count || 0); + const ownerNamedCount = Number(batch && batch.owner_named_count || 0); + const ownerStoreId = Number(batch && batch.owner_store_id || 0); + + // 货主展示:仅当所有订单均存在货主(store_id)且货主唯一时返回货主名称,否则返回“混合”。 + const ownerName = orderCount > 0 + && ownerDistinctCount === 1 + && ownerNamedCount === orderCount + && ownerStoreId > 0 + ? (ownerStoreNameMap.get(ownerStoreId) || '') + : '混合'; // 复核状态判定:error 统一归入未复核 let reviewAssignmentStatus; @@ -4506,6 +4652,7 @@ class WaveService extends OrderBaseService { }), review_assignment_status: reviewAssignmentStatus, unreviewed_order_count: unreviewedOrderCount, + store_name: ownerName, }; }); diff --git a/methods/changes/system.json b/methods/changes/system.json index e09e68e..92698d6 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,38 @@ [ + { + "version": "2026.08.26-wave-batchList-store-id-filter", + "date": "2026-08-26", + "type": "enhanced", + "summary": "order.wave.batchList 新增 where.store_id(货主ID)过滤:支持单值/数组/{operator,value} 结构(正整数),返回包含任一筛选货主订单的波次(含混合货主波次);未在 wms_wave_batch 加冗余 store_id 字段,通过订单分表 INNER JOIN 聚合匹配,零迁移零回填零口径漂移风险。", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "app/service/systemMethods/order/wave.js buildBatchListWhereClause:allowedFields 新增 store_id,normalizeStoreIdList 归一化(单值/数组/{operator,value}→正整数数组去重,非法值抛错),返回值新增 storeIds", + "batchList:storeIds 非空时在 wave_order_stats 之后追加 INNER JOIN wave_owner_filter(订单表 od.wave_id 匹配且 od.store_id IN (:whereStoreIds) 按 wave_id 分组),listSql/countSql replacements 新增 whereStoreIds", + "设计决策:不在 wms_wave_batch 增加 store_id 冗余字段(混合填0),理由——batchList 原本就必须 LEFT JOIN 订单表做状态聚合,货主过滤挂同一次 JOIN 零额外成本;订单表已有 store_id 单列索引;冗余需覆盖抓取入波/策略任务建波/batchRemoveOrders/batchRemoveExceptionOrders 等 10+ 处写入点维护,遗漏即口径漂移;owner_name 展示已实时聚合订单 store_id,避免双口径", + "实测:{operator:'',value:[1000281,1000000]} 过滤 wave_type=1&source=0 返回 196 条(库中该货主订单波次);单值/数组形式均返回 5 条;不存在货主 0 条;非法值报错;无过滤 baseline 278 条不受影响;原请求含 wave_status=0 返回 0 因库中活动波次均为 status=1", + "同步更新 methods/system.json 的 batchList where 白名单说明" + ], + "module": "order.wave" + }, + { + "version": "2026.08.26-wave-batchList-store-name", + "date": "2026-08-26", + "type": "enhanced", + "summary": "order.wave.batchList 响应每条记录新增 store_name(货主信息):按波次内订单 store_id(货主ID)聚合,所有订单均为同一货主时返回货主名称,否则(多个货主、存在无货主订单或空波次)返回“混合”;货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "app/service/systemMethods/order/wave.js batchList:wave_order_stats 子查询新增 owner_distinct_count(COUNT(DISTINCT NULLIF(store_id,0)))、owner_named_count(SUM 非空判定)、owner_store_id(MAX(NULLIF(store_id,0)))三个聚合字段,listSql SELECT 透出", + "新增 resolveWaveBatchOwnerStoreNameMap:仅对满足单货主的波次批量查 StoreWarehouse(store_id+warehouse_id)取 store_remask,再查 wms_store.company_name 兑底,remask 覆盖 company_name;查询失败仅告警不影响列表", + "判定口径:orderCount>0 且 ownerDistinctCount===1 且 ownerNamedCount===orderCount 且 ownerStoreId>0 才返回货主名称,否则返回“混合”(0 单波次同样返回“混合”)", + "货主名称口径与 afterSale._enrichListStoreNames、inventory.store_name 一致(store_remask 优先、company_name 兑底);早期草稿曾按 shop_nick 店铺名称实现,已按项目货主口径修正", + "同步更新 methods/system.json 的 batchList 描述与 response.list 字段说明" + ], + "module": "order.wave" + }, { "version": "2026.08.26-workbench-queryOrder-pack-status", "date": "2026-08-26", diff --git a/methods/system.json b/methods/system.json index 68c3243..339578f 100644 --- a/methods/system.json +++ b/methods/system.json @@ -28507,7 +28507,7 @@ "list": [ { "method": "order.wave.batchList", - "description": "波次列表查询。仅使用当前登录操作者仓库上下文(禁止传入 warehouse_id/warehouseId)。支持 where 白名单过滤,固定查询 wave_status=0/1;返回波次基础信息及分配状态汇总(storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status)。支持 only_todo=1 仅返回仍有未复核订单的波次,并返回复核状态汇总(review_assignment_status)与未复核数量(unreviewed_order_count)。", + "description": "波次列表查询。仅使用当前登录操作者仓库上下文(禁止传入 warehouse_id/warehouseId)。支持 where 白名单过滤,固定查询 wave_status=0/1;返回波次基础信息及分配状态汇总(storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status)。支持 only_todo=1 仅返回仍有未复核订单的波次,并返回复核状态汇总(review_assignment_status)与未复核数量(unreviewed_order_count)。列表每条记录返回货主信息 store_name:当波次内所有订单均为同一货主(store_id)时返回货主名称,否则返回“混合”。货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -28538,7 +28538,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- 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 中说明错误字段与允许取值。\n- review_assignment_status(等值,string,可选,英文枚举:unreviewed、partially_reviewed、reviewed;分别表示未复核、部分复核、已复核)。" + "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 中说明错误字段与允许取值。\n- review_assignment_status(等值,string,可选,英文枚举:unreviewed、partially_reviewed、reviewed;分别表示未复核、部分复核、已复核)。\n- store_id(货主ID,可选,正整数,支持单值/数组/{operator,value} 结构,如 {\"operator\":\"\",\"value\":[1000281,1000000]};语义:返回包含任一筛选货主订单的波次,含混合货主波次;单值与数组均按 in 匹配)。" } ], "response": [ @@ -28546,7 +28546,7 @@ "name": "list", "type": "array", "required": true, - "description": "波次列表,包含波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status / unreviewed_order_count)。其中 pick_assignment_status 按订单 pick_status 聚合判定,取值:未拣货/部分拣货/已拣货/拣货异常。每条记录新增字段 source(number):来源标识,0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务。" + "description": "波次列表,包含波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status / unreviewed_order_count)。其中 pick_assignment_status 按订单 pick_status 聚合判定,取值:未拣货/部分拣货/已拣货/拣货异常。每条记录新增字段 source(number):来源标识,0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务。每条记录新增字段 store_name(string):货主信息,当波次内所有订单均为同一货主(store_id)时返回货主名称,否则返回“混合”;货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。" }, { "name": "pagination",