From 2e95fb19d4a52b17b21758d6bfcf5a7593760757 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 15 Aug 2026 20:12:26 +0800 Subject: [PATCH] =?UTF-8?q?perf(query):=20=E8=BF=90=E5=8D=95=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E4=BC=98=E5=85=88=E5=BA=8F=E5=88=97=E8=A1=A8=E7=9B=B4?= =?UTF-8?q?=E6=9F=A5=EF=BC=8C=E5=87=8F=E5=B0=91=E4=B8=89=E8=A1=A8=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/inbox/functions.js | 67 +++++++++++++++++++++++----- app/service/systems/order_express.js | 20 +++++++++ app/service/systems/waybill.js | 10 +++++ app/service/systems/workbench.js | 10 +++++ 4 files changed, 95 insertions(+), 12 deletions(-) diff --git a/app/service/inbox/functions.js b/app/service/inbox/functions.js index d09c7cd..5fb8434 100644 --- a/app/service/inbox/functions.js +++ b/app/service/inbox/functions.js @@ -538,7 +538,7 @@ class InboxFunctionsService extends Service { // ========== 第一步:运单号精确匹配 ========== const exactExpress = await ctx.model.OrderExpress.findOne({ - attributes: [ 'delivery_order_code' ], + attributes: [ 'delivery_order_code', 'order_id' ], where: { waybill_code: keyword, store_id: storeId, @@ -548,11 +548,38 @@ class InboxFunctionsService extends Service { }); if (exactExpress && exactExpress.delivery_order_code) { - // 用运单关联的发货单号精确查找订单 - found = await findInDeliveryTables({ - store_id: storeId, - delivery_order_code: exactExpress.delivery_order_code, - }); + // 运单精确匹配:先通过序列表定位订单所在分表,命中只查一张表; + // 未命中(存量订单无指针)回退三表按单号遍历 + const exactOrderId = Number(exactExpress.order_id || 0); + if (exactOrderId > 0 && factory && typeof factory.getOrderLocation === 'function') { + try { + const locatedAt = await factory.getOrderLocation(exactOrderId, warehouseId); + if (locatedAt) { + const locatedCfg = tableConfigs.find(cfg => cfg.key === locatedAt); + if (locatedCfg) { + const locatedModel = await locatedCfg.getModel(factory, warehouseId); + if (locatedModel) { + const locatedRow = await locatedModel.findOne({ + attributes, + where: { id: exactOrderId, store_id: storeId }, + raw: true, + }); + if (locatedRow) { + found = { table: locatedCfg.key, table_label: locatedCfg.label, ...locatedRow }; + } + } + } + } + } catch (_err) { /* 定位失败,降级三表遍历 */ } + } + + if (!found) { + // 用运单关联的发货单号精确查找订单 + found = await findInDeliveryTables({ + store_id: storeId, + delivery_order_code: exactExpress.delivery_order_code, + }); + } } // ========== 第二步:运单未命中 → 模糊搜索发货单号 / 平台单号 ========== @@ -3054,16 +3081,32 @@ class InboxFunctionsService extends Service { const orderMissingWbs = []; for (const e of validList) { - // 第二步:查订单行(当前表 → 历史表 → 配送表),取波次信息 + // 第二步:查订单行(优先序列表定位,未命中回退 当前→历史→配送 遍历) let orderRow = null; + const factory = ctx.model.OrderDeliveryFactory; const tableGetters = [ - (f, wid) => f.getCurrentModel(wid), - (f, wid) => f.getHistoryModel(wid), - (f, wid) => f.getDispatchModel(wid), + { location: 'current', getModel: (f, wid) => f.getCurrentModel(wid) }, + { location: 'history', getModel: (f, wid) => f.getHistoryModel(wid) }, + { location: 'dispatch', getModel: (f, wid) => f.getDispatchModel(wid) }, ]; - for (const getModel of tableGetters) { + + let location = null; + try { + if (factory && typeof factory.getOrderLocation === 'function') { + location = await factory.getOrderLocation(e.order_id, warehouseId); + } + } catch (err) { /* ignore */ } + + const orderedGetters = location + ? [ + ...tableGetters.filter(entry => entry.location === location), + ...tableGetters.filter(entry => entry.location !== location), + ] + : tableGetters; + + for (const entry of orderedGetters) { try { - const model = await getModel(ctx.model.OrderDeliveryFactory, warehouseId); + const model = await entry.getModel(factory, warehouseId); if (!model) continue; orderRow = await model.findOne({ attributes: [ 'id', 'wave_id', 'wave_no', 'pack_status' ], diff --git a/app/service/systems/order_express.js b/app/service/systems/order_express.js index ba0b4f5..f6cd0a9 100644 --- a/app/service/systems/order_express.js +++ b/app/service/systems/order_express.js @@ -318,6 +318,16 @@ class OrderExpressService extends Service { { label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) }, ]; + // 序列表定位优先:命中则先查对应分表,未命中(存量订单)按原顺序回退遍历 + try { + if (orderDeliveryFactory && typeof orderDeliveryFactory.getOrderLocation === 'function') { + const preferredLocation = await orderDeliveryFactory.getOrderLocation(normalizedOrderId, warehouseId); + if (preferredLocation) { + orderTableOrders.sort((a, b) => (a.label === preferredLocation ? -1 : b.label === preferredLocation ? 1 : 0)); + } + } + } catch (_err) { /* 定位失败,保持原遍历顺序 */ } + let orderRow = null; let orderDeliveryModel = null; for (const entry of orderTableOrders) { @@ -440,6 +450,16 @@ class OrderExpressService extends Service { { label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) }, ]; + // 序列表定位优先:命中则先查对应分表,未命中(存量订单)按原顺序回退遍历 + try { + if (orderDeliveryFactory && typeof orderDeliveryFactory.getOrderLocation === 'function') { + const preferredLocation = await orderDeliveryFactory.getOrderLocation(orderId, warehouseId); + if (preferredLocation) { + orderTableOrders.sort((a, b) => (a.label === preferredLocation ? -1 : b.label === preferredLocation ? 1 : 0)); + } + } + } catch (_err) { /* 定位失败,保持原遍历顺序 */ } + let orderRow = null; let orderDeliveryModel = null; for (const entry of orderTableOrders) { diff --git a/app/service/systems/waybill.js b/app/service/systems/waybill.js index 7231985..aca6cc1 100644 --- a/app/service/systems/waybill.js +++ b/app/service/systems/waybill.js @@ -73,6 +73,16 @@ class WaybillService extends MainService { }, ]; + // 序列表定位优先:命中则先查对应分表,未命中(存量订单)按原顺序回退遍历 + try { + if (orderDeliveryFactory && typeof orderDeliveryFactory.getOrderLocation === 'function') { + const preferredLocation = await orderDeliveryFactory.getOrderLocation(orderId, warehouseId); + if (preferredLocation) { + tableOrders.sort((a, b) => (a.label === preferredLocation ? -1 : b.label === preferredLocation ? 1 : 0)); + } + } + } catch (_err) { /* 定位失败,保持原遍历顺序 */ } + // 遍历多表查询订单的 wave_id 和 wave_no let orderRow = null; for (const entry of tableOrders) { diff --git a/app/service/systems/workbench.js b/app/service/systems/workbench.js index 0b7e3db..5ea0227 100644 --- a/app/service/systems/workbench.js +++ b/app/service/systems/workbench.js @@ -848,6 +848,16 @@ class WorkbenchService extends Service { { label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) }, ]; + // 序列表定位优先:命中则先查对应分表,未命中(存量订单)按原顺序回退遍历 + try { + if (orderDeliveryFactory && typeof orderDeliveryFactory.getOrderLocation === 'function') { + const preferredLocation = await orderDeliveryFactory.getOrderLocation(orderId, warehouseId); + if (preferredLocation) { + tableOrders.sort((a, b) => (a.label === preferredLocation ? -1 : b.label === preferredLocation ? 1 : 0)); + } + } + } catch (_err) { /* 定位失败,保持原遍历顺序 */ } + let orderRow = null; let orderDeliveryModel = null; for (const entry of tableOrders) {