From eb4ce994ba3bce175c41cec24bd3a0e204fe30ac Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 12 Oct 2026 23:43:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(panel):=20scatterPacking=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=20wave=20=E6=B3=A2=E6=AC=A1=E6=95=B0=EF=BC=88?= =?UTF-8?q?=E6=95=A3=E5=8D=95=E6=97=A0=E6=B3=A2=E6=AC=A1=E8=AF=AD=E4=B9=89?= =?UTF-8?q?=EF=BC=8C0.3.293=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systems/warehouse_panel.js | 31 +++++++++++++++++--------- methods/changes/system.json | 14 ++++++++++++ methods/system.json | 2 +- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/app/service/systems/warehouse_panel.js b/app/service/systems/warehouse_panel.js index 737b274..14d16dd 100644 --- a/app/service/systems/warehouse_panel.js +++ b/app/service/systems/warehouse_panel.js @@ -862,7 +862,7 @@ class WarehousePanelService extends Service { * @param {Date} todayStart 今日开始 * @param {Date} tomorrowStart 明日开始 * @param {boolean} isGroup true=团购(wave_scope 1/3,top 按打包台);false=散单(wave_scope 非 1/3,top 按打包员) - * @return {Promise} { orders, goods, sku, wave, top } + * @return {Promise} 团购 { orders, goods, sku, wave, top };散单 { orders, goods, sku, top }(无 wave) */ async queryPackingBlock(warehouseId, todayStart, tomorrowStart, isGroup) { const { model } = this.ctx; @@ -917,22 +917,31 @@ class WarehousePanelService extends Service { ]); const summary = Array.isArray(summaryRows) && summaryRows.length > 0 ? summaryRows[0] : {}; - const top = (topRows || []).map((row, index) => ({ - rank: index + 1, - name: row.name || '', - orders: Number(row.orders || 0), - goods: Number(row.goods || 0), - sku: Number(row.sku || 0), - wave: Number(row.wave || 0), - })); + const top = (topRows || []).map((row, index) => { + const item = { + rank: index + 1, + name: row.name || '', + orders: Number(row.orders || 0), + goods: Number(row.goods || 0), + sku: Number(row.sku || 0), + }; + // 仅团购块输出波次数(散单块无波次语义) + if (isGroup) { + item.wave = Number(row.wave || 0); + } + return item; + }); - return { + const result = { orders: Number(summary.orders || 0), goods: Number(summary.goods || 0), sku: Number(summary.sku || 0), - wave: Number(summary.wave || 0), top, }; + if (isGroup) { + result.wave = Number(summary.wave || 0); + } + return result; } /** diff --git a/methods/changes/system.json b/methods/changes/system.json index 20ef566..de1cc13 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,18 @@ [ + { + "version": "0.3.293", + "date": "2026-10-12", + "type": "updated", + "summary": "index.getWarehousePanelData scatterPacking 移除 wave 波次数(散单无波次语义)(0.3.292 → 0.3.293)", + "methods": [ + "index.getWarehousePanelData" + ], + "notes": [ + "变更内容:scatterPacking(散单打包块)的 summary 与 top 各项移除 wave 字段(散单无波次语义),仅团购块 groupPacking 保留 wave(波次数);orders/goods/sku/top 结构不变。", + "代码依据:app/service/systems/warehouse_panel.js#queryPackingBlock(isGroup 时才输出 wave);ESLint 0 错误。", + "文档变更范围:methods/system.json 的 module=index 分组仅更新 index.getWarehousePanelData 一条(response.data.description 补散单块无 wave);根版本 0.3.292 → 0.3.293、updatedAt 保持 2026-10-12;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。" + ] + }, { "version": "0.3.292", "date": "2026-10-12", diff --git a/methods/system.json b/methods/system.json index 575e9e7..13b7be1 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,7 +1,7 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.292", + "version": "0.3.293", "updatedAt": "2026-10-12", "headers": [ {