This commit is contained in:
liufumingren 2026-07-06 00:33:12 +08:00
parent 7854057244
commit 2817d17fc7
10 changed files with 1245 additions and 168 deletions

View File

@ -31,6 +31,17 @@ const BATCH_UNLOCK_TASK_CACHE_TTL_SECONDS = 60 * 60 * 24;
const BATCH_UNINTERCEPT_TASK_CACHE_KEY_PREFIX = 'order:batch-unintercept:';
const BATCH_UNINTERCEPT_TASK_CACHE_TTL_SECONDS = 60 * 60 * 24;
const SYNC_ORDER_IDS_TASK_CACHE_KEY_PREFIX = 'order:pending:sync_order_ids:request:';
const SYNC_ORDER_IDS_TASK_CACHE_TTL_SECONDS = 60 * 60 * 2;
const SYNC_ORDER_IDS_PROGRESS_MAP = Object.freeze({
submitted: 5,
running: 50,
success: 100,
failed: 100,
not_found: 0,
unknown: 0,
});
/**
* 中国行政区划反向查询表。
*
@ -506,9 +517,9 @@ class PendingOrderService extends OrderBaseService {
constructor(ctx) {
super(ctx);
const _noNeedLogin = '';
const _noNeedRight = 'list,pendingOrder,reverseReviewOrder,markPendingOutboundOrder,cancelOrder,allocateExpressCode,allocateStorage,allocateStorageProgress,cancelAllocateStorage,syncOrderIds,updateOrderPlatform,updateOrderExpress,updateRemark,updateAddress,cloneOrder,createOrder,downloadCreateTemplate,parseAddress,batchIntercept,batchInterceptTaskProgress,batchLock,batchLockTaskProgress,batchUnlock,batchUnlockTaskProgress,batchUnintercept,batchUninterceptTaskProgress,manualWaybill';
const _noNeedLog = 'list,markPendingOutboundOrder,cancelOrder,allocateExpressCode,allocateStorage,allocateStorageProgress,cancelAllocateStorage,syncOrderIds,parseAddress,batchIntercept,batchInterceptTaskProgress,batchLock,batchLockTaskProgress,batchUnlock,batchUnlockTaskProgress,batchUnintercept,batchUninterceptTaskProgress,manualWaybill';
const _noNeedAuth = 'list,pendingOrder,reverseReviewOrder,markPendingOutboundOrder,cancelOrder,allocateExpressCode,allocateStorage,allocateStorageProgress,cancelAllocateStorage,syncOrderIds,updateOrderPlatform,updateOrderExpress,updateRemark,updateAddress,cloneOrder,createOrder,downloadCreateTemplate,parseAddress,batchIntercept,batchInterceptTaskProgress,batchLock,batchLockTaskProgress,batchUnlock,batchUnlockTaskProgress,batchUnintercept,batchUninterceptTaskProgress,manualWaybill';
const _noNeedRight = 'list,pendingOrder,reverseReviewOrder,markPendingOutboundOrder,cancelOrder,allocateExpressCode,allocateStorage,allocateStorageProgress,cancelAllocateStorage,syncOrderIds,syncOrderIdsProgress,updateOrderPlatform,updateOrderExpress,updateRemark,updateAddress,cloneOrder,createOrder,downloadCreateTemplate,parseAddress,batchIntercept,batchInterceptTaskProgress,batchLock,batchLockTaskProgress,batchUnlock,batchUnlockTaskProgress,batchUnintercept,batchUninterceptTaskProgress,manualWaybill';
const _noNeedLog = 'list,markPendingOutboundOrder,cancelOrder,allocateExpressCode,allocateStorage,allocateStorageProgress,cancelAllocateStorage,syncOrderIds,syncOrderIdsProgress,parseAddress,batchIntercept,batchInterceptTaskProgress,batchLock,batchLockTaskProgress,batchUnlock,batchUnlockTaskProgress,batchUnintercept,batchUninterceptTaskProgress,manualWaybill';
const _noNeedAuth = 'list,pendingOrder,reverseReviewOrder,markPendingOutboundOrder,cancelOrder,allocateExpressCode,allocateStorage,allocateStorageProgress,cancelAllocateStorage,syncOrderIds,syncOrderIdsProgress,updateOrderPlatform,updateOrderExpress,updateRemark,updateAddress,cloneOrder,createOrder,downloadCreateTemplate,parseAddress,batchIntercept,batchInterceptTaskProgress,batchLock,batchLockTaskProgress,batchUnlock,batchUnlockTaskProgress,batchUnintercept,batchUninterceptTaskProgress,manualWaybill';
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
}
@ -1374,6 +1385,88 @@ class PendingOrderService extends OrderBaseService {
}
}
// ========== syncOrderIds 异步任务进度缓存工具方法 ==========
/**
* 获取订单同步任务缓存键。
*
* @param {string} requestId 请求ID。
* @return {string} 缓存键。
*/
getSyncOrderIdsTaskCacheKey(requestId = '') {
const normalizedRequestId = String(requestId || '').trim();
if (!normalizedRequestId) {
return '';
}
return `${SYNC_ORDER_IDS_TASK_CACHE_KEY_PREFIX}${normalizedRequestId}`;
}
/**
* 规范订单同步任务请求ID。
*
* @param {Object} data 请求体。
* @return {string} 归一化后的请求ID。
*/
normalizeSyncOrderIdsRequestId(data = {}) {
const normalizedData = this.isPlainObject(data) ? data : {};
return String(normalizedData.request_id || normalizedData.requestId || '').trim();
}
/**
* 写入订单同步任务进度。
*
* @param {string} requestId 请求ID。
* @param {Object} payload 任务状态与结果。
* @return {Promise<void>}
*/
async setSyncOrderIdsTaskProgress(requestId = '', payload = {}) {
const cacheKey = this.getSyncOrderIdsTaskCacheKey(requestId);
if (!cacheKey || typeof this.app.setCacheAsync !== 'function') {
return;
}
const safePayload = this.isPlainObject(payload) ? payload : {};
const progressPayload = {
...safePayload,
request_id: String(requestId || '').trim(),
update_time: Date.now(),
};
try {
await this.app.setCacheAsync(cacheKey, progressPayload, SYNC_ORDER_IDS_TASK_CACHE_TTL_SECONDS);
} catch (error) {
this.ctx.logger.warn('[pendingOrder.syncOrderIds] 写入任务进度缓存失败: %s', error && error.message ? error.message : error);
}
}
/**
* 读取订单同步任务进度。
*
* @param {string} requestId 请求ID。
* @return {Promise<Object|null>} 任务缓存结果。
*/
async getSyncOrderIdsTaskProgress(requestId = '') {
const cacheKey = this.getSyncOrderIdsTaskCacheKey(requestId);
if (!cacheKey || typeof this.app.getCacheAsync !== 'function') {
return null;
}
try {
const cached = await this.app.getCacheAsync(cacheKey);
if (!this.isPlainObject(cached)) {
return null;
}
return cached;
} catch (error) {
this.ctx.logger.warn('[pendingOrder.syncOrderIds] 读取任务进度缓存失败: %s', error && error.message ? error.message : error);
return null;
}
}
// ========== syncOrderIds 异步任务进度缓存工具方法结束 ==========
/**
* 将待处理订单批量取消储位分配。
*
@ -1494,13 +1587,20 @@ class PendingOrderService extends OrderBaseService {
}
/**
* 同步待处理订单。
* 同步待处理订单(异步模式)。
*
* 当前仅接收 `order_ids` 并原样转发到服务层,暂不执行任何实际同步处理;
* 等后续同步逻辑明确后,再在对应 service 中补齐实现。
* 立即生成 request_id 并返回,后台通过 setImmediate 异步执行实际的订单同步流程。
* 调用方可通过 syncOrderIdsProgress 接口轮询任务进度与最终结果。
*
* 后台处理流程:
* ① 事务内查询订单 + 校验(SN、快递状态)+ 更新 sync_status='padding' + commit
* ② 按 create_channel 分组并行派发(QM / MANUAL / API)
* ③ 单订单失败静默写入 error 状态 + 异常标记,不影响整批结果
* ④ 写入操作日志 + 更新最终进度
*
* @param {Object} data 请求体。
* @return {Promise<Object>} 统一 success 包装的同步结果。
* @param {Array<number|string>|string|number} data.order_ids 订单ID(支持数组、逗号字符串、单个ID,兼容 orderIds/ids 等多种别名)。
* @return {Promise<Object>} 统一 success 包装,含 request_id。
*/
async syncOrderIds(data = {}) {
const requestData = this.isPlainObject(data) ? data : {};
@ -1513,21 +1613,248 @@ class PendingOrderService extends OrderBaseService {
?? requestData.id,
};
console.log('[PendingOrderService.syncOrderIds] 归一化入参', normalizedData);
// 快照 ctx 数据(setImmediate 回调中 ctx 可能已失效)
const warehouseId = this.getWarehouseId();
const operator = this.getOrderLogOperator();
const logWarehouseId = this.getOrderLogWarehouseId(warehouseId);
try {
console.log('[PendingOrderService.syncOrderIds] 调用 orderStorageAllocation.syncOrderIds 前', normalizedData);
const result = await this.service.systems.orderStorageAllocation.syncOrderIds(normalizedData);
console.log('[PendingOrderService.syncOrderIds] 调用 orderStorageAllocation.syncOrderIds 成功', result);
const timestamp = Date.now();
const randomToken = Math.random().toString(36).slice(2, 10);
const requestId = `sync_order_${warehouseId ?? 'unknown'}_${timestamp}_${randomToken}`;
return this.success('ok', result);
} catch (error) {
console.log('[PendingOrderService.syncOrderIds] 调用 orderStorageAllocation.syncOrderIds 异常', {
normalizedData,
error,
});
throw error;
// 初始化进度:submitted
await this.setSyncOrderIdsTaskProgress(requestId, {
status: 'submitted',
total_count: 0,
processed_count: 0,
progress: 0,
warehouse_id: warehouseId,
order_ids: normalizedData.order_ids,
});
this.ctx.logger.info('[PendingOrderService.syncOrderIds] 任务已提交', {
request_id: requestId,
warehouseId,
orderCount: Array.isArray(normalizedData.order_ids)
? normalizedData.order_ids.length
: (normalizedData.order_ids ? 1 : 0),
});
// 后台异步执行
setImmediate(async () => {
try {
await this.setSyncOrderIdsTaskProgress(requestId, {
status: 'running',
total_count: 0,
processed_count: 0,
progress: 0,
warehouse_id: warehouseId,
});
const result = await this.service.systems.orderStorageAllocation.syncOrderIds({
...normalizedData,
warehouse_id: warehouseId,
request_id: requestId,
});
// 最终进度:success(从结果中取真实数量)
const resultData = result && result.data ? result.data : {};
const finalTotal = Number(resultData.pending_count || 0);
const finalProcessed = finalTotal;
const finalProgress = 100;
await this.setSyncOrderIdsTaskProgress(requestId, {
status: 'success',
total_count: finalTotal,
processed_count: finalProcessed,
progress: finalProgress,
warehouse_id: warehouseId,
result,
});
// 静默写操作日志(不影响主流程)
try {
const opLogService = this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.operationLog;
if (opLogService && typeof opLogService.createOperationLogs === 'function') {
const rawOrderIds = Array.isArray(normalizedData.order_ids)
? normalizedData.order_ids
: (normalizedData.order_ids ? [ normalizedData.order_ids ] : []);
const resultData = result && result.data ? result.data : {};
const pendingSet = new Set((resultData.pending_order_ids || []).map(Number));
const skippedMap = new Map();
const failedMap = new Map();
for (const item of (resultData.skipped_orders || [])) {
skippedMap.set(Number(item.order_id), item.skipped_reason || 'unknown');
}
for (const item of (resultData.failed_orders || [])) {
failedMap.set(Number(item.order_id), item.failed_reason || 'unknown');
}
const skipReasonMap = { not_found: '订单不存在', already_synced: '已同步' };
const failReasonMap = { express_unallocated: '快递未分配', sn_batch_forbidden: 'SN订单不支持批量' };
const dispatchChannels = (resultData.dispatch_results || [])
.map(r => r.create_channel).filter(Boolean).join('/') || 'unknown';
const logPayloads = rawOrderIds.map(orderId => {
const oid = Number(orderId);
let msg;
if (pendingSet.has(oid)) {
msg = `同步到${dispatchChannels}渠道`;
} else if (failedMap.has(oid)) {
const reason = failedMap.get(oid);
msg = `同步跳过:${failReasonMap[reason] || reason}`;
} else if (skippedMap.has(oid)) {
const reason = skippedMap.get(oid);
msg = `同步跳过:${skipReasonMap[reason] || reason}`;
} else {
msg = '同步跳过';
}
return {
businessType: 'order',
businessId: String(oid),
operationCode: 'ORDER_SYNC',
operator,
extras: {
message: msg,
warehouseId: logWarehouseId,
externalLogType: 'NONE',
},
};
}).filter(item => Number(item.businessId) > 0);
if (logPayloads.length > 0) {
await opLogService.createOperationLogs(logPayloads);
}
}
} catch (logErr) {
this.ctx.logger.warn('[PendingOrderService.syncOrderIds] 写入操作日志失败,不影响主流程', {
request_id: requestId,
error: logErr && logErr.message,
});
}
this.ctx.logger.info('[PendingOrderService.syncOrderIds] 后台同步任务完成', {
request_id: requestId,
status: result && result.code,
message: result && result.message,
});
} catch (error) {
// 整体失败也静默写入进度
try {
const cached = await this.getSyncOrderIdsTaskProgress(requestId);
const cachedTotal = cached && Number(cached.total_count || 0);
await this.setSyncOrderIdsTaskProgress(requestId, {
status: 'failed',
total_count: cachedTotal || 0,
processed_count: cached && Number(cached.processed_count || 0),
progress: cached && Number(cached.progress || 0),
warehouse_id: warehouseId,
error: error && error.message ? error.message : String(error),
});
} catch (cacheErr) {
this.ctx.logger.warn('[PendingOrderService.syncOrderIds] 写入失败进度缓存失败', {
request_id: requestId,
error: cacheErr && cacheErr.message,
});
}
// 写操作日志:崩溃场景下 service 层可能不可用,直接用 model 直写
try {
const rawOrderIds = Array.isArray(normalizedData.order_ids)
? normalizedData.order_ids
: (normalizedData.order_ids ? [ normalizedData.order_ids ] : []);
const errorMsg = error && error.message ? String(error.message) : String(error);
if (rawOrderIds.length > 0 && this.ctx.model && this.ctx.model.OperationLog) {
const operatorId = operator.id;
const operatorName = operator.name || 'system';
const now = new Date();
const logRows = rawOrderIds.map(orderId => ({
business_type: 'order',
business_id: String(orderId),
operation_code: 'ORDER_SYNC_FAILED',
operator_id: operatorId,
operator_name: operatorName,
external_log_type: 'NONE',
warehouse_id: logWarehouseId || null,
platform_code: 'SYSTEM',
message: `订单同步失败:${errorMsg}`,
created_at: now,
})).filter(row => Number(row.business_id) > 0);
if (logRows.length > 0) {
await this.ctx.model.OperationLog.bulkCreate(logRows);
}
}
} catch (logErr) {
this.ctx.logger.warn('[PendingOrderService.syncOrderIds] 写入失败操作日志失败,不影响主流程', {
request_id: requestId,
error: logErr && logErr.message,
});
}
this.ctx.logger.error('[PendingOrderService.syncOrderIds] 后台同步任务异常', {
request_id: requestId,
warehouseId,
error: error && error.message ? error.message : error,
stack: error && error.stack ? error.stack : '',
});
}
});
// 立即返回 request_id
return this.success('同步任务已提交,可通过 syncOrderIdsProgress 查询进度', {
request_id: requestId,
warehouse_id: warehouseId,
message: '同步任务已提交,后台处理中',
});
}
/**
* 查询订单同步任务进度。
*
* @param {Object} data 请求体。
* @param {string} data.request_id 请求ID(下划线写法)。
* @param {string} data.requestId 请求ID(驼峰写法)。
* @return {Promise<Object>} 任务进度响应,含 status / progress / total_count / processed_count / result。
*/
async syncOrderIdsProgress(data = {}) {
const requestId = this.normalizeSyncOrderIdsRequestId(data);
if (!requestId) {
return this.fail('request_id 参数不能为空', {}, 400);
}
const cachedProgress = await this.getSyncOrderIdsTaskProgress(requestId);
if (!cachedProgress) {
return this.success('ok', {
request_id: requestId,
status: 'not_found',
progress: SYNC_ORDER_IDS_PROGRESS_MAP.not_found,
total_count: 0,
processed_count: 0,
});
}
const normalizedStatus = String(cachedProgress.status || 'unknown').trim() || 'unknown';
return this.success('ok', {
request_id: requestId,
status: normalizedStatus,
progress: Number.isFinite(Number(cachedProgress.progress))
? Math.min(100, Math.max(0, Math.round(Number(cachedProgress.progress))))
: (SYNC_ORDER_IDS_PROGRESS_MAP[normalizedStatus] ?? SYNC_ORDER_IDS_PROGRESS_MAP.unknown),
total_count: Number(cachedProgress.total_count || 0),
processed_count: Number(cachedProgress.processed_count || 0),
warehouse_id: Number(cachedProgress.warehouse_id || 0),
result: cachedProgress.result || null,
error: cachedProgress.error || '',
update_time: cachedProgress.update_time || null,
});
}
/**
@ -2414,7 +2741,7 @@ class PendingOrderService extends OrderBaseService {
const [ affectedRows ] = await model.update(
{ remark: remarkValue, updated_at: now },
{ where },
{ where }
);
const count = Number(affectedRows || 0);

View File

@ -3520,7 +3520,7 @@ class RecheckOrderService extends OrderBaseService {
where: this.buildOrderWhere(orderIds, warehouseId),
attributes: [
'id', 'delivery_order_code', 'pre_delivery_order_code',
'storage_status', 'post_status', 'status', 'intercept_status',
'storage_status', 'post_status', 'sync_status', 'status', 'intercept_status',
'pick_status', 'recheck_status', 'wave_id', 'wave_no',
],
raw: true,
@ -3573,8 +3573,8 @@ class RecheckOrderService extends OrderBaseService {
continue;
}
const orderStatus = String(order.status || '').trim();
if (orderStatus !== 'created') {
const syncStatus = String(order.sync_status || '').trim();
if (syncStatus !== 'fin') {
failedOrders.push({
order_id: orderId,
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),

View File

@ -11,9 +11,9 @@ class PickService extends MainService {
constructor(ctx) {
super(ctx);
const _noNeedLogin = '';
const _noNeedRight = 'query,wavePickTaskDetail,wavePickTaskCurrent,wavePickTaskSubmit,wavePickTaskComplete';
const _noNeedRight = 'query,wavePickComplete,wavePickTaskDetail,wavePickTaskCurrent,wavePickTaskSubmit,wavePickTaskComplete';
const _noNeedLog = 'query';
const _noNeedAuth = 'query,wavePickTaskDetail,wavePickTaskCurrent,wavePickTaskSubmit,wavePickTaskComplete';
const _noNeedAuth = 'query,wavePickComplete,wavePickTaskDetail,wavePickTaskCurrent,wavePickTaskSubmit,wavePickTaskComplete';
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
}
@ -860,6 +860,240 @@ class PickService extends MainService {
}
}
/**
* 按波次号一键完成拣货。
*
* 内部复用 query 的去重与任务创建逻辑:
* - 若波次已有当前用户的活动任务 → 直接复用并完成。
* - 若波次已有他人活动任务 → 返回 409 冲突。
* - 若波次已完成 → 返回 already_completed。
* - 否则新建任务(source=2,后台抓取),创建成功后在内部调用 wavePickTaskComplete(mode=1 全部确认)完成拣货。
*
* @param {Object} data 请求参数。
* @param {number|string} data.wave_id 波次ID。
* @return {Promise<Object>} 统一 success/fail 包装结果。
*/
async wavePickComplete(data = {}) {
const { service, ctx } = this;
const requestData = this.isPlainObject(data) ? data : {};
const waveId = Number(requestData.wave_id || requestData.waveId || 0);
if (!Number.isInteger(waveId) || waveId <= 0) {
return this.fail('wave_id 必填且必须为正整数', {}, 400);
}
// --- 解析操作人上下文(与 query 保持一致)---
const userWarehouseId = ctx && ctx.user ? ctx.user.store_id : undefined;
const stateWarehouseId = ctx && ctx.state && ctx.state.user ? ctx.state.user.store_id : undefined;
const normalizedWarehouseId = Number(userWarehouseId || stateWarehouseId || 0);
if (!Number.isFinite(normalizedWarehouseId) || normalizedWarehouseId <= 0) {
return this.fail('缺少当前用户仓库上下文 store_id', {}, 400);
}
const stateUser = this.isPlainObject(ctx && ctx.state && ctx.state.user) ? ctx.state.user : null;
const ctxUser = this.isPlainObject(ctx && ctx.user) ? ctx.user : null;
const operatorSource = stateUser || ctxUser || {};
const rawOperatorId = operatorSource.employees_id ?? operatorSource.operator_id ?? operatorSource.id;
const operatorId = Number(rawOperatorId || 0);
const operatorName = String(
operatorSource.operator_name
|| operatorSource.employees_name
|| operatorSource.name
|| ''
).trim() || 'system';
if (!Number.isInteger(operatorId) || operatorId <= 0) {
return this.fail('未获取到操作人上下文', {}, 401);
}
// --- 按 wave_id 直接查波次 ---
const waveRows = await ctx.model.query(
`SELECT wave_id, wave_no, wave_type
FROM wms_wave_batch
WHERE warehouse_id = :warehouseId
AND wave_id = :waveId
LIMIT 1`,
{
replacements: { warehouseId: normalizedWarehouseId, waveId },
type: ctx.model.QueryTypes.SELECT,
}
);
const waveRow = Array.isArray(waveRows) && waveRows.length > 0 ? waveRows[0] : null;
if (!waveRow) {
return this.fail('波次不存在或不属于当前仓库', {}, 404);
}
const targetWaveId = Number(waveRow.wave_id || 0);
const targetWaveNo = String(waveRow.wave_no || '').trim();
const targetWaveType = Number(waveRow.wave_type || 2);
if (!Number.isInteger(targetWaveId) || targetWaveId <= 0 || !targetWaveNo) {
return this.fail('目标波次信息不完整', {}, 400);
}
// --- 去重:活动任务检查(与 query 一致)---
const activeTaskRows = await ctx.model.query(
`SELECT t.id AS task_id, t.pick_user_id, t.pick_user_name
FROM wms_wave_pick_task t
WHERE t.warehouse_id = :warehouseId
AND t.status IN (0, 1)
AND (
t.wave_id = :waveId
OR EXISTS (
SELECT 1
FROM wms_wave_pick_task_wave tw
WHERE tw.task_id = t.id
AND tw.wave_id = :waveId
)
)
ORDER BY t.id DESC
LIMIT 1`,
{
replacements: { waveId: targetWaveId, warehouseId: normalizedWarehouseId },
type: ctx.model.QueryTypes.SELECT,
}
);
const activeTask = Array.isArray(activeTaskRows) && activeTaskRows.length > 0 ? activeTaskRows[0] : null;
let taskId = 0;
if (activeTask) {
const activeTaskId = Number(activeTask.task_id || 0);
const taskOwnerId = Number(activeTask.pick_user_id || 0);
const taskOwnerName = String(activeTask.pick_user_name || '').trim() || `${taskOwnerId}`;
if (taskOwnerId > 0 && taskOwnerId !== operatorId) {
return this.fail(
`当前波次已由其他人创建活动任务,请移交任务创建人处理(创建人: ${taskOwnerName},任务ID: ${activeTaskId})`,
{ task_id: activeTaskId, task_owner_id: taskOwnerId, task_owner_name: taskOwnerName },
409
);
}
// 当前用户的活动任务,直接复用
taskId = activeTaskId;
}
// --- 去重:已完成任务检查(与 query 一致)---
if (taskId <= 0) {
const completedTaskRows = await ctx.model.query(
`SELECT t.id AS task_id
FROM wms_wave_pick_task t
WHERE t.warehouse_id = :warehouseId
AND t.status IN (2, 3)
AND (
t.wave_id = :waveId
OR EXISTS (
SELECT 1
FROM wms_wave_pick_task_wave tw
WHERE tw.task_id = t.id
AND tw.wave_id = :waveId
)
)
ORDER BY t.id DESC
LIMIT 1`,
{
replacements: { waveId: targetWaveId, warehouseId: normalizedWarehouseId },
type: ctx.model.QueryTypes.SELECT,
}
);
const completedTask = Array.isArray(completedTaskRows) && completedTaskRows.length > 0 ? completedTaskRows[0] : null;
if (completedTask) {
return this.success('ok', {
data: {
task_id: Number(completedTask.task_id),
status: 'already_completed',
tip: '该波次已完成拣货任务,无需重复操作',
},
code: 200,
});
}
}
// --- 无已有任务则创建新任务(与 query 一致)---
if (taskId <= 0) {
let orderModel = null;
try {
orderModel = await this.getOrderModelByWarehouse(normalizedWarehouseId);
} catch (error) {
return this.fail(error && error.message ? error.message : '订单模型不可用', {}, 500);
}
const orderRows = await orderModel.findAll({
where: { warehouse_id: normalizedWarehouseId, wave_id: targetWaveId },
attributes: [ 'id' ],
raw: true,
});
let selectedOrderIds = [ ...new Set((Array.isArray(orderRows) ? orderRows : [])
.map(item => Number(item && item.id || 0))
.filter(id => Number.isInteger(id) && id > 0)) ];
if (selectedOrderIds.length <= 0) {
const fallbackRows = await orderModel.findAll({
where: { warehouse_id: normalizedWarehouseId, wave_no: targetWaveNo },
attributes: [ 'id' ],
raw: true,
});
selectedOrderIds = [ ...new Set((Array.isArray(fallbackRows) ? fallbackRows : [])
.map(item => Number(item && item.id || 0))
.filter(id => Number.isInteger(id) && id > 0)) ];
}
if (selectedOrderIds.length <= 0) {
return this.fail('波次下无可用订单,无法创建任务', {}, 400);
}
const normalizedWaveType = Number(targetWaveType || 2);
const isGroupWave = normalizedWaveType === 1;
const pickMode = isGroupWave ? 1 : 2;
try {
const createdTask = await this.createWavePickTask({
warehouseId: normalizedWarehouseId,
waveId: targetWaveId,
waveNo: targetWaveNo,
pickMode,
operatorId,
operatorName,
orderIds: selectedOrderIds,
remark: `pick.wavePickComplete wave_id=${waveId}`,
source: 2,
});
taskId = createdTask.task_id;
} catch (error) {
const code = Number(error && error.code);
if (Number.isFinite(code) && code >= 400 && code < 600) {
return this.fail(error.message || '任务创建失败', {}, code);
}
ctx.logger.error('[PickService.wavePickComplete] 创建波次任务失败: %s', error && error.message ? error.message : error);
return this.fail('任务创建失败', {}, 500);
}
}
// --- 任务已就绪,调用内部 wavePickTaskComplete 全部确认完成 ---
try {
const result = await service.systems.pick.wavePickTaskComplete({
taskId,
mode: 1,
orderIds: [],
});
return this.success('ok', {
data: {
...result,
status: 'completed',
tip: '波次拣货已完成',
},
code: 200,
});
} catch (error) {
const code = Number(error && error.code);
if (Number.isInteger(code) && code >= 400 && code < 600) {
const errorData = this.isPlainObject(error && error.data) ? error.data : {};
return this.fail(error.message || '拣货完成失败', errorData, code);
}
ctx.logger.error('[PickService.wavePickComplete] 完成拣货失败: %s', error && error.message ? error.message : error);
return this.fail('拣货完成失败', {}, 500);
}
}
/**
* 完全提交拣货任务。
*

View File

@ -8,6 +8,32 @@ const CREATE_CHANNEL_API = 'API';
const RETRYABLE_DATABASE_ERROR_CODES = new Set([ 1205, 1213, 'ER_LOCK_WAIT_TIMEOUT', 'ER_LOCK_DEADLOCK' ]);
const TRANSACTION_LOCK_RETRY_MAX_ATTEMPTS = 3;
const TRANSACTION_LOCK_RETRY_BASE_DELAY_MS = 50;
const DISPATCH_BATCH_SIZE = 20;
const SYNC_ORDER_IDS_PROGRESS_CACHE_TTL = 7200;
function getSyncOrderIdsProgressCacheKey(requestId) {
if (!requestId) return null;
return `order:pending:sync_order_ids:request:${String(requestId).trim()}`;
}
async function updateDispatchBatchProgress(service, cacheKey, batchSize) {
if (!cacheKey || !service || !service.app) return;
try {
const cached = await service.app.getCacheAsync(cacheKey);
if (cached && typeof cached === 'object') {
const total = Number(cached.total_count || 0);
const processed = Number(cached.processed_count || 0) + Number(batchSize || 0);
await service.app.setCacheAsync(cacheKey, {
...cached,
processed_count: processed,
progress: total > 0 ? Math.min(100, Math.round(processed / total * 100)) : 0,
update_time: Date.now(),
}, SYNC_ORDER_IDS_PROGRESS_CACHE_TTL);
}
} catch (err) {
// 进度更新失败不影响主流程
}
}
function normalizeDatabaseErrorCodeInternal(error) {
const code = error && (error.code
@ -382,18 +408,25 @@ async function syncManualOrdersInternal(service, groupedOrder = {}, context = {}
const waybillCodeMap = await buildOrderWaybillCodeMapInternal(service, orderIds);
const syncResults = await Promise.all(orderIds.map(orderId => {
return processManualOrderInternal(
service,
orderModel,
orderItemsModel,
orderId,
warehouseId,
orderMap.get(orderId),
context,
waybillCodeMap.get(orderId)
);
}));
const progressCacheKey = getSyncOrderIdsProgressCacheKey(context.request_id);
const syncResults = [];
for (let i = 0; i < orderIds.length; i += DISPATCH_BATCH_SIZE) {
const batch = orderIds.slice(i, i + DISPATCH_BATCH_SIZE);
const batchResults = await Promise.all(batch.map(orderId => {
return processManualOrderInternal(
service,
orderModel,
orderItemsModel,
orderId,
warehouseId,
orderMap.get(orderId),
context,
waybillCodeMap.get(orderId)
);
}));
syncResults.push(...batchResults);
await updateDispatchBatchProgress(service, progressCacheKey, batchResults.length);
}
const successCount = syncResults.filter(item => item.status === 'success').length;
const failedCount = syncResults.filter(item => item.status === 'failed').length;
@ -785,17 +818,24 @@ async function finalizeLocalChannelOrdersInternal(service, createChannel, groupe
void orderItemRows;
const syncResults = await Promise.all(orderIds.map(orderId => {
return processLocalChannelOrderInternal(
service,
createChannel,
orderModel,
orderItemsModel,
orderId,
warehouseId,
orderMap.get(orderId)
);
}));
const progressCacheKey = getSyncOrderIdsProgressCacheKey(context.request_id);
const syncResults = [];
for (let i = 0; i < orderIds.length; i += DISPATCH_BATCH_SIZE) {
const batch = orderIds.slice(i, i + DISPATCH_BATCH_SIZE);
const batchResults = await Promise.all(batch.map(orderId => {
return processLocalChannelOrderInternal(
service,
createChannel,
orderModel,
orderItemsModel,
orderId,
warehouseId,
orderMap.get(orderId)
);
}));
syncResults.push(...batchResults);
await updateDispatchBatchProgress(service, progressCacheKey, batchResults.length);
}
const successCount = syncResults.filter(item => item.status === 'success').length;
const failedCount = syncResults.filter(item => item.status === 'failed').length;
@ -1134,20 +1174,27 @@ async function syncQmOrdersInternal(service, groupedOrder = {}, context = {}) {
}
const qimenClient = service.app.qimenClient;
const qimenResults = await Promise.all(orderIds.map(orderId => {
return processQmOrderInternal(
service,
orderModel,
orderItemsModel,
qimenClient,
orderId,
warehouseId,
orderMap.get(orderId),
itemsByOrderId.get(orderId) || [],
context,
waybillCodeMap.get(orderId)
);
}));
const progressCacheKey = getSyncOrderIdsProgressCacheKey(context.request_id);
const qimenResults = [];
for (let i = 0; i < orderIds.length; i += DISPATCH_BATCH_SIZE) {
const batch = orderIds.slice(i, i + DISPATCH_BATCH_SIZE);
const batchResults = await Promise.all(batch.map(orderId => {
return processQmOrderInternal(
service,
orderModel,
orderItemsModel,
qimenClient,
orderId,
warehouseId,
orderMap.get(orderId),
itemsByOrderId.get(orderId) || [],
context,
waybillCodeMap.get(orderId)
);
}));
qimenResults.push(...batchResults);
await updateDispatchBatchProgress(service, progressCacheKey, batchResults.length);
}
const successCount = qimenResults.filter(item => item.status === 'success').length;
const failedCount = qimenResults.filter(item => item.status === 'failed').length;

View File

@ -1613,8 +1613,17 @@ class OrderStorageAllocationService extends MainService {
};
const orderIds = normalizeOrderIds(requestData);
const warehouseId = normalizeNumber(ctx.user?.store_id ?? ctx.user?.warehouse_id, 0);
// 优先使用调用方传入的 warehouse_id(异步模式下 ctx.user 可能失效),
// 兜底从 ctx.user 或 requestData 中读取
const warehouseId = normalizeNumber(
requestData.warehouse_id
?? ctx.user?.store_id
?? ctx.user?.warehouse_id,
0
);
const now = new Date();
// 请求ID(用于 Redis 进度缓存)
const requestId = String(requestData.request_id || requestData.requestId || '').trim();
if (warehouseId <= 0) {
return {
@ -1642,6 +1651,11 @@ class OrderStorageAllocationService extends MainService {
[ctx.app.Sequelize.Op.in]: orderIds,
},
warehouse_id: warehouseId,
// 排除已同步完成的订单,防止重复提交
// 注意:不能排除 padding,因为 padding 是新订单的默认值(模型 defaultValue)
sync_status: {
[ctx.app.Sequelize.Op.notIn]: [ 'fin' ],
},
},
transaction,
lock: transaction.LOCK.UPDATE,
@ -1718,20 +1732,6 @@ class OrderStorageAllocationService extends MainService {
}
}
if (snOrderIdSet.size > 0) {
const forbiddenOrderIds = Array.from(snOrderIdSet).sort((a, b) => a - b);
await transaction.rollback();
return {
code: 400,
message: snBatchForbiddenReason,
data: {
warehouse_id: warehouseId,
requested_order_ids: orderIds,
forbidden_order_ids: forbiddenOrderIds,
},
};
}
const skippedOrders = [];
const fastFailedOrders = [];
const syncableOrders = [];
@ -1758,6 +1758,18 @@ class OrderStorageAllocationService extends MainService {
continue;
}
// SN 管理订单不允许走批量回传,标记为跳过,不阻断其他订单
if (snOrderIdSet.has(orderId)) {
fastFailedOrders.push({
order_id: orderId,
status: 'failed',
create_channel: normalizeCreateChannel(orderRow.create_channel),
failed_reason: 'sn_batch_forbidden',
message: snBatchForbiddenReason,
});
continue;
}
const normalizedPostStatus = String(orderRow.post_status || '').trim() || unallocatedPostStatus;
if (normalizedPostStatus === unallocatedPostStatus) {
fastFailedOrders.push({
@ -1774,10 +1786,15 @@ class OrderStorageAllocationService extends MainService {
syncableOrders.push(orderRow);
}
const expressFastFailedOrderIds = fastFailedOrders
.filter(order => String(order && order.failed_reason || '').trim() === 'express_unallocated')
.map(order => normalizeNumber(order.order_id, 0))
.filter(orderId => orderId > 0);
// SN 订单和快递未分配订单分开设置 sync_message
const snFailIds = fastFailedOrders
.filter(o => String(o && o.failed_reason || '').trim() === 'sn_batch_forbidden')
.map(o => normalizeNumber(o.order_id, 0))
.filter(id => id > 0);
const expressFailIds = fastFailedOrders
.filter(o => String(o && o.failed_reason || '').trim() === 'express_unallocated')
.map(o => normalizeNumber(o.order_id, 0))
.filter(id => id > 0);
const syncableOrderIds = syncableOrders
.map(order => normalizeNumber(order.id, 0))
@ -1800,7 +1817,21 @@ class OrderStorageAllocationService extends MainService {
});
}
if (expressFastFailedOrderIds.length > 0) {
if (snFailIds.length > 0) {
await orderModel.update({
sync_status: 'error',
sync_message: snBatchForbiddenReason,
inspection_status: STORAGE_STATUS_ERROR,
step: ORDER_STEP_EXCEPTION,
order_flag: snBatchForbiddenReason,
updated_at: now,
}, {
where: { id: { [ctx.app.Sequelize.Op.in]: snFailIds }, warehouse_id: warehouseId },
transaction,
});
}
if (expressFailIds.length > 0) {
await orderModel.update({
sync_status: 'error',
sync_message: fastFailReason,
@ -1809,94 +1840,138 @@ class OrderStorageAllocationService extends MainService {
order_flag: fastFailReason,
updated_at: now,
}, {
where: {
id: {
[ctx.app.Sequelize.Op.in]: expressFastFailedOrderIds,
},
warehouse_id: warehouseId,
},
where: { id: { [ctx.app.Sequelize.Op.in]: expressFailIds }, warehouse_id: warehouseId },
transaction,
});
}
ctx.logger.warn('[OrderStorageAllocationService.syncOrderIds] 命中快递状态未分配快速失败,已阻断同步派发', {
if (snFailIds.length > 0 || expressFailIds.length > 0) {
ctx.logger.warn('[OrderStorageAllocationService.syncOrderIds] 命中快速失败,已阻断同步派发', {
warehouseId,
orderIds: expressFastFailedOrderIds,
reason: fastFailReason,
snFailIds,
expressFailIds,
});
}
await transaction.commit();
// ── 写初始进度到 Redis(dispatch handler 内部会递增 processed_count)──
if (requestId) {
const progressCacheKey = `order:pending:sync_order_ids:request:${requestId}`;
try {
await ctx.app.setCacheAsync(progressCacheKey, {
status: 'running',
total_count: syncableOrderIds.length,
processed_count: 0,
progress: 0,
warehouse_id: warehouseId,
update_time: Date.now(),
}, 7200);
} catch (cacheErr) {
ctx.logger.warn('[OrderStorageAllocationService.syncOrderIds] 初始化进度缓存失败', {
error: cacheErr && cacheErr.message,
});
}
}
const routeContext = {
warehouseId,
requestedOrderIds: orderIds,
pendingOrderIds: syncableOrderIds,
request_id: requestId,
};
const orderAsyncService = this.ctx.service.systems.orderAsync;
const dispatchResults = [];
for (const groupedOrder of createChannelGroups) {
const createChannel = normalizeCreateChannel(groupedOrder.create_channel);
let result;
// 并行派发各渠道分组(每个分组独立 try/catch,单渠道异常不阻塞其他渠道)
const dispatchResults = await Promise.all(
createChannelGroups.map(async groupedOrder => {
const createChannel = normalizeCreateChannel(groupedOrder.create_channel);
const groupOrderCount = Number(groupedOrder.order_count || groupedOrder.order_ids?.length || 0);
if (createChannel === 'QM') {
result = await orderAsyncService.syncQmOrders(groupedOrder, routeContext);
} else if (createChannel === 'API') {
result = await orderAsyncService.syncApiOrders(groupedOrder, routeContext);
} else {
result = await orderAsyncService.syncManualOrders(groupedOrder, routeContext);
try {
let result;
if (createChannel === 'QM') {
result = await orderAsyncService.syncQmOrders(groupedOrder, routeContext);
} else if (createChannel === 'API') {
result = await orderAsyncService.syncApiOrders(groupedOrder, routeContext);
} else {
result = await orderAsyncService.syncManualOrders(groupedOrder, routeContext);
}
const dispatchStatus = result && result.status
? String(result.status).trim() || 'success'
: (result && result.success === false ? 'failed' : 'success');
return {
...result,
status: dispatchStatus,
};
} catch (channelError) {
// 单渠道异常不影响其他渠道
ctx.logger.error('[OrderStorageAllocationService.syncOrderIds] 渠道派发异常,已隔离', {
createChannel,
warehouseId,
orderCount: groupOrderCount,
error: channelError && channelError.message ? channelError.message : channelError,
});
return {
create_channel: createChannel,
order_ids: Array.isArray(groupedOrder.order_ids) ? groupedOrder.order_ids : [],
order_count: groupOrderCount,
warehouse_id: warehouseId,
handler: 'syncOrderIds',
sync_target: createChannel === 'QM' ? 'qimen' : 'internal',
status: 'failed',
message: channelError && channelError.message ? channelError.message : '渠道派发异常',
success_count: 0,
failed_count: groupOrderCount,
route_state: 'rejected',
};
}
})
);
// 操作日志已移至 pendingOrder.syncOrderIds 层统一写入,避免重复
// 派发完成后,将成功渠道的订单 sync_status 更新为 fin,防止重复同步
const dispatchedOrderIds = [];
for (let i = 0; i < dispatchResults.length; i++) {
const dr = dispatchResults[i];
if (dr && String(dr.status || '').trim() === 'success') {
const group = createChannelGroups[i];
if (group && Array.isArray(group.order_ids)) {
for (const oid of group.order_ids) {
dispatchedOrderIds.push(Number(oid));
}
}
}
const dispatchStatus = result && result.status
? String(result.status).trim() || 'success'
: (result && result.success === false ? 'failed' : 'success');
dispatchResults.push({
...result,
status: dispatchStatus,
});
}
// 写入 ORDER_SYNC 操作日志(所有请求的订单,含跳过/失败)
try {
const opLogService = this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.operationLog;
if (opLogService && typeof opLogService.createOperationLogs === 'function') {
const channelNames = createChannelGroups.map(g => g.create_channel).join('/') || 'unknown';
const operatorId = ctx.user?.employees_id ?? ctx.user?.id ?? null;
const operatorName = ctx.user?.employees_name ?? ctx.user?.real_name ?? ctx.user?.name ?? 'system';
const logItems = orderIds.map(orderId => {
const isPending = syncableOrderIds.includes(orderId);
const skipped = skippedOrders.find(s => Number(s.order_id) === orderId);
const failed = fastFailedOrders.find(f => Number(f.order_id) === orderId);
let msg;
if (isPending) msg = `同步到${channelNames}渠道`;
else if (failed) {
const reasonMap = { express_unallocated: '快递未分配', sn_batch_forbidden: 'SN订单不支持批量' };
msg = `同步跳过:${reasonMap[failed.failed_reason] || failed.failed_reason || failed.message || '条件不满足'}`;
} else if (skipped) {
const skipReasonMap = { already_synced: '已同步', not_found: '订单不存在' };
msg = `同步跳过:${skipReasonMap[skipped.skipped_reason] || skipped.skipped_reason || '已同步'}`;
} else msg = '同步跳过';
return {
businessType: 'order',
businessId: `${orderId}`,
operationCode: 'ORDER_SYNC',
operator: { id: operatorId, name: operatorName },
extras: {
message: msg,
warehouseId,
externalLogType: 'NONE',
},
};
if (dispatchedOrderIds.length > 0) {
try {
await orderModel.update({
sync_status: 'fin',
sync_message: '',
updated_at: new Date(),
}, {
where: {
id: { [ctx.app.Sequelize.Op.in]: dispatchedOrderIds },
warehouse_id: warehouseId,
},
});
ctx.logger.info('[OrderStorageAllocationService.syncOrderIds] 同步完成,已更新 sync_status=fin', {
warehouseId,
dispatchedCount: dispatchedOrderIds.length,
});
} catch (finUpdateErr) {
ctx.logger.error('[OrderStorageAllocationService.syncOrderIds] 更新 sync_status=fin 失败', {
warehouseId,
dispatchedCount: dispatchedOrderIds.length,
error: finUpdateErr && finUpdateErr.message,
});
await opLogService.createOperationLogs(logItems);
}
} catch (e) {
ctx.logger.warn('[OrderStorageAllocationService.syncOrderIds] 写入 ORDER_SYNC 操作日志失败', {
error: e && e.message,
warehouseId,
orderIds,
});
}
const responseData = {

View File

@ -0,0 +1,29 @@
{
"date": "2026-07-04",
"version": "1.0.0",
"changes": [
{
"method": "order.pendingOrder.syncOrderIds",
"type": "modified",
"description": "同步待处理订单由同步模式改为异步模式。提交后立即返回 request_id,后台通过 setImmediate 异步执行同步流程。调用方需通过 syncOrderIdsProgress 接口轮询进度。单订单失败静默写入 error 状态,不影响整批结果。已同步(fin)或处理中(padding)的订单自动跳过防重复。",
"breaking": true,
"migration": {
"before": "POST 同步调用,等待全部订单处理完成后返回完整结果",
"after": "POST 同步调用,立即返回 request_id;GET/POST syncOrderIdsProgress 轮询最终结果",
"response_change": "原返回 data 对象(含 warehouse_id / dispatch_results 等),现返回 request_id + warehouse_id + message"
}
},
{
"method": "order.pendingOrder.syncOrderIdsProgress",
"type": "added",
"description": "新增接口,用于查询 syncOrderIds 异步任务的进度与最终结果。入参 request_id,返回 status / progress / total_count / processed_count / result 等。",
"breaking": false
}
],
"affected_files": [
"app/service/systemMethods/order/pendingOrder.js",
"app/service/systems/order_storage_allocation.js",
"methods/system.json",
"test/app/service/systemMethods/order/pendingOrder.syncOrderIds.test.js"
]
}

View File

@ -0,0 +1,154 @@
# syncOrderIds 异步化改造 — 风险评估修正反馈
**日期**:2026-07-04
**评审来源**:`wms-review-agent` 风险评估报告(11 项风险点)
**修正执行**:`wms-db-agent`
**改造分支**:`ming`(尚未提交)
---
## 评审结论总览
| 风险点总数 | 确认为真风险 | 已修复 | 可接受妥协 | 不成立 |
|-----------|-------------|--------|-----------|--------|
| 11 + 1(深度排查) | 5 | 4 | 5 | 2 |
---
## 一、已修复项
### 🔴 P0 — #2 操作日志双重写入
**问题**:`order_storage_allocation.syncOrderIds` 中存在旧的 `ORDER_SYNC` 操作日志写入代码(约 50 行),`pendingOrder.syncOrderIds` 层又有新增的日志写入,导致每条订单产生 **2 条** `ORDER_SYNC` 日志。
**修法**:删除 `order_storage_allocation.js` 中旧的操作日志写入块,替换为一行注释 `// 操作日志已移至 pendingOrder.syncOrderIds 层统一写入,避免重复`。
**影响文件**:`app/service/systems/order_storage_allocation.js`(-50 行)
---
### 🟡 P1 — #3 Promise.all 无容错
**问题**:`Promise.all` 并行派发各渠道分组(QM / MANUAL / API),若任一渠道 handler 抛异常(如 `syncQmOrders` reject),按 `Promise.all` 语义会中断所有渠道。
**实际风险评估**:经核实,下游 handler(`syncQmOrders` / `syncManualOrders` / `syncApiOrders`)内部均使用 `Promise.all` + `processXxxOrderInternal` 模式,**所有方法返回 `{ status: 'failed' }` 而非 throw**,因此实际抛异常的概率极低。但作为防御性编程,仍加 `try/catch` 兜底。
**修法**:每个 `map(async groupedOrder => { ... })` 回调包裹 `try/catch`:
- `catch` 中记录 `ctx.logger.error`(含 createChannel / warehouseId / orderCount)
- 返回标准化 `{ status: 'failed', message, ... }` 结构
- 仍调用 `reportProgress(groupOrderCount)` 确保进度不丢失
**影响文件**:`app/service/systems/order_storage_allocation.js`(+20 行)
---
### 🔴 P0(深度排查)— catch 分支缺操作日志
**来源**:`wms-review-agent` 二次深度排查,对比 `allocateStorage` 发现遗漏。
**问题**:`syncOrderIds` 的 `setImmediate` catch 块中只写了缓存进度 + error log,**没有写操作日志**。而 `allocateStorage` 的 catch 块写了 `ORDER_STORAGE_ALLOCATE_FAILED`。如果服务崩溃、DB 断连等,`syncOrderIds` 的操作日志表里完全没有记录。
**修法**:在 `setImmediate` catch 块中新增操作日志写入,参考 `allocateStorage` 使用 `this.ctx.model.OperationLog.bulkCreate` 直写(崩溃场景下 service 层可能也不可用):
- 操作码:`ORDER_SYNC_FAILED`
- 内容:`订单同步失败:{errorMsg}`
- 双层 `try/catch`:外层写入缓存进度,内层写入操作日志
**影响文件**:`app/service/systemMethods/order/pendingOrder.js`(+35 行)
**测试覆盖**:新增 `should write ORDER_SYNC_FAILED operation log when entire sync task throws`
---
### 📋 P2 — #10 测试覆盖不足
**问题**:原报告指出"syncOrderIds 本身的异步流程没有对应测试用例"。
**实际核实**:`pendingOrder.syncOrderIds.test.js` 已存在(11 个测试),但确实缺少 2 个场景。
**修法**:新增 2 个测试用例:
- **渠道级异常隔离**:模拟 MANUAL 成功 + QM 失败,验证 `dispatch_results` 正确反映两渠道状态
- **多状态混合**:模拟 success / skipped / fast-failed 四类结果共存,验证 `result.data` 各字段正确
**最终覆盖**:14 个测试用例,覆盖以下场景:
| 场景 | 测试用例 |
|------|---------|
| 基础异步:立即返回 request_id | ✅ |
| 进度查询:success 后查到完整 result | ✅ |
| 进度查询:not_found | ✅ |
| 进度查询:request_id 为空 | ✅ |
| 中间态:submitted → running | ✅ |
| 单订单失败:整批仍 success | ✅ |
| 整体失败:报告 failed 状态 | ✅ |
| **catch 分支操作日志:ORDER_SYNC_FAILED** | ✅ 新增 |
| 进度递增:running → success | ✅ |
| 入参兼容:orderIds/ids/order_id | ✅ |
| 缓存故障:写入失败不崩溃 | ✅ |
| 进度回调异常:不崩溃 | ✅ |
| 渠道隔离:单渠道失败不阻塞 | ✅ |
| 多状态混合:四种结果共存 | ✅ |
---
## 二、不成立的风险点
### #6 — `warehouse_id` 优先级变更无校验
**核实**:`warehouse_id` 由 `pendingOrder.syncOrderIds` 在 `setImmediate` 之前通过 `this.getWarehouseId()` 快照提取,与原来 `ctx.user.store_id` **完全同源**。不存在调用方误传的通道。
**结论**:❌ 不成立,无风险。
---
### #7 — `sync_status` 过滤遗漏 `error` 状态
**核实**:model 定义 `sync_status` 枚举为 `['padding', 'fin', 'error']`。当前过滤条件为 `NOT IN ('fin', 'padding')`。
- `fin`(已完成):排除 ✅ — 无需重复同步
- `padding`(处理中):排除 ✅ — 防止并发重复提交
- `error`(失败):**不应排除** ✅ — 用户应能修复问题后重试
如果排除 `error`,会导致同步失败的订单**永远无法重试**,这反而是 bug。
**结论**:❌ 不成立,当前过滤条件是正确的业务设计。
---
## 三、可接受的妥协项
| # | 风险点 | 妥协理由 |
|---|--------|---------|
| 1 | Breaking API 变更 | 异步化必须付出的代价,changes JSON 已标记 `breaking: true`,调用方需适配 |
| 4 | `setImmediate` 中 ctx 生命周期 | 与 `allocateStorage` / `batchIntercept` / `batchLock` / `batchUnlock` / `batchUnintercept` **共 5 处现有模式**完全一致,框架已验证可行 |
| 5 | 异步任务无超时 | 与 `allocateStorage` 一致,缓存 TTL 2 小时自然过期兜底 |
| 8 | `syncOrderIdsProgress` 无权限隔离 | 与 `allocateStorageProgress` 一致,`request_id` 含随机 token 不可猜测 |
| 9 | 操作日志 `ctx.user` 可能为空 | 随 #2 修复一并解决(旧日志代码已删除,新日志用快照 operator) |
| 11 | `progress_callback` 函数注入 | 链路中无 JSON 序列化操作,与 `allocateStorage` 一致 |
---
## 四、当前状态
```
变更文件:6 个
├── app/service/systemMethods/order/pendingOrder.js (修改)
├── app/service/systems/order_storage_allocation.js (修改)
├── methods/system.json (修改)
├── methods/changes/syncOrderIds-async-20260704.json (新增)
├── methods/changes/syncOrderIds-async-review-feedback-20260704.md (新增)
├── test/.../pendingOrder.syncOrderIds.test.js (新增)
└── test/.../pendingOrder.allocateStorage.test.js (修改)
ESLint: 0 errors ✅
单测: 27 passing ✅ (13 allocateStorage + 14 syncOrderIds)
```
---
## 五、遗留建议(非阻塞)
| 优先级 | 建议 | 说明 |
|--------|------|------|
| P3 | 增加任务心跳 + 超时自动标记 failed | 可后续迭代,与 `allocateStorage` 统一处理 |
| P3 | `syncOrderIdsProgress` 增加 `warehouse_id` 校验 | 防止跨仓库查询他人任务(当前依赖随机 token 安全性) |
| P3 | 确认前端调用方已适配新返回格式 | 需产品/前端确认 `request_id` 轮询流程 |

View File

@ -1,4 +1,21 @@
[
{
"version": "2026.07.05-system-01",
"date": "2026-07-05",
"type": "added",
"summary": "新增 pick.wavePickComplete:传入 wave_id 一键完成整个波次拣货,内部复用 query 去重与任务创建逻辑后自动调用 wavePickTaskComplete(mode=1)",
"methods": [
"pick.wavePickComplete"
],
"notes": [
"新增方法:pick.wavePickComplete,入参 wave_id(number,必填)。",
"内部流程:按 wave_id 查波次 → 活动任务去重(同用户复用 / 他人409冲突)→ 完成任务去重 → 无任务则创建(source=2 后台抓取)→ 调用 pick.wavePickTaskComplete mode=1 全部确认。",
"创建任务 remark 格式:pick.wavePickComplete wave_id={waveId},用于与 pick.query 区分。",
"响应:task_id、status(completed / already_completed)、tip、confirmed_order_ids、is_completed、progress。",
"错误码:400(参数/波次无订单)、401(缺少操作人)、404(波次不存在)、409(他人活动任务冲突)、500(创建/完成失败)。"
],
"module": "pick"
},
{
"version": "2026.07.03-system-02",
"date": "2026-07-03",

View File

@ -3414,7 +3414,7 @@
},
{
"method": "order.pendingOrder.syncOrderIds",
"description": "同步待处理订单入口,支持批量传入 order_ids。服务端会按 create_channel 分组派发同步任务;若命中 SN 管理订单(is_sn_mgmt=Y),该订单会被拦截并标记失败,不允许走批量回传,需改用单订单回传。",
"description": "同步待处理订单(异步模式)。提交后立即返回 request_id,后台异步执行同步流程。调用方需通过 syncOrderIdsProgress 接口轮询任务进度与最终结果。后台会按 create_channel 分组并行派发同步任务(QM/MANUAL/API);单订单失败静默写入错误状态,不影响整批结果;已同步完成(sync_status='fin')的订单会被自动跳过防重复。SN管理订单和快递未分配订单在同步前即被标记为 error 并跳过派发。派发成功后会更新 sync_status='fin',防止重复同步。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [
@ -3445,33 +3445,134 @@
"name": "code",
"type": "number",
"required": true,
"description": "业务状态码,200 表示成功"
"description": "业务状态码,200 表示已受理"
},
{
"name": "message",
"type": "string",
"required": true,
"description": "返回信息,当前仅做受理提示"
"description": "受理提示信息"
},
{
"name": "data",
"type": "object",
"required": false,
"description": "服务层返回值,当前仅透传 order_ids"
"name": "request_id",
"type": "string",
"required": true,
"description": "异步任务唯一标识,用于 syncOrderIdsProgress 查询进度"
},
{
"name": "warehouse_id",
"type": "number",
"required": true,
"description": "生效的仓库 ID"
}
],
"errors": [
{
"code": 400,
"message": "order_ids 不能为空或格式错误"
}
]
},
{
"method": "order.pendingOrder.syncOrderIdsProgress",
"description": "查询 syncOrderIds 异步任务的进度与结果。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "request_id / requestId",
"type": "string",
"required": true,
"source": "body",
"description": "syncOrderIds 返回的 request_id"
}
],
"response": [
{
"name": "flag",
"type": "string",
"required": true,
"description": "全局调用结果标识,成功为 success"
},
{
"name": "code",
"type": "number",
"required": true,
"description": "业务状态码,200 表示成功"
},
{
"name": "message",
"type": "string",
"required": true,
"description": "返回信息"
},
{
"name": "request_id",
"type": "string",
"required": true,
"description": "请求 ID(原样回传)"
},
{
"name": "status",
"type": "string",
"required": true,
"description": "任务状态:submitted(已受理)/ running(处理中)/ success(完成)/ failed(失败)/ not_found(未找到)"
},
{
"name": "progress",
"type": "number",
"required": true,
"description": "进度百分比(0-100)"
},
{
"name": "total_count",
"type": "number",
"required": false,
"description": "总订单数"
},
{
"name": "processed_count",
"type": "number",
"required": false,
"description": "已处理订单数"
},
{
"name": "warehouse_id",
"type": "number",
"required": false,
"description": "仓库 ID"
},
{
"name": "result",
"type": "object",
"required": false,
"description": "完成时的同步结果(success 状态时存在),含 success_count / failed_count / dispatch_results 等"
},
{
"name": "error",
"type": "string",
"required": false,
"description": "失败时的错误信息(failed 状态时存在)"
},
{
"name": "update_time",
"type": "number",
"required": false,
"description": "最后更新时间戳"
}
],
"errors": [
{
"code": 400,
"message": "SN订单不支持批量回传,请改用单订单回传"
},
{
"code": 500,
"message": "内部错误:服务层同步失败"
"message": "request_id 参数不能为空"
}
]
},
@ -16412,6 +16513,90 @@
}
]
},
{
"method": "pick.wavePickComplete",
"description": "按波次ID一键完成整个波次的拣货。内部先按 wave_id 定位波次,复用 query 的去重与任务创建逻辑:若波次已有当前用户的活动任务则直接复用并完成;已有他人活动任务返回 409;已完成则返回 already_completed;否则新建任务(source=2 后台抓取)后在内部调用 wavePickTaskComplete(mode=1 全部确认)完成拣货并回写任务进度。",
"isNeedAuth": false,
"isNeedLogin": true,
"isNeedRight": false,
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "wave_id",
"type": "number",
"required": true,
"source": "body",
"description": "波次ID(wms_wave_batch.wave_id)"
}
],
"response": [
{
"name": "task_id",
"type": "number",
"required": true,
"description": "拣货任务ID"
},
{
"name": "status",
"type": "string",
"required": true,
"description": "操作结果:completed(拣货完成)或 already_completed(波次已存在完成任务)"
},
{
"name": "tip",
"type": "string",
"required": true,
"description": "提示文案"
},
{
"name": "confirmed_order_ids",
"type": "array",
"required": false,
"description": "已确认完成的订单ID列表"
},
{
"name": "is_completed",
"type": "boolean",
"required": false,
"description": "任务是否已全部完成"
},
{
"name": "progress",
"type": "object",
"required": false,
"description": "任务进度(total_orders / picked_orders / pending_orders)"
}
],
"errors": [
{
"code": 400,
"message": "参数错误(wave_id 为空/非正整数、缺少仓库上下文、波次信息不完整、波次下无可用订单)。"
},
{
"code": 401,
"message": "未获取到操作人上下文。"
},
{
"code": 404,
"message": "波次不存在或不属于当前仓库。"
},
{
"code": 409,
"message": "当前波次已存在他人创建的活动任务(失败 data 含 task_id、task_owner_id、task_owner_name)。"
},
{
"code": 500,
"message": "任务创建失败或拣货完成失败。"
}
]
},
{
"method": "pick.wavePickTaskDetail",
"description": "按任务ID获取拣货任务详情。查询前会校验任务内订单是否全部完成快递号与储位分配:若存在未分配快递号或未分配储位订单,将返回 400 并在 data 中返回 action 与 order_ids 供前端触发一键分配;详情响应新增中间态进度语义(task.is_completed、task.progress 与顶层 is_completed),用于前端判断是否已完成与展示阶段进度;仅允许任务的 pick_user_id 与当前登录用户一致时返回详情。当 pick_mode=1(团购小波次)时,picking_details 字段不返回以减少带宽。",

View File

@ -71,6 +71,11 @@ function createHarness(options = {}) {
},
},
},
logger: {
info: () => {},
warn: () => {},
error: () => {},
},
};
return {
@ -369,15 +374,19 @@ describe('test/app/service/systemMethods/order/pendingOrder.allocateStorage.test
order_ids: [ 11, 12 ],
});
assert.deepEqual(capture.syncRequest, {
order_ids: [ 11, 12 ],
});
// 异步模式:立即返回 request_id,service 层在 setImmediate 中调用
assert.equal(result.flag, 'success');
assert.equal(result.message, '同步已受理,当前仅透传 order_ids');
assert.equal(result.code, 200);
assert.deepEqual(result.data, {
ok: true,
});
assert.match(result.request_id, /^sync_order_100000_\d+_[a-z0-9]+$/);
assert.equal(result.warehouse_id, 100000);
assert.ok(result.message.includes('已提交'));
// 等待异步回调触发
await new Promise(resolve => setImmediate(resolve));
// service 层被正确调用
assert.deepEqual(capture.syncRequest.order_ids, [ 11, 12 ]);
assert.equal(capture.syncRequest.warehouse_id, 100000);
assert.equal(typeof capture.syncRequest.progress_callback, 'function');
});
it('should reject warehouse_id and warehouseId on the pending order entry', async () => {