fix(pick): 修复拣货完成→取消→重入的流程漏洞

1. pick.query 增加跨波次订单级去重:已拣货完成的订单不再创建新任务,直接返回原有任务

2. cancelWavePickTasksInternal 禁止取消 status 2(待复核)/3(已完成) 的任务,防止库存与订单状态不一致
This commit is contained in:
liufumingren 2026-08-07 13:15:15 +08:00
parent e61efbb66a
commit 2cd53c7e0f
2 changed files with 44 additions and 2 deletions

View File

@ -12247,8 +12247,11 @@ class WaveService extends OrderBaseService {
}
const taskStatus = Number(taskRow.status || 0);
if (![ 0, 1, 2, 3 ].includes(taskStatus)) {
const error = new Error('当前任务状态不允许取消');
// status 2(待复核)、3(已完成)不允许取消,此时库存已扣减且订单已标记拣货完成
if (![ 0, 1 ].includes(taskStatus)) {
const statusMessages = { 2: '待复核', 3: '已完成', 9: '已取消' };
const statusText = statusMessages[taskStatus] || `状态${taskStatus}`;
const error = new Error(`当前任务已${statusText},不允许取消`);
error.statusCode = 400;
error.data = {
task_id: taskId,

View File

@ -973,6 +973,45 @@ class PickService extends MainService {
}
}
// 跨波次订单级去重:检查这批订单是否已有已完成(status 2/3)的拣货任务
if (selectedOrderIds.length > 0) {
const crossWaveDedupRows = await ctx.model.query(
`
SELECT t.id AS task_id, t.task_no, t.status, t.pick_user_id, t.pick_user_name
FROM wms_wave_pick_task t
INNER JOIN wms_wave_pick_task_order pto
ON pto.task_id = t.id
AND pto.warehouse_id = t.warehouse_id
WHERE t.warehouse_id = :warehouseId
AND t.status IN (2, 3)
AND pto.order_id IN (:orderIds)
AND pto.pick_status = 1
ORDER BY t.id DESC
LIMIT 1
`,
{
replacements: {
warehouseId: normalizedWarehouseId,
orderIds: selectedOrderIds,
},
type: ctx.model.QueryTypes.SELECT,
}
);
const crossWaveDedupTask = Array.isArray(crossWaveDedupRows) && crossWaveDedupRows.length > 0
? crossWaveDedupRows[0]
: null;
if (crossWaveDedupTask) {
return this.success('ok', {
data: {
task_id: Number(crossWaveDedupTask.task_id),
status: 'existing_completed',
tip: '该批订单已有完成拣货任务,无需重复创建',
},
code: 200,
});
}
}
try {
const createdTask = await this.createWavePickTask({
warehouseId: normalizedWarehouseId,