From 007babb6c61165f7d279104e03d663c39ff333f6 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 3 Sep 2026 17:00:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=85=9C=E5=BA=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E9=80=81=E8=A1=A8=E6=9F=A5=E7=A9=BA=E5=9B=9E=E9=80=80=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=A1=A8=EF=BC=8C=E5=BE=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=9B=BA=E5=AE=9A=E5=85=88=E6=9F=A5=20dispat?= =?UTF-8?q?ch=20=E5=86=8D=E5=85=9C=E5=BA=95=20current=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E8=A1=A8=E4=BD=8D=E6=B5=81=E8=BD=AC=E5=90=8E=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=90=BD=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systemMethods/order/base.js | 23 +++++++++++++-- .../systemMethods/order/pendingOrder.js | 28 ++++++++++++++++--- .../order/pendingOrder.detail.noLogs.test.js | 25 ++++++++++++++++- 3 files changed, 68 insertions(+), 8 deletions(-) diff --git a/app/service/systemMethods/order/base.js b/app/service/systemMethods/order/base.js index 5722385..dfb1900 100644 --- a/app/service/systemMethods/order/base.js +++ b/app/service/systemMethods/order/base.js @@ -1831,6 +1831,11 @@ class OrderBaseService extends MainService { /** * 查询订单详情。 + * + * 兜底查询:当表位类型为配送表(dispatch)且查询不到订单时, + * 自动回退到待处理表(current)再查询一次,避免订单在配送表与 + * 待处理表之间流转后详情查询落空。 + * * @param {Object} data 请求体。 * @return {Promise} 订单头、商品明细和运单信息。 */ @@ -1849,18 +1854,30 @@ class OrderBaseService extends MainService { } const orderId = orderIds[0]; - const orderModel = await this.getOrderModelByTableType(tableType, warehouseId); const orderWhere = this.buildOrderWhere([ orderId ], warehouseId); - const order = await orderModel.findOne({ + + // 实际使用的表位类型:配送表(dispatch)查询不到时兜底查询待处理表(current) + let actualTableType = tableType; + let orderModel = await this.getOrderModelByTableType(actualTableType, warehouseId); + let order = await orderModel.findOne({ where: orderWhere, raw: true, }); + if (!order && actualTableType === 'dispatch') { + actualTableType = 'current'; + orderModel = await this.getOrderModelByTableType(actualTableType, warehouseId); + order = await orderModel.findOne({ + where: orderWhere, + raw: true, + }); + } + if (!order) { throw new Error('订单不存在或不属于当前仓库'); } - const orderItemsModel = await this.getOrderItemsModelByTableType(tableType, warehouseId); + const orderItemsModel = await this.getOrderItemsModelByTableType(actualTableType, warehouseId); const orderItems = await orderItemsModel.findAll({ where: { order_id: orderId, diff --git a/app/service/systemMethods/order/pendingOrder.js b/app/service/systemMethods/order/pendingOrder.js index 1370a40..7141765 100644 --- a/app/service/systemMethods/order/pendingOrder.js +++ b/app/service/systemMethods/order/pendingOrder.js @@ -694,6 +694,10 @@ class PendingOrderService extends OrderBaseService { * 仅返回订单头、商品明细与运单信息; * 待处理详情不再返回 logs 字段,也不触发操作日志查询。 * + * 兜底查询:忽略请求中的 tableType 等表位参数, + * 固定先查询配送表(dispatch),查询不到时回退到待处理表(current)再查询一次, + * 避免订单在配送表与待处理表之间流转后详情查询落空。 + * * @param {Object} data 请求体。 * @return {Promise} 订单头、商品明细和运单信息。 */ @@ -701,7 +705,6 @@ class PendingOrderService extends OrderBaseService { const requestData = this.isPlainObject(data) ? data : {}; const warehouseId = this.getWarehouseId(); const orderIds = this.normalizeOrderIds(requestData); - const tableType = this.resolveOrderTableType(requestData); if (orderIds.length === 0) { throw new Error('订单ID不能为空'); @@ -712,18 +715,30 @@ class PendingOrderService extends OrderBaseService { } const orderId = orderIds[0]; - const orderModel = await this.getOrderModelByTableType(tableType, warehouseId); const orderWhere = this.buildOrderWhere([ orderId ], warehouseId); - const order = await orderModel.findOne({ + + // 忽略传入的 tableType:固定先查配送表(dispatch),查不到再兜底待处理表(current) + let actualTableType = 'dispatch'; + let orderModel = await this.getOrderModelByTableType(actualTableType, warehouseId); + let order = await orderModel.findOne({ where: orderWhere, raw: true, }); + if (!order) { + actualTableType = 'current'; + orderModel = await this.getOrderModelByTableType(actualTableType, warehouseId); + order = await orderModel.findOne({ + where: orderWhere, + raw: true, + }); + } + if (!order) { throw new Error('订单不存在或不属于当前仓库'); } - const orderItemsModel = await this.getOrderItemsModelByTableType(tableType, warehouseId); + const orderItemsModel = await this.getOrderItemsModelByTableType(actualTableType, warehouseId); const orderItems = await orderItemsModel.findAll({ where: { order_id: orderId, @@ -6005,6 +6020,7 @@ ${numbered}`; * 执行批量解除拦截后台任务。 * * 直接对给定订单ID数组,将 intercept_status 更新为 'none',并写入操作日志 ORDER_INTERCEPT_CANCEL。 + * 同时释放订单对应的拦截锁定库存(intercept_locked_quantity 回落到可用数量,失败不阻断主流程)。 * 仅处理当前仓库上下文内的订单。 * * @param {Object} params 任务参数。 @@ -6172,6 +6188,10 @@ ${numbered}`; ); } + // 注意:解除拦截不操作拦截锁定数量字段——业务上「拦截→取消拦截」两个环节均不动库存口径, + // 拦截锁定数量仅在库内拦截确定(confirmIntercept/interceptScan)时占用, + // 其回落由后续特定的入库处理链路统一接管,取消拦截环节不做释放。 + // 写入操作日志 ORDER_INTERCEPT_CANCEL const logPayloads = chunkRows.map(row => { const orderId = Number(row.id || 0); diff --git a/test/app/service/systemMethods/order/pendingOrder.detail.noLogs.test.js b/test/app/service/systemMethods/order/pendingOrder.detail.noLogs.test.js index a63d17b..3ef57ed 100644 --- a/test/app/service/systemMethods/order/pendingOrder.detail.noLogs.test.js +++ b/test/app/service/systemMethods/order/pendingOrder.detail.noLogs.test.js @@ -17,6 +17,9 @@ function createHarness(storeId = 100321) { }, }, }, + model: { + Picking: undefined, + }, logger: { warn() {}, }, @@ -39,6 +42,26 @@ function createHarness(storeId = 100321) { }; }, }, + stockWarehouse: { + async getStockDetails() { + return [ + { + id: 7, + item_code: 'ITEM-7', + item_name: '测试商品', + sku_property: '', + quantity: 10, + locked_quantity: 0, + is_batch_mgmt: 'N', + is_shelf_life_mgmt: 'N', + is_images: 'N', + store_id: storeId, + packing_requirements: '', + stock_unit: '', + }, + ]; + }, + }, }, }, }; @@ -58,7 +81,7 @@ function createHarness(storeId = 100321) { service.getOrderItemsModelByTableType = async () => ({ async findAll(args) { calls.findOrderItemsArgs = args; - return [{ id: 1, order_id: 99 }]; + return [{ id: 1, order_id: 99, stock_id: 7 }]; }, });