From beb9e06a08761034d7875db9e406f9b00df3c83f Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 23 Sep 2026 22:22:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(returnReceived):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E7=BC=BA=E5=A4=B1=E5=B9=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=20created=5Fat/updated=5Fat=EF=BC=8C=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=96=B0=E5=A2=9E=20is=5Furgent=20=E5=8A=A0?= =?UTF-8?q?=E6=80=A5=E6=A0=87=E8=AE=B0=EF=BC=8C=E9=85=8D=E5=A5=97=20(wareh?= =?UTF-8?q?ouse=5Fid,=20created=5Fat)=20=E7=B4=A2=E5=BC=95=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/model/return_received.js | 1 + app/service/systems/return_received.js | 36 +++++++++++++++++-- ...created-at-index-to-wms-return-received.js | 20 +++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 database/migrations/20260923180000-add-created-at-index-to-wms-return-received.js diff --git a/app/model/return_received.js b/app/model/return_received.js index 2201fd5..eedc17d 100644 --- a/app/model/return_received.js +++ b/app/model/return_received.js @@ -76,6 +76,7 @@ module.exports = app => { indexes: [ { name: 'idx_warehouse_waybill_scan_date', fields: [ 'warehouse_id', 'waybill_code', 'scan_date' ] }, { name: 'idx_warehouse_scan_date', fields: [ 'warehouse_id', 'scan_date' ] }, + { name: 'idx_warehouse_created_at', fields: [ 'warehouse_id', 'created_at' ] }, { name: 'idx_scanner_id', fields: [ 'scanner_id' ] }, { name: 'idx_order_express_id', fields: [ 'order_express_id' ] }, { name: 'idx_store_id', fields: [ 'store_id' ] }, diff --git a/app/service/systems/return_received.js b/app/service/systems/return_received.js index eba5d84..bd59ca2 100644 --- a/app/service/systems/return_received.js +++ b/app/service/systems/return_received.js @@ -37,7 +37,7 @@ class ReturnReceivedService extends Service { * @param {Object} params 登记参数。 * @param {string} params.waybill_code 退回收件运单号。 * @param {string} [params.remark] 备注。 - * @return {Promise} 登记结果,含 record、is_original_return、store_remark、duplicated。 + * @return {Promise} 登记结果,含 record、is_original_return、store_remark、is_urgent、duplicated。 */ async create({ waybill_code, remark }) { const { ctx, app } = this; @@ -69,6 +69,9 @@ class ReturnReceivedService extends Service { const scanDate = app.formatDate(now, 'YYYY-MM-DD'); const windowStart = app.formatDate(thirtyDaysAgo, 'YYYY-MM-DD'); + // 加急标记:独立查询退回查询记录(wms_return_query_log),与货主归属匹配查询互不影响 + const isUrgent = await this._isUrgentReturnQuery(waybillCode, warehouseId); + const existing = await ctx.model.ReturnReceived.findOne({ where: { warehouse_id: warehouseId, @@ -85,6 +88,7 @@ class ReturnReceivedService extends Service { record: enriched, is_original_return: Boolean(enriched.order_express_id), store_remark: enriched.store_remark || '', + is_urgent: isUrgent, duplicated: true, }; } @@ -180,10 +184,38 @@ class ReturnReceivedService extends Service { record: enriched, is_original_return: Boolean(enriched.order_express_id), store_remark: enriched.store_remark || '', + is_urgent: isUrgent, duplicated: false, }; } + /** + * 判断运单是否存在退回查询记录(加急标记判定口径)。 + * 判定标准:wms_return_query_log 中存在 warehouse_id = 当前仓库 且 waybill_code = 登记运单号(精确匹配)的记录。 + * 查询失败时降级返回 false,不影响登记主流程。 + * + * @param {string} waybillCode 登记运单号。 + * @param {number} warehouseId 当前仓库ID。 + * @return {Promise} 存在退回查询记录返回 true,否则 false。 + */ + async _isUrgentReturnQuery(waybillCode, warehouseId) { + const { ctx } = this; + try { + const queryLog = await ctx.model.ReturnQueryLog.findOne({ + where: { + warehouse_id: Number(warehouseId), + waybill_code: waybillCode, + }, + attributes: [ 'id' ], + raw: true, + }); + return Boolean(queryLog); + } catch (err) { + ctx.logger.warn(`[returnReceived.create] 判断退回查询加急标记失败: ${err.message}`); + return false; + } + } + /** * 聚合通知待通知的登记(定时任务调用)。 * 规则: @@ -891,7 +923,7 @@ class ReturnReceivedService extends Service { const directFields = [ 'warehouse_id', 'scanner_id', 'store_id', 'order_express_id', 'order_id', - 'waybill_code', 'scan_date', 'scanner_name', + 'waybill_code', 'scan_date', 'created_at', 'updated_at', 'scanner_name', ]; for (const field of directFields) { diff --git a/database/migrations/20260923180000-add-created-at-index-to-wms-return-received.js b/database/migrations/20260923180000-add-created-at-index-to-wms-return-received.js new file mode 100644 index 0000000..e218a68 --- /dev/null +++ b/database/migrations/20260923180000-add-created-at-index-to-wms-return-received.js @@ -0,0 +1,20 @@ +'use strict'; + +/** + * wms_return_received 补充登记时间索引。 + * returnReceived.list 默认按 created_at desc 排序且支持 created_at 范围筛选, + * 仓库隔离为 warehouse_id,原表仅有 (warehouse_id, scan_date) 等索引, + * 登记时间过滤与排序会退化为全表扫描 + filesort,新增 (warehouse_id, created_at) + * 复合索引使范围过滤与默认排序走索引。 + */ +module.exports = { + async up(queryInterface) { + await queryInterface.addIndex('wms_return_received', [ 'warehouse_id', 'created_at' ], { + name: 'idx_warehouse_created_at', + }); + }, + + async down(queryInterface) { + await queryInterface.removeIndex('wms_return_received', 'idx_warehouse_created_at'); + }, +};