fix: wms_wave_pick_task_order.box_no 改为与 wms_order_wave_index.wave_index 一致

- wave.js buildTaskOrderRows: box_no 优先取 wave_index,无记录时退化为 index+1
- wave.js 任务创建流程: 调用前查询 wms_order_wave_index 获取 wave_index
- pick.js createWavePickTask: INSERT 补齐 box_no 列,值取自 wave_index
- 所有路径均含 try-catch 降级,查询失败不阻塞任务创建
This commit is contained in:
liufumingren 2026-08-03 21:01:42 +08:00
parent 7a1f15ac6a
commit 11e8bedfaf
2 changed files with 111 additions and 19 deletions

View File

@ -3999,8 +3999,9 @@ class WaveService extends OrderBaseService {
{ specialFieldMap: { quickWhere: { bucket: 'quick' } } }
);
const { where: sanitizedWhere, expressNumbers } = this.extractOrderListExpressVirtualFilter(ctxWhere);
const { where: whereAfterBuyerMessage, buyerMessageHas } = this.extractBuyerMessageHasVirtualFilter(sanitizedWhere);
const defaultWhere = this.getDefaultWhere('waveStrategyFallbackOrder');
const mergedWhere = this.mergeWhereObjects(defaultWhere, sanitizedWhere);
const mergedWhere = this.mergeWhereObjects(defaultWhere, whereAfterBuyerMessage);
let queryWhere = this.buildWhere(mergedWhere, contextWarehouseId, {
specialFieldMap: { quickWhere: { bucket: 'quick' } },
});
@ -4011,6 +4012,11 @@ class WaveService extends OrderBaseService {
queryWhere = this.appendOrderIdsFilterToWhere(queryWhere, orderIds);
}
if (buyerMessageHas !== null) {
const buyerMessageCondition = this.buildBuyerMessageHasCondition(buyerMessageHas);
queryWhere = this.appendConditionToWhere(queryWhere, buyerMessageCondition);
}
// 追加 OR 条件:未匹配策略(wave_scan_result=2) 或 已完全打印被排除(print_status='fin')
const { Sequelize } = this.app;
queryWhere = {
@ -11066,12 +11072,48 @@ class WaveService extends OrderBaseService {
selectedWaveIds,
waveNoMap,
});
// 查询波次索引(wave_index),使 box_no 与 wms_order_wave_index.wave_index 一致
const waveIndexMap = new Map();
if (selectedOrderIds.length > 0 && selectedWaveIds.length > 0) {
try {
const waveIndexRows = await this.ctx.model.query(
`SELECT order_id, wave_index
FROM wms_order_wave_index
WHERE warehouse_id = :warehouseId
AND wave_id IN (:waveIds)
AND order_id IN (:orderIds)`,
{
replacements: {
warehouseId,
waveIds: selectedWaveIds,
orderIds: selectedOrderIds,
},
type: this.ctx.model.QueryTypes.SELECT,
transaction,
}
);
for (const wr of (Array.isArray(waveIndexRows) ? waveIndexRows : [])) {
const wrOrderId = Number(wr && wr.order_id || 0);
if (wrOrderId > 0) {
waveIndexMap.set(wrOrderId, Number(wr.wave_index || 0));
}
}
} catch (e) {
this.ctx.logger.warn('[wave.createTask] 查询波次索引失败,box_no 将退化为任务内序号', {
error: e && e.message,
warehouseId,
waveIds: selectedWaveIds,
});
}
}
const taskOrderRows = this.buildTaskOrderRows({
taskId,
plan: effectivePlan,
selectedWaveIds,
selectedOrderIds,
cartId: normalizedCartId,
waveIndexMap,
});
const taskSkuRows = await this.buildTaskSkuRows({
plan: effectivePlan,
@ -11265,12 +11307,16 @@ class WaveService extends OrderBaseService {
/**
* 构建任务订单明细写入行。
*
* box_no 与 wms_order_wave_index.wave_index 保持一致(波次内全局顺序)。
* 若 waveIndexMap 中无对应记录,则退化为当前订单在 selectedOrderIds 中的 index + 1。
*
* @param {Object} options 构建参数。
* @param {number} options.taskId 任务ID。
* @param {Object} options.plan 预处理计划。
* @param {Array<number>} options.selectedWaveIds 已选波次ID。
* @param {Array<number>} options.selectedOrderIds 已选订单ID。
* @param {number} options.cartId 绑定车ID。
* @param {Map<number, number>} [options.waveIndexMap] orderId → wave_index 映射。
* @return {Array<Object>} 任务订单行。
*/
buildTaskOrderRows(options = {}) {
@ -11285,30 +11331,38 @@ class WaveService extends OrderBaseService {
? options.selectedOrderIds
: [];
const cartId = Number(options && options.cartId || 0);
const waveIndexMap = options && options.waveIndexMap instanceof Map
? options.waveIndexMap
: new Map();
if (![ 2, 3, 4 ].includes(pickMode)) {
return [];
}
const defaultWaveId = selectedWaveIds.length > 0 ? selectedWaveIds[0] : null;
return selectedOrderIds.map((orderId, index) => ({
task_id: taskId,
wave_id: defaultWaveId,
order_id: orderId,
order_no: null,
box_no: index + 1,
cart_id: cartId > 0 ? cartId : null,
cart_code_snapshot: null,
warehouse_id: warehouseId,
pick_status: 0,
review_status: 0,
review_user_id: null,
review_result: null,
review_remark: null,
exception_reason: null,
picked_time: null,
review_time: null,
}));
return selectedOrderIds.map((orderId, index) => {
const waveIndex = waveIndexMap.has(orderId)
? Number(waveIndexMap.get(orderId) || 0)
: 0;
return {
task_id: taskId,
wave_id: defaultWaveId,
order_id: orderId,
order_no: null,
box_no: waveIndex > 0 ? waveIndex : (index + 1),
cart_id: cartId > 0 ? cartId : null,
cart_code_snapshot: null,
warehouse_id: warehouseId,
pick_status: 0,
review_status: 0,
review_user_id: null,
review_result: null,
review_remark: null,
exception_reason: null,
picked_time: null,
review_time: null,
};
});
}
/**

View File

@ -258,16 +258,52 @@ class PickService extends MainService {
);
if (normalizedOrderIds.length > 0) {
// 查询波次索引(wave_index),使 box_no 与 wms_order_wave_index.wave_index 一致
const waveIndexMap = new Map();
try {
const waveIndexRows = await ctx.model.query(
`SELECT order_id, wave_index
FROM wms_order_wave_index
WHERE warehouse_id = :warehouseId
AND wave_id = :waveId
AND order_id IN (:orderIds)`,
{
replacements: {
warehouseId,
waveId,
orderIds: normalizedOrderIds,
},
type: ctx.model.QueryTypes.SELECT,
transaction,
}
);
for (const wr of (Array.isArray(waveIndexRows) ? waveIndexRows : [])) {
const wrOrderId = Number(wr && wr.order_id || 0);
if (wrOrderId > 0) {
waveIndexMap.set(wrOrderId, Number(wr.wave_index || 0));
}
}
} catch (e) {
ctx.logger.warn('[pick.createWavePickTask] 查询波次索引失败,box_no 将退化为任务内序号', {
error: e && e.message,
warehouseId,
waveId,
});
}
const orderValuesSql = [];
const orderReplacements = {};
normalizedOrderIds.forEach((orderId, index) => {
const orderIdKey = `orderId${index}`;
const orderNoKey = `orderNo${index}`;
const boxNoKey = `boxNo${index}`;
const waveIndex = waveIndexMap.get(orderId);
orderValuesSql.push(`(
:taskId,
:waveId,
:${orderIdKey},
:${orderNoKey},
:${boxNoKey},
:warehouseId,
0,
0,
@ -276,6 +312,7 @@ class PickService extends MainService {
)`);
orderReplacements[orderIdKey] = orderId;
orderReplacements[orderNoKey] = orderNoMap.get(orderId) || '';
orderReplacements[boxNoKey] = Number.isFinite(waveIndex) && waveIndex > 0 ? waveIndex : (index + 1);
});
await ctx.model.query(
@ -285,6 +322,7 @@ class PickService extends MainService {
wave_id,
order_id,
order_no,
box_no,
warehouse_id,
pick_status,
review_status,