- workbench.js 新增 OSD_IDLE_TEXT / OSD_CACHE_KEY_PREFIX / OSD_CACHE_TTL_SECONDS
常量与 _resetPackOsd:回写 Redis osd_{workbenchId} 为「无任务」并逐台摄像头
下发,内部捕获全部异常、永不 reject,失败仅告警不影响打包主流程
- 覆盖三条结束路径:_finishPack 手动结束、_packOrder 关闭上一个未结束任务、
packTaskAutoFinish 定时自动结束;_packOrder 场景下先等 OSD 复位完成再串行
下发新任务文字,避免复位覆盖新任务
- _packOrder 的 OSD 缓存写入与逐台下发整理为单个异步任务,保持不阻塞主流程
- pack_task_auto_finish.js 扫描补 workbench_id 并调用 _resetPackOsd,
schedule/auto_finish_pack_task.js 注释同步
143 lines
5.1 KiB
JavaScript
143 lines
5.1 KiB
JavaScript
'use strict';
|
||
|
||
const MainService = require('../main');
|
||
const { Op } = require('sequelize');
|
||
|
||
const PACK_MODE_GROUP = 2;
|
||
const PACK_TASK_FINISHED_STATUS = 2;
|
||
const MINUTE_MS = 60 * 1000;
|
||
|
||
/**
|
||
* 打包任务自动结束服务。
|
||
* 扫描 wms_pack_task 未结束任务,按仓库配置的打包最大时长
|
||
* (散单 single_order_pack_max_minutes / 团购 group_order_pack_max_minutes,单位分钟)
|
||
* 判断是否超时,超时则将结束时间置为开始时间 + 上限时长并标记已完成,
|
||
* 同时将该工作台关联摄像头的 OSD 叠加复位为「无任务」。
|
||
*/
|
||
class PackTaskAutoFinishService extends MainService {
|
||
/**
|
||
* 执行打包任务自动结束扫描。
|
||
*
|
||
* @return {Promise<Object>} 处理统计 { total_scanned, warehouse_count, auto_finished }。
|
||
*/
|
||
async executeAutoFinishPackTasks() {
|
||
const { ctx, app } = this;
|
||
const { PackTask } = app.model || {};
|
||
|
||
if (!PackTask || typeof PackTask.findAll !== 'function') {
|
||
return { total_scanned: 0, warehouse_count: 0, auto_finished: 0 };
|
||
}
|
||
|
||
const nowMs = Date.now();
|
||
|
||
// 1. 扫描所有未结束的打包任务(status < 2,即待处理/打包中),且已有开始时间
|
||
const tasks = await PackTask.findAll({
|
||
where: {
|
||
status: { [Op.lt]: PACK_TASK_FINISHED_STATUS },
|
||
start_time: { [Op.ne]: null },
|
||
},
|
||
attributes: [ 'id', 'warehouse_id', 'pack_mode', 'start_time', 'order_id', 'wave_id', 'workbench_id' ],
|
||
});
|
||
|
||
if (tasks.length === 0) {
|
||
return { total_scanned: 0, warehouse_count: 0, auto_finished: 0 };
|
||
}
|
||
|
||
// 2. 按仓库去重后拉取各仓库配置(缓存优先,模型规范化会补齐默认值)
|
||
const warehouseIds = [ ...new Set(
|
||
tasks
|
||
.map(task => Number(task.warehouse_id || 0))
|
||
.filter(warehouseId => Number.isInteger(warehouseId) && warehouseId > 0)
|
||
) ];
|
||
|
||
const configMap = new Map();
|
||
for (const warehouseId of warehouseIds) {
|
||
try {
|
||
const subjectConfig = await ctx.service.systems.deliveryOrder.getStoreSubjectConfig(warehouseId);
|
||
configMap.set(warehouseId, subjectConfig && typeof subjectConfig === 'object' ? subjectConfig : {});
|
||
} catch (error) {
|
||
ctx.logger.warn('[packTaskAutoFinish] 读取仓库 %d 配置失败: %s', warehouseId, error.message);
|
||
configMap.set(warehouseId, {});
|
||
}
|
||
}
|
||
|
||
// 3. 逐条判断超时并自动结束
|
||
let autoFinished = 0;
|
||
|
||
for (const task of tasks) {
|
||
const warehouseId = Number(task.warehouse_id || 0);
|
||
const config = configMap.get(warehouseId) || {};
|
||
|
||
const isGroup = Number(task.pack_mode) === PACK_MODE_GROUP;
|
||
const limitMinutes = Number(
|
||
isGroup ? config.group_order_pack_max_minutes : config.single_order_pack_max_minutes
|
||
);
|
||
|
||
// 未配置有效时长(或非法值)的仓库跳过,不做自动结束
|
||
if (!Number.isInteger(limitMinutes) || limitMinutes <= 0) {
|
||
continue;
|
||
}
|
||
|
||
const startMs = new Date(task.start_time).getTime();
|
||
if (!Number.isFinite(startMs)) {
|
||
continue;
|
||
}
|
||
|
||
const limitMs = limitMinutes * MINUTE_MS;
|
||
// 仅当 当前时间 - 开始时间 > 上限时长 时自动结束
|
||
if (nowMs - startMs <= limitMs) {
|
||
continue;
|
||
}
|
||
|
||
// 结束时间 = 开始时间 + 上限时长
|
||
const endTime = new Date(startMs + limitMs);
|
||
|
||
await task.update({
|
||
end_time: endTime,
|
||
status: PACK_TASK_FINISHED_STATUS,
|
||
});
|
||
|
||
// 同步关联订单打包状态(与 workbench._finishPack 语义一致,避免任务已完成但订单停留打包中)
|
||
const workbenchService = ctx.service && ctx.service.systems && ctx.service.systems.workbench;
|
||
if (workbenchService && typeof workbenchService._updateOrderPackStatus === 'function') {
|
||
const isGroupTask = Number(task.pack_mode) === PACK_MODE_GROUP;
|
||
const taskWaveId = isGroupTask ? Number(task.wave_id || 0) : 0;
|
||
await workbenchService._updateOrderPackStatus(warehouseId, {
|
||
orderId: Number(task.order_id || 0),
|
||
waveId: taskWaveId,
|
||
packStatus: PACK_TASK_FINISHED_STATUS,
|
||
caller: 'PackTaskAutoFinish',
|
||
});
|
||
}
|
||
|
||
// 同步工作台 OSD:任务结束后复位为「无任务」(与 workbench._finishPack 语义一致,避免屏幕残留上一个任务文字)
|
||
if (workbenchService && typeof workbenchService._resetPackOsd === 'function') {
|
||
await workbenchService._resetPackOsd({
|
||
warehouseId,
|
||
workbenchId: Number(task.workbench_id || 0),
|
||
});
|
||
}
|
||
|
||
autoFinished += 1;
|
||
|
||
ctx.logger.info(
|
||
'[packTaskAutoFinish] 自动结束超时打包任务 taskId=%d warehouseId=%d packMode=%s limitMinutes=%d start=%s end=%s',
|
||
task.id,
|
||
warehouseId,
|
||
isGroup ? 'group' : 'single',
|
||
limitMinutes,
|
||
new Date(startMs).toISOString(),
|
||
endTime.toISOString()
|
||
);
|
||
}
|
||
|
||
return {
|
||
total_scanned: tasks.length,
|
||
warehouse_count: warehouseIds.length,
|
||
auto_finished: autoFinished,
|
||
};
|
||
}
|
||
}
|
||
|
||
module.exports = PackTaskAutoFinishService;
|