fix: wms_order_wave_index 写入时按平台+快递排序 wave_index

replaceOrderWaveIndexByWaveIds 中 wave_index 原按 id 顺序分配,
导致同一波次内不同平台订单交叉排列。
修复为按 sys_platform_code → sys_logistics_code → id 三级排序,
确保同平台同快递订单获得连续的 wave_index。
This commit is contained in:
liufumingren 2026-08-02 22:37:48 +08:00
parent 59bd112893
commit de9eb2b657

View File

@ -11519,14 +11519,13 @@ class WaveService extends OrderBaseService {
}
// 通过绑定表判断车是否被其他活跃任务占用(不依赖 wms_pick_cart.current_task_id)
// 仅以 wms_pick_task_cart_binding.is_active = 1 为准,不关联任务状态做二次过滤
const bindingRows = await this.ctx.model.query(`
SELECT b.task_id
FROM wms_pick_task_cart_binding b
INNER JOIN wms_wave_pick_task t ON t.id = b.task_id
WHERE b.cart_id = :cartId
AND b.warehouse_id = :warehouseId
AND b.is_active = 1
AND t.status IN (0, 1)
LIMIT 1
FOR UPDATE
`, {
@ -12808,7 +12807,7 @@ class WaveService extends OrderBaseService {
}
const orderRows = await currentOrderModel.findAll({
attributes: [ 'id', 'wave_id', 'sys_platform_code', 'source_platform_code' ],
attributes: [ 'id', 'wave_id', 'sys_platform_code', 'source_platform_code', 'sys_logistics_code' ],
where: {
wave_id: {
[Op.in]: normalizedWaveIds,
@ -12836,6 +12835,7 @@ class WaveService extends OrderBaseService {
id: orderId,
sys_platform_code: String(row && row.sys_platform_code || ''),
source_platform_code: String(row && row.source_platform_code || ''),
sys_logistics_code: String(row && row.sys_logistics_code || ''),
});
}
@ -12863,7 +12863,21 @@ class WaveService extends OrderBaseService {
let rowIndex = 0;
for (const waveId of normalizedWaveIds) {
const orderRowsByWave = waveOrderRowsMap.get(waveId) || [];
const rawOrderRows = waveOrderRowsMap.get(waveId) || [];
// 按平台+快递排序:同平台、同快递订单聚合在一起,确保 wave_index 连续分配
const orderRowsByWave = [ ...rawOrderRows ].sort((a, b) => {
const platformA = String(
(a && a.sys_platform_code) || (a && a.source_platform_code) || ''
).trim().toLowerCase();
const platformB = String(
(b && b.sys_platform_code) || (b && b.source_platform_code) || ''
).trim().toLowerCase();
if (platformA !== platformB) return platformA.localeCompare(platformB);
const logisticsA = String((a && a.sys_logistics_code) || '').trim().toLowerCase();
const logisticsB = String((b && b.sys_logistics_code) || '').trim().toLowerCase();
if (logisticsA !== logisticsB) return logisticsA.localeCompare(logisticsB);
return (Number(a && a.id) || 0) - (Number(b && b.id) || 0);
});
const platformsIndexMap = new Map();
const platformSequenceMap = new Map();
for (const orderRow of orderRowsByWave) {