fix(returnReceived): 修复登记时间筛选白名单缺失并补充 created_at/updated_at,登记响应新增 is_urgent 加急标记,配套 (warehouse_id, created_at) 索引迁移
This commit is contained in:
parent
a5a6ea4a93
commit
beb9e06a08
@ -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' ] },
|
||||
|
||||
@ -37,7 +37,7 @@ class ReturnReceivedService extends Service {
|
||||
* @param {Object} params 登记参数。
|
||||
* @param {string} params.waybill_code 退回收件运单号。
|
||||
* @param {string} [params.remark] 备注。
|
||||
* @return {Promise<Object>} 登记结果,含 record、is_original_return、store_remark、duplicated。
|
||||
* @return {Promise<Object>} 登记结果,含 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<boolean>} 存在退回查询记录返回 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) {
|
||||
|
||||
@ -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');
|
||||
},
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user