From b9fe9e774ce0a34456f50fbc6f0893f6e8ea5f9c Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 4 Aug 2026 16:02:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E5=BA=93=E5=AD=98=E4=BA=8B=E5=8A=A1=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E=20-=20picking=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0FOR?= =?UTF-8?q?=20UPDATE=E8=A1=8C=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - recheckOrder._completePickForOrder: picking查询添加FOR UPDATE,防止并发重复扣减 - pick_compensation.compensateInTransaction: 同上 - pick_compensation.releaseCancelledInTransaction: 同上 与主路径 wavePickTaskComplete 保持一致的双重行锁防护(picking FOR UPDATE + storage LOCK.UPDATE) --- app/service/systemMethods/order/recheckOrder.js | 4 +++- app/service/systems/pick_compensation.js | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/service/systemMethods/order/recheckOrder.js b/app/service/systemMethods/order/recheckOrder.js index 1df67c6..dd34ba5 100644 --- a/app/service/systemMethods/order/recheckOrder.js +++ b/app/service/systemMethods/order/recheckOrder.js @@ -3995,13 +3995,15 @@ class RecheckOrderService extends OrderBaseService { ); // 步骤3:检查是否存在 wms_picking 记录(仅统计 pending 且未删除的记录) + // 使用 FOR UPDATE 行锁,防止并发事务读取到相同的 picking 记录导致重复扣减库存 const pickingRows = await ctx.model.query( `SELECT id, storage_id, quantity, space_id FROM wms_picking WHERE order_id = :orderId AND warehouse_id = :warehouseId AND status = 'pending' - AND deleted_at IS NULL`, + AND deleted_at IS NULL + FOR UPDATE`, { replacements: { orderId, warehouseId }, type: ctx.model.QueryTypes.SELECT, diff --git a/app/service/systems/pick_compensation.js b/app/service/systems/pick_compensation.js index cd5ba78..a6ce4a7 100644 --- a/app/service/systems/pick_compensation.js +++ b/app/service/systems/pick_compensation.js @@ -335,6 +335,7 @@ class PickCompensationService extends MainService { try { // Step 1: 重新查询 wms_picking,确保只处理仍然 status='pending' 的记录 + // 使用 FOR UPDATE 行锁,防止并发事务读取到相同的 picking 记录导致重复释放锁定库存 const confirmedRows = await ctx.model.query(` SELECT p.id, @@ -348,6 +349,7 @@ class PickCompensationService extends MainService { AND p.storage_id IS NOT NULL AND p.storage_id > 0 AND p.deleted_at IS NULL -- 排除软删除记录 + FOR UPDATE `, { replacements: { pickingIds, warehouseId }, type: ctx.model.QueryTypes.SELECT, @@ -474,6 +476,7 @@ class PickCompensationService extends MainService { try { // Step 1: 重新查询 wms_picking,确保只处理仍然 status='pending' 的记录 + // 使用 FOR UPDATE 行锁,防止并发事务读取到相同的 picking 记录导致重复扣减库存 const confirmedRows = await ctx.model.query(` SELECT p.id, @@ -487,6 +490,7 @@ class PickCompensationService extends MainService { AND p.storage_id IS NOT NULL AND p.storage_id > 0 AND p.deleted_at IS NULL -- 排除软删除记录 + FOR UPDATE `, { replacements: { pickingIds, warehouseId }, type: ctx.model.QueryTypes.SELECT,