From cb2a78f4f1e8d09df119d108eee9f2f497e4f9f0 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 3 Sep 2026 17:03:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(packTask):=20=E8=87=AA=E5=8A=A8=E5=AE=8C?= =?UTF-8?q?=E7=BB=93=E4=B8=8E=E5=85=B3=E9=97=AD=E6=97=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BF=AE=E6=AD=A3=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AB=AF=E6=9C=AA=E4=BC=A0=20status=20=E6=97=B6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=AF=E5=86=99=E5=B7=B2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systems/pack_task_auto_finish.js | 15 ++++++++++++++- app/service/systems/workbench.js | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/app/service/systems/pack_task_auto_finish.js b/app/service/systems/pack_task_auto_finish.js index 6601124..23cf286 100644 --- a/app/service/systems/pack_task_auto_finish.js +++ b/app/service/systems/pack_task_auto_finish.js @@ -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( diff --git a/app/service/systems/workbench.js b/app/service/systems/workbench.js index 7242da6..1cf6f39 100644 --- a/app/service/systems/workbench.js +++ b/app/service/systems/workbench.js @@ -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', });