From 3171ce4fab5fc8e1837c52b38f661321eb4151ab Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 13 Oct 2026 00:53:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(pick):=20=E6=8B=A3=E8=B4=A7=E8=B7=B3?= =?UTF-8?q?=E8=BF=87=E6=8B=A6=E6=88=AA=E5=8D=95=E5=8C=BA=E5=88=86=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=8A=B6=E6=80=81=EF=BC=8C=E5=B7=B2=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=9D=A2=E5=8D=95=E4=B8=8D=E5=86=8D=E8=87=AA=E5=8A=A8=E7=A7=BB?= =?UTF-8?q?=E5=87=BA=E6=B3=A2=E6=AC=A1=EF=BC=880.3.294=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systems/pick.js | 28 ++++++++++++++++++++++++---- methods/changes/system.json | 15 +++++++++++++++ methods/system.json | 30 +++++++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 7 deletions(-) diff --git a/app/service/systems/pick.js b/app/service/systems/pick.js index 0eff618..b95ddb2 100644 --- a/app/service/systems/pick.js +++ b/app/service/systems/pick.js @@ -1953,6 +1953,7 @@ class PickSystemService extends Service { // 检查目标订单是否进入拦截流程,拦截订单直接跳过: // 不完成拣货、不扣减库存(不取出)、不报错,其余订单照常完成 + // 同时记录打印状态:已打印面单的拦截订单保持不动,不做自动移出波次 const skippedInterceptedOrders = []; if (targetOrderIds.length > 0) { const interceptCheckModel = await this.getOrderModel(warehouseId); @@ -1966,7 +1967,7 @@ class PickSystemService extends Service { [this.app.Sequelize.Op.ne]: INTERCEPT_STATUS_NONE, }, }, - attributes: [ 'id', 'intercept_status' ], + attributes: [ 'id', 'intercept_status', 'print_status' ], raw: true, transaction, }); @@ -1979,19 +1980,36 @@ class PickSystemService extends Service { skippedInterceptedOrders.push({ order_id: Number(orderRow && orderRow.id || 0), intercept_status: String(orderRow && orderRow.intercept_status || '').trim() || 'none', + print_status: String(orderRow && orderRow.print_status || '').trim().toLowerCase() || 'none', }); } targetOrderIds = targetOrderIds.filter(orderId => !interceptedOrderIdSet.has(orderId)); } } - // source !== 0(PDA/后台抓取创建的任务)时,被跳过的拦截订单直接从波次中移除: - // 订单 wave_id 清零、重建波次索引、回写波次统计,并移除任务订单关联 + // 已打印面单的拦截订单保持不动:面单实物已在波次流程中,自动移出会导致 + // 面单与波次记录分离,此类订单需人工通过 wave.batchRemoveOrders 处理 + const printedSkippedOrderIdSet = new Set(skippedInterceptedOrders + .filter(item => { + const printStatus = String(item && item.print_status || '').trim().toLowerCase(); + return printStatus && printStatus !== 'none'; + }) + .map(item => Number(item && item.order_id || 0))); + const keptInterceptedOrderIds = [ ...printedSkippedOrderIdSet ]; + if (keptInterceptedOrderIds.length > 0) { + ctx.logger.warn(`[pick.wavePickTaskComplete] 已打印拦截订单保持不动,不自动移出波次,需人工处理, taskId=${taskId}, orderIds=${keptInterceptedOrderIds.join(',')}`); + } + + // source !== 0(PDA/后台抓取创建的任务)时,被跳过的拦截订单中「未打印」的 + // 直接从波次中移除:订单 wave_id 清零、删除波次索引、回写波次统计, + // 并移除任务订单关联;已打印的保持不动(见上方 keptInterceptedOrderIds) const removedFromWaveOrderLogItems = []; const removedFromWaveOrderIds = []; const affectedWaveIdsForUnbind = []; if (skippedInterceptedOrders.length > 0 && taskSource !== 0) { - const skippedOrderIds = skippedInterceptedOrders.map(item => item.order_id); + const skippedOrderIds = skippedInterceptedOrders + .map(item => Number(item && item.order_id || 0)) + .filter(orderId => !printedSkippedOrderIdSet.has(orderId)); const interceptOrderModel = await this.getOrderModel(warehouseId); const removableRows = await interceptOrderModel.findAll({ attributes: [ 'id', 'wave_id', 'wave_no' ], @@ -2249,6 +2267,7 @@ class PickSystemService extends Service { skipped_intercepted_order_ids: skippedInterceptedOrders.map(item => item.order_id), skipped_intercepted_orders: skippedInterceptedOrders, removed_from_wave_order_ids: removedFromWaveOrderIds, + kept_intercepted_order_ids: keptInterceptedOrderIds, is_completed: skipProgress.isCompleted, task_completed: skipTaskCompleted, progress: { @@ -2569,6 +2588,7 @@ class PickSystemService extends Service { skipped_intercepted_order_ids: skippedInterceptedOrders.map(item => item.order_id), skipped_intercepted_orders: skippedInterceptedOrders, removed_from_wave_order_ids: removedFromWaveOrderIds, + kept_intercepted_order_ids: keptInterceptedOrderIds, is_completed: progress.isCompleted, task_completed: taskCompleted, progress: { diff --git a/methods/changes/system.json b/methods/changes/system.json index de1cc13..4818f1d 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,19 @@ [ + { + "version": "0.3.294", + "date": "2026-10-13", + "type": "updated", + "summary": "pick.wavePickTaskComplete 跳过拦截单时区分打印状态:已打印面单的拦截订单不再自动移出波次(0.3.293 → 0.3.294)", + "methods": [ + "pick.wavePickTaskComplete" + ], + "notes": [ + "变更内容:拣货提交时被跳过的拦截订单中,仅未打印(print_status=none/空)的自动移出波次(原逻辑不区分打印状态,已打印面单的拦截订单也被移出,导致面单实物与波次记录分离);已打印(print_status!=none)的拦截订单保持不动(保留波次与任务订单关联,写 warn 日志提示,需人工 wave.batchRemoveOrders 处理),与复核链路 removeUnprintedInterceptedOrdersFromWave 的原则对齐。响应新增 kept_intercepted_order_ids(保持不动的拦截订单ID列表),skipped_intercepted_orders 明细新增 print_status 字段。", + "背景:生产日志 2026-09-29 11:24:22 订单 839153 面单已打印、拣货员拿面单拣货时货主发起拦截,提交拣货后被自动移出波次 B2026092900050,面单与波次记录分离。", + "代码依据:app/service/systems/pick.js#wavePickTaskComplete(拦截检查查询补 print_status、移出波次分支过滤已打印、新增 kept_intercepted_order_ids);本地单测新增 IC1/IC2/IC3 用例验证(test/ 目录不入库),31 通过 0 失败;ESLint 0 错误。", + "文档变更范围:methods/system.json 的 pick.wavePickTaskComplete 一条(description 补打印状态区分说明、response 补 4 个字段);根版本 0.3.293 → 0.3.294、updatedAt 2026-10-13;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。" + ] + }, { "version": "0.3.293", "date": "2026-10-12", diff --git a/methods/system.json b/methods/system.json index 13b7be1..bc14019 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,8 +1,8 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.293", - "updatedAt": "2026-10-12", + "version": "0.3.294", + "updatedAt": "2026-10-13", "headers": [ { "name": "platform", @@ -21706,7 +21706,7 @@ }, { "method": "pick.wavePickTaskComplete", - "description": "完全提交拣货任务。支持 mode=1 全部确认,mode=2 部分确认(需传 order_ids)。提交后根据是否全部完成自动推进任务状态。后台抓取创建的任务(source=2)必须先绑定拣货车才能提交,否则返回 400。", + "description": "完全提交拣货任务。支持 mode=1 全部确认,mode=2 部分确认(需传 order_ids)。提交后根据是否全部完成自动推进任务状态。后台抓取创建的任务(source=2)必须先绑定拣货车才能提交,否则返回 400。目标订单中已进入拦截流程的订单直接跳过(不完成拣货、不扣减库存、不报错);其中未打印面单(print_status=none/空)的拦截订单自动移出波次(wave_id 清零、删波次索引、回写波次统计、移除任务订单关联与篮子明细,并写 ORDER_WAVE_REMOVE 日志、触发策略快扫),已打印面单(print_status!=none)的拦截订单保持不动(保留波次/任务关联,需人工 wave.batchRemoveOrders 处理),返回 kept_intercepted_order_ids。", "isNeedAuth": false, "isNeedLogin": true, "isNeedRight": false, @@ -21760,6 +21760,30 @@ "required": true, "description": "本次成功确认的订单ID列表" }, + { + "name": "skipped_intercepted_order_ids", + "type": "array", + "required": true, + "description": "被跳过(已进入拦截流程)的订单ID列表" + }, + { + "name": "skipped_intercepted_orders", + "type": "array", + "required": true, + "description": "被跳过的拦截订单明细,每项含 order_id、intercept_status、print_status" + }, + { + "name": "removed_from_wave_order_ids", + "type": "array", + "required": true, + "description": "被自动移出波次的未打印拦截订单ID列表" + }, + { + "name": "kept_intercepted_order_ids", + "type": "array", + "required": true, + "description": "已打印面单保持不动的拦截订单ID列表(不自动移出波次,需人工 wave.batchRemoveOrders 处理)" + }, { "name": "is_completed", "type": "boolean",