fix(packTask): 自动完结与关闭旧任务时同步订单打包状态,修正设备端未传 status 时订单误写已完成

This commit is contained in:
liufumingren 2026-09-03 17:03:13 +08:00
parent 5dafbefa34
commit cb2a78f4f1
2 changed files with 28 additions and 3 deletions

View File

@ -35,7 +35,7 @@ class PackTaskAutoFinishService extends MainService {
status: { [Op.lt]: PACK_TASK_FINISHED_STATUS },
start_time: { [Op.ne]: null },
},
attributes: [ 'id', 'warehouse_id', 'pack_mode', 'start_time' ],
attributes: [ 'id', 'warehouse_id', 'pack_mode', 'start_time', 'order_id', 'wave_id' ],
});
if (tasks.length === 0) {
@ -96,6 +96,19 @@ class PackTaskAutoFinishService extends MainService {
status: PACK_TASK_FINISHED_STATUS,
});
// 同步关联订单打包状态(与 workbench._finishPack 语义一致,避免任务已完成但订单停留打包中)
const workbenchService = ctx.service && ctx.service.systems && ctx.service.systems.workbench;
if (workbenchService && typeof workbenchService._updateOrderPackStatus === 'function') {
const isGroupTask = Number(task.pack_mode) === PACK_MODE_GROUP;
const taskWaveId = isGroupTask ? Number(task.wave_id || 0) : 0;
await workbenchService._updateOrderPackStatus(warehouseId, {
orderId: Number(task.order_id || 0),
waveId: taskWaveId,
packStatus: PACK_TASK_FINISHED_STATUS,
caller: 'PackTaskAutoFinish',
});
}
autoFinished += 1;
ctx.logger.info(

View File

@ -495,7 +495,8 @@ class WorkbenchService extends Service {
async _updateOrderPackStatus(warehouseId, { orderId, waveId, packStatus, caller = 'Workbench' }) {
const { ctx } = this;
const statusNum = parseInt(packStatus);
const orderPackStatus = statusNum >= 2 ? 'fin' : (statusNum === 1 ? 'padding' : 'fin');
// 任务状态 <2(0待处理/1打包中)或未传一律视为打包中;>=2 视为已完成
const orderPackStatus = (Number.isNaN(statusNum) || statusNum < 2) ? 'padding' : 'fin';
const orderUpdateData = { pack_status: orderPackStatus };
const orderDeliveryFactory = ctx.model.OrderDeliveryFactory;
@ -654,6 +655,16 @@ class WorkbenchService extends Service {
await previousTask.update({ end_time: previousEndTime, status: 2 });
ctx.logger.info('[Workbench._packOrder] 关闭上一个未结束任务 taskId=%d orderId=%d workbenchId=%d',
previousTask.id, previousTask.order_id, validWorkbenchId);
// 同步旧任务关联订单打包状态(与 _finishPack 语义一致,避免旧订单 pack_status 停留打包中)
const prevIsGroupTask = Number(previousTask.pack_mode) === 2;
const prevTaskWaveId = prevIsGroupTask ? Number(previousTask.wave_id || 0) : 0;
await this._updateOrderPackStatus(warehouseId, {
orderId: Number(previousTask.order_id || 0),
waveId: prevTaskWaveId,
packStatus: 2,
caller: 'Workbench._packOrder.closePrevious',
});
}
}
@ -724,10 +735,11 @@ class WorkbenchService extends Service {
ctx.logger.info('[Workbench._packOrder] 创建打包任务 taskId=%d orderId=%d', packTask.id, orderId);
// 步骤6.5:更新订单的打包状态字段(散单按订单更新,团购按波次批量更新)
// 传 packData.status(已归一化,缺省为 1),避免设备端未传 status 时订单被误写为已完成
await this._updateOrderPackStatus(warehouseId, {
orderId,
waveId: isSandan === 1 ? 0 : waveId,
packStatus,
packStatus: packData.status,
caller: 'Workbench._packOrder',
});