From df0c1735c821ff66340ceb9931f527dfa3bf07f6 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 21 Sep 2026 19:25:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(workbench):=20business=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=81=A2=E5=A4=8D=20users=20=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=89=93=E5=8C=85=E4=BA=BA=EF=BC=8Ctoken+key=20?= =?UTF-8?q?=E6=96=B0=E9=93=BE=E8=B7=AF=E4=BF=9D=E6=8C=81=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E6=88=90=E5=91=98=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systems/workbench.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/service/systems/workbench.js b/app/service/systems/workbench.js index bb22a17..5fb4f9e 100644 --- a/app/service/systems/workbench.js +++ b/app/service/systems/workbench.js @@ -778,8 +778,8 @@ class WorkbenchService extends Service { * 打包任务写入:根据发货单号查询订单并创建/更新打包任务记录。 * 兼容一单多号(主单号/子单号):传入 waybill_code 时按「订单 + 运单号」维度 * 记录打包流水与去重,主/子单号流水互不覆盖;未传时保持订单维度(兼容旧设备端)。 - * 打包人一律取该工作台绑定成员(wms_workbench_member),不再接收 users 入参。 - * @param {Object} params - { delivery_order_code, wave_no, warehouse_id, workbench_id, status, pack_time, waybill_code } + * 打包人:上报了 users(business 旧链路)以上报为准,未上报(token+key 新链路)自动回填工作台绑定成员。 + * @param {Object} params - { delivery_order_code, wave_no, warehouse_id, workbench_id, status, pack_time, waybill_code, users } * @param {string} [params.waybill_code] 扫描打包的运单号(可选,用于运单维度记录流水) * @returns {Promise} */ @@ -791,7 +791,8 @@ class WorkbenchService extends Service { wave_total_orders: waveTotalOrders, items_count: itemsCount, items_total: itemsTotal, - waybill_code: waybillCodeParam } = params; + waybill_code: waybillCodeParam, + users: usersParam } = params; if (!deliveryOrderCode) throw new Error('发货单号不能为空'); if (!inputWarehouseId) throw new Error('仓库ID不能为空'); @@ -1100,10 +1101,10 @@ class WorkbenchService extends Service { }); // 步骤7:写入打包人员信息 - // 打包人一律取该工作台绑定成员(成员登入/登出链路 bindMember/removeMember 已持久化到 - // wms_workbench_member,数据源单一,前端不再上报 users 入参)。 - let users = []; - if (validWorkbenchId) { + // 上报了 users(business 旧链路)时以上报为准;未上报(token+key 新链路)时 + // 自动回填该工作台绑定成员(成员登入/登出链路 bindMember/removeMember 已持久化到 wms_workbench_member)。 + let users = Array.isArray(usersParam) && usersParam.length > 0 ? usersParam : []; + if (users.length === 0 && validWorkbenchId) { try { const members = await this.listWorkbenchMembers(validWorkbenchId); users = members.map(m => ({ @@ -3633,7 +3634,9 @@ class WorkbenchService extends Service { */ async packOrderByToken(data = {}) { const { ctx } = this; - const { token, key, ...legacyParams } = data || {}; + // 新链路(token+key / 旧参数过渡)一律不接收 users:打包人由 _packOrder 自动回填工作台绑定成员。 + // 仅 business(packOrder) 旧链路支持上报 users。 + const { token, key, users: _ignoredUsers, ...legacyParams } = data || {}; const resolved = await this.resolveWorkbenchContext(token); if (!resolved.success) return resolved;