feat(workbench): 打包扫描单响应补充拣货人 picker_id/picker_name(波次关联拣货任务)
This commit is contained in:
parent
a078d74122
commit
b6baece8ad
@ -2041,6 +2041,8 @@ class WorkbenchService extends Service {
|
||||
* 散单(isSandan=1)时在响应 order 对象中额外返回 intercept_flag / pack_flag 两个 0/1 标志:
|
||||
* 拦截状态(intercept_status)不等于 none 时 intercept_flag=1,否则 0;
|
||||
* pack_flag 按运单维度判定(该运单号已有打包流水为 1,主/子单号互不影响)。
|
||||
* order 对象始终包含 picker_id / picker_name:通过 wave_id 关联拣货任务取拣货人,
|
||||
* 散单无波次或未分配拣货人时为 null / 空串。
|
||||
* 查询成功时生成一次性打包上下文 key(20 分钟有效)写入 Redis,
|
||||
* 响应附 key 供 workbench.packOrder 消费,打包参数由后端维护防篡改。
|
||||
* @param {Object} params - { barcode, warehouseId, workbenchId }
|
||||
@ -2213,6 +2215,37 @@ class WorkbenchService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
// 步骤6.5:查询拣货人(通过波次关联拣货任务;散单无波次时为 null/空串)
|
||||
let pickerId = null;
|
||||
let pickerName = '';
|
||||
if (waveId && Number(waveId) > 0) {
|
||||
try {
|
||||
const pickerRows = await ctx.model.query(
|
||||
`
|
||||
SELECT t.pick_user_id, t.pick_user_name
|
||||
FROM wms_wave_pick_task_wave tw
|
||||
INNER JOIN wms_wave_pick_task t ON t.id = tw.task_id
|
||||
WHERE tw.wave_id = :waveId
|
||||
AND tw.warehouse_id = :warehouseId
|
||||
AND t.pick_user_id IS NOT NULL
|
||||
ORDER BY t.create_time DESC
|
||||
LIMIT 1
|
||||
`,
|
||||
{
|
||||
replacements: { waveId: Number(waveId), warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
}
|
||||
);
|
||||
const pickerRow = Array.isArray(pickerRows) && pickerRows.length > 0 ? pickerRows[0] : null;
|
||||
if (pickerRow && pickerRow.pick_user_id != null) {
|
||||
pickerId = Number(pickerRow.pick_user_id);
|
||||
pickerName = String(pickerRow.pick_user_name || '').trim();
|
||||
}
|
||||
} catch (pickerErr) {
|
||||
ctx.logger.warn('[Workbench._queryOrder] 查询拣货人失败 waveId=%d: %s', waveId, pickerErr.message);
|
||||
}
|
||||
}
|
||||
|
||||
const result = {
|
||||
barcode: normalizedBarcode,
|
||||
waybill_code: waybillCode,
|
||||
@ -2244,6 +2277,8 @@ class WorkbenchService extends Service {
|
||||
items_weight: orderRow.items_weight,
|
||||
source_platform_code: orderRow.source_platform_code,
|
||||
logistics_name: orderRow.logistics_name,
|
||||
picker_id: pickerId,
|
||||
picker_name: pickerName,
|
||||
create_at: orderRow.create_at,
|
||||
updated_at: orderRow.updated_at,
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user