From 110d0685ee12e252a2a1051a8df32728117154ef Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 19 Aug 2026 00:00:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E5=9B=A2=E8=B4=AD=E8=A7=A3?= =?UTF-8?q?=E7=BB=91=E8=BD=A6=E6=94=B9=E4=B8=BA=E4=BB=BB=E5=8A=A1=E5=85=A8?= =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E5=A4=8D=E6=A0=B8/=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=8D=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 复核侧:_resolveTaskIdByWaveFallback 由单波次订单复核检查改为任务下 全部关联波次订单 recheck_status 均完成才返回 taskId,避免复核一个波次 即解绑 wms_pick_task_cart_binding 并误将任务置为已完成 - 打印侧:tryUnbindCartAfterPrintComplete 团购(pick_mode 1/5)改为按任务 全波次订单 print_status 检查,全部打印完成才解绑;散单保持任务订单维度检查 --- .../systemMethods/order/recheckOrder.js | 69 ++++++++++++++---- app/service/systemMethods/print.js | 73 +++++++++++++------ 2 files changed, 105 insertions(+), 37 deletions(-) diff --git a/app/service/systemMethods/order/recheckOrder.js b/app/service/systemMethods/order/recheckOrder.js index c57c02b..7ff99c0 100644 --- a/app/service/systemMethods/order/recheckOrder.js +++ b/app/service/systemMethods/order/recheckOrder.js @@ -290,8 +290,12 @@ class RecheckOrderService extends OrderBaseService { }); const totalOrders = mergedList.length; - const reviewedCount = mergedList.filter(o => o.recheck_status === 'fin').length; - const unreviewedCount = totalOrders - reviewedCount; + // 复核统计仅计非拦截订单(拦截订单保留在 list 中按单提示) + const reviewableOrders = mergedList.filter( + o => !this.isInterceptedOrderStatus(o.intercept_status) + ); + const reviewedCount = reviewableOrders.filter(o => o.recheck_status === 'fin').length; + const unreviewedCount = reviewableOrders.length - reviewedCount; const waveType = scanViews.find(v => Number(v.wave_type || 0) > 0)?.wave_type || 0; const pickerInfo = await this.getPickerInfoByTaskId(taskId, warehouseId); @@ -451,8 +455,12 @@ class RecheckOrderService extends OrderBaseService { }); const totalOrders = mergedList.length; - const reviewedCount = mergedList.filter(o => o.recheck_status === 'fin').length; - const unreviewedCount = totalOrders - reviewedCount; + // 复核统计仅计非拦截订单(拦截订单保留在 list 中按单提示) + const reviewableOrders = mergedList.filter( + o => !this.isInterceptedOrderStatus(o.intercept_status) + ); + const reviewedCount = reviewableOrders.filter(o => o.recheck_status === 'fin').length; + const unreviewedCount = reviewableOrders.length - reviewedCount; const waveType = scanViews.find(v => Number(v.wave_type || 0) > 0)?.wave_type || 0; return { @@ -480,6 +488,8 @@ class RecheckOrderService extends OrderBaseService { * @param {number} waveId 波次ID。 * @param {string} waveNo 波次号。 * @param {number} warehouseId 仓库ID。 + * 拦截订单保留在 list 中(带 intercept_status),不参与复核校验与 reviewed/unreviewed/printed 统计, + * 波次内存在拦截订单时不再阻断整个扫描视图加载(与团购模式一致)。 * @return {Promise} 扁平化扫描视图,包含 picker_id、picker_name、task_id、wave_id、wave_no、 * wave_type、pick_mode、strategy_id、strategy_name、total_orders、reviewed_count、unreviewed_count、 * printed_count、unprinted_count、list。 @@ -495,8 +505,15 @@ class RecheckOrderService extends OrderBaseService { const normalizedWaveId = Number(waveId || 0); const orders = Array.isArray(baseWaveView.orders) ? baseWaveView.orders : []; - // 校验波次内所有订单是否都已拣货,未拣货订单不允许复核 - for (const order of orders) { + // 分离拦截订单:拦截订单保留在 list 中由前端按单提示拦截(intercept_status), + // 仅对非拦截订单做复核校验与统计,与团购模式一致, + // 波次内存在拦截订单时不再阻断整个散单扫描视图加载 + const normalOrders = orders.filter( + order => !this.isInterceptedOrderStatus(order.intercept_status) + ); + + // 校验波次内非拦截订单是否都已拣货,未拣货订单不允许复核 + for (const order of normalOrders) { this.assertOrderCanRecheck(order); } @@ -506,13 +523,13 @@ class RecheckOrderService extends OrderBaseService { this.getWaveStrategyInfo(normalizedWaveId, warehouseId), ]); - // 计算复核汇总 - const reviewedCount = orders.filter(o => o.recheck_status === 'fin').length; - const unreviewedCount = orders.length - reviewedCount; + // 计算复核汇总(仅统计非拦截订单) + const reviewedCount = normalOrders.filter(o => o.recheck_status === 'fin').length; + const unreviewedCount = normalOrders.length - reviewedCount; - // 计算打印汇总 - const printedCount = orders.filter(o => o.is_printed === true).length; - const unprintedCount = orders.length - printedCount; + // 计算打印汇总(仅统计非拦截订单) + const printedCount = normalOrders.filter(o => o.is_printed === true).length; + const unprintedCount = normalOrders.length - printedCount; // 批量查询包材推荐 const packageMaterialMap = await this.batchQueryPackageMaterialRecommendation(orders, warehouseId); @@ -2231,16 +2248,36 @@ class RecheckOrderService extends OrderBaseService { return 0; } - // 检查波次下所有订单是否均已复核完成(团购模式以订单表 recheck_status 为准) - const unreviewedInWave = await orderModel.count({ + // 查任务关联的全部波次(团购任务一车多波次,必须任务下所有波次订单全部复核完成才允许解绑) + const taskAllWaveRows = await ctx.model.query( + `SELECT DISTINCT tw.wave_id + FROM wms_wave_pick_task_wave tw + WHERE tw.task_id = :taskId + AND tw.warehouse_id = :warehouseId`, + { + replacements: { taskId: fallbackTaskId, warehouseId }, + type: ctx.model.QueryTypes.SELECT, + } + ); + + const taskAllWaveIds = (Array.isArray(taskAllWaveRows) ? taskAllWaveRows : []) + .map(r => Number(r?.wave_id || 0)) + .filter(id => id > 0); + + if (taskAllWaveIds.length === 0) { + return 0; + } + + // 检查任务下所有波次的订单是否均已复核完成(团购模式以订单表 recheck_status 为准) + const unreviewedCount = await orderModel.count({ where: { - wave_id: orderWaveId, + wave_id: { [ctx.app.Sequelize.Op.in]: taskAllWaveIds }, warehouse_id: warehouseId, recheck_status: { [ctx.app.Sequelize.Op.ne]: 'fin' }, }, }); - return unreviewedInWave === 0 ? fallbackTaskId : 0; + return unreviewedCount === 0 ? fallbackTaskId : 0; } /** diff --git a/app/service/systemMethods/print.js b/app/service/systemMethods/print.js index 7c7dd2f..018c9ea 100644 --- a/app/service/systemMethods/print.js +++ b/app/service/systemMethods/print.js @@ -2873,34 +2873,65 @@ class PrintService extends MainService { taskId = Number(taskWave.task_id); if (!taskId) return; - if (waveType === 1) { - const taskRows = await ctx.model.query( - 'SELECT pick_mode FROM wms_wave_pick_task WHERE id = :taskId LIMIT 1', - { replacements: { taskId }, type: ctx.model.QueryTypes.SELECT } - ); - const task = Array.isArray(taskRows) && taskRows.length > 0 ? taskRows[0] : null; - const pickMode = task ? Number(task.pick_mode) : 0; - if (pickMode !== 1) return; - } - - // 团购 / 散单统一按订单维度检查:所有订单均已打印时才解绑 - const taskOrders = await ctx.model.query( - 'SELECT DISTINCT order_id FROM wms_wave_pick_task_order WHERE task_id = :taskId', - { replacements: { taskId }, type: ctx.model.QueryTypes.SELECT } - ); - const orderIds = (Array.isArray(taskOrders) ? taskOrders : []).map(r => Number(r && r.order_id)).filter(id => id > 0); - if (orderIds.length === 0) return; const orderDeliveryFactory = ctx.model && ctx.model.OrderDeliveryFactory; if (!orderDeliveryFactory || typeof orderDeliveryFactory.getCurrentModel !== 'function') { this.ctx.logger.warn('[print.unbindCart] OrderDeliveryFactory 不可用,跳过检查'); return; } const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(resolvedWarehouseId); - const unprintedCount = await orderDeliveryModel.count({ - where: { id: { [ctx.model.Sequelize.Op.in]: orderIds }, print_status: 'none' }, - }); + + let totalOrderCount = 0; + let unprintedCount = 0; + + if (waveType === 1) { + // 团购波次:仅团购拣货模式(pick_mode=1 小团购 / pick_mode=5 大团购)参与解绑判断 + const taskRows = await ctx.model.query( + 'SELECT pick_mode FROM wms_wave_pick_task WHERE id = :taskId LIMIT 1', + { replacements: { taskId }, type: ctx.model.QueryTypes.SELECT } + ); + const task = Array.isArray(taskRows) && taskRows.length > 0 ? taskRows[0] : null; + const pickMode = task ? Number(task.pick_mode) : 0; + if (![ 1, 5 ].includes(pickMode)) return; + + // 团购任务订单不写入 wms_wave_pick_task_order,改为按任务关联的全部波次统计: + // 任务下所有波次的订单均已打印时才解绑 + const taskWaveIdRows = await ctx.model.query( + 'SELECT DISTINCT wave_id FROM wms_wave_pick_task_wave WHERE task_id = :taskId AND warehouse_id = :warehouseId', + { replacements: { taskId, warehouseId: resolvedWarehouseId }, type: ctx.model.QueryTypes.SELECT } + ); + const waveIds = (Array.isArray(taskWaveIdRows) ? taskWaveIdRows : []) + .map(r => Number(r && r.wave_id)) + .filter(id => id > 0); + if (waveIds.length === 0) return; + unprintedCount = await orderDeliveryModel.count({ + where: { + warehouse_id: resolvedWarehouseId, + wave_id: { [ctx.model.Sequelize.Op.in]: waveIds }, + print_status: 'none', + }, + }); + totalOrderCount = await orderDeliveryModel.count({ + where: { + warehouse_id: resolvedWarehouseId, + wave_id: { [ctx.model.Sequelize.Op.in]: waveIds }, + }, + }); + } else { + // 散单波次:按任务订单维度检查,任务下所有订单均已打印时才解绑 + const taskOrders = await ctx.model.query( + 'SELECT DISTINCT order_id FROM wms_wave_pick_task_order WHERE task_id = :taskId', + { replacements: { taskId }, type: ctx.model.QueryTypes.SELECT } + ); + const orderIds = (Array.isArray(taskOrders) ? taskOrders : []).map(r => Number(r && r.order_id)).filter(id => id > 0); + if (orderIds.length === 0) return; + unprintedCount = await orderDeliveryModel.count({ + where: { id: { [ctx.model.Sequelize.Op.in]: orderIds }, print_status: 'none' }, + }); + totalOrderCount = orderIds.length; + } + if (unprintedCount > 0) { - this.ctx.logger.info('[print.unbindCart] 尚有未打印订单,跳过解绑', { waveId, warehouseId, taskId, waveType, waveTypeLabel: waveType === 1 ? '团购' : '散单', totalOrders: orderIds.length, unprintedCount }); + this.ctx.logger.info('[print.unbindCart] 尚有未打印订单,跳过解绑', { waveId, warehouseId, taskId, waveType, waveTypeLabel: waveType === 1 ? '团购' : '散单', totalOrders: totalOrderCount, unprintedCount }); return; }