fix(workbench): business 打包分支恢复 users 上报打包人,token+key 新链路保持工作台成员回填
This commit is contained in:
parent
17944bcf01
commit
df0c1735c8
@ -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<Object>}
|
||||
*/
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user