fix(workbench): 打包任务结束统一复位摄像头 OSD 为「无任务」
- 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 注释同步
This commit is contained in:
parent
990fcf1314
commit
933a1ae341
@ -7,7 +7,8 @@
|
||||
* - 按仓库拉取 subject_config 中配置的打包最大时长
|
||||
* (散单 single_order_pack_max_minutes / 团购 group_order_pack_max_minutes,单位分钟);
|
||||
* - 当 当前时间 - 开始时间 > 配置时长 时自动结束,
|
||||
* 将 end_time 置为 开始时间 + 上限时长,状态置为已完成(2)。
|
||||
* 将 end_time 置为 开始时间 + 上限时长,状态置为已完成(2);
|
||||
* - 任务结束后同步将该工作台关联摄像头的 OSD 叠加复位为「无任务」。
|
||||
*/
|
||||
module.exports = {
|
||||
schedule: {
|
||||
|
||||
@ -11,7 +11,8 @@ const MINUTE_MS = 60 * 1000;
|
||||
* 打包任务自动结束服务。
|
||||
* 扫描 wms_pack_task 未结束任务,按仓库配置的打包最大时长
|
||||
* (散单 single_order_pack_max_minutes / 团购 group_order_pack_max_minutes,单位分钟)
|
||||
* 判断是否超时,超时则将结束时间置为开始时间 + 上限时长并标记已完成。
|
||||
* 判断是否超时,超时则将结束时间置为开始时间 + 上限时长并标记已完成,
|
||||
* 同时将该工作台关联摄像头的 OSD 叠加复位为「无任务」。
|
||||
*/
|
||||
class PackTaskAutoFinishService extends MainService {
|
||||
/**
|
||||
@ -35,7 +36,7 @@ class PackTaskAutoFinishService extends MainService {
|
||||
status: { [Op.lt]: PACK_TASK_FINISHED_STATUS },
|
||||
start_time: { [Op.ne]: null },
|
||||
},
|
||||
attributes: [ 'id', 'warehouse_id', 'pack_mode', 'start_time', 'order_id', 'wave_id' ],
|
||||
attributes: [ 'id', 'warehouse_id', 'pack_mode', 'start_time', 'order_id', 'wave_id', 'workbench_id' ],
|
||||
});
|
||||
|
||||
if (tasks.length === 0) {
|
||||
@ -109,6 +110,14 @@ class PackTaskAutoFinishService extends MainService {
|
||||
});
|
||||
}
|
||||
|
||||
// 同步工作台 OSD:任务结束后复位为「无任务」(与 workbench._finishPack 语义一致,避免屏幕残留上一个任务文字)
|
||||
if (workbenchService && typeof workbenchService._resetPackOsd === 'function') {
|
||||
await workbenchService._resetPackOsd({
|
||||
warehouseId,
|
||||
workbenchId: Number(task.workbench_id || 0),
|
||||
});
|
||||
}
|
||||
|
||||
autoFinished += 1;
|
||||
|
||||
ctx.logger.info(
|
||||
|
||||
@ -37,6 +37,13 @@ const WORKBENCH_BIND_CODE_CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
|
||||
/** @type {number} 工作台绑定码 / client_code 长度 */
|
||||
const WORKBENCH_BIND_CODE_LENGTH = 6;
|
||||
|
||||
/** @type {string} 摄像头 OSD 叠加文字缓存 key 前缀(最终 key:osd_{workbenchId}) */
|
||||
const OSD_CACHE_KEY_PREFIX = 'osd_';
|
||||
/** @type {number} 摄像头 OSD 叠加文字缓存有效期(秒) */
|
||||
const OSD_CACHE_TTL_SECONDS = 3600;
|
||||
/** @type {string} 打包任务结束(空闲态)时的摄像头 OSD 叠加文字 */
|
||||
const OSD_IDLE_TEXT = '无任务';
|
||||
|
||||
class WorkbenchService extends Service {
|
||||
/**
|
||||
* 查询工作台列表(仓库隔离 + 软删除过滤)
|
||||
@ -769,6 +776,8 @@ class WorkbenchService extends Service {
|
||||
}
|
||||
|
||||
// 步骤4:同一工作台有新的打包任务时,关闭上一个未结束的任务
|
||||
// 旧任务关闭会先把 OSD 复位为「无任务」,该 Promise 由步骤7.5 串行等待,避免复位覆盖新任务文字
|
||||
let previousTaskOsdResetPromise = null;
|
||||
if (validWorkbenchId) {
|
||||
const previousTask = await ctx.model.PackTask.findOne({
|
||||
where: {
|
||||
@ -793,6 +802,12 @@ class WorkbenchService extends Service {
|
||||
packStatus: 2,
|
||||
caller: 'Workbench._packOrder.closePrevious',
|
||||
});
|
||||
|
||||
// 旧任务已结束:OSD 复位为「无任务」(不阻塞请求,步骤7.5 会等其完成后再下发新任务文字)
|
||||
previousTaskOsdResetPromise = this._resetPackOsd({
|
||||
warehouseId,
|
||||
workbenchId: validWorkbenchId,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -930,44 +945,57 @@ class WorkbenchService extends Service {
|
||||
osdText = `波次${actualWaveNo} 共${totalOrders}单`;
|
||||
}
|
||||
|
||||
// 写入 OSD 缓存
|
||||
try {
|
||||
const osdCacheKey = `osd_${validWorkbenchId}`;
|
||||
await this.app.setCacheAsync(osdCacheKey, osdText, 3600);
|
||||
ctx.logger.info('[Workbench._packOrder] OSD缓存已写入 workbenchId=%d text=%s',
|
||||
validWorkbenchId, osdText);
|
||||
} catch (cacheErr) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD缓存写入失败 workbenchId=%d err=%s',
|
||||
validWorkbenchId, cacheErr.message);
|
||||
}
|
||||
|
||||
const OsdClient = require('../../lib/osd_client');
|
||||
const osdClient = new OsdClient(ctx);
|
||||
|
||||
// 异步下发,不阻塞打包主流程
|
||||
Promise.all(cameraIds.map(async cameraId => {
|
||||
// 缓存写入 + 逐台摄像头下发整体异步执行,不阻塞打包主流程
|
||||
const applyOsd = async () => {
|
||||
// 写入 OSD 缓存
|
||||
try {
|
||||
const camera = await ctx.model.Camera.findOne({
|
||||
where: { id: cameraId, warehouse_id: warehouseId },
|
||||
raw: true,
|
||||
});
|
||||
if (!camera || !camera.ip) return;
|
||||
|
||||
const result = await osdClient.setOsd({
|
||||
camera,
|
||||
warehouseId,
|
||||
text: osdText,
|
||||
});
|
||||
|
||||
if (!result.success) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD下发失败 cameraId=%d error=%s',
|
||||
cameraId, result.error || '打印服务返回异常');
|
||||
}
|
||||
} catch (err) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD下发异常 cameraId=%d err=%s', cameraId, err.message);
|
||||
const osdCacheKey = `${OSD_CACHE_KEY_PREFIX}${validWorkbenchId}`;
|
||||
await this.app.setCacheAsync(osdCacheKey, osdText, OSD_CACHE_TTL_SECONDS);
|
||||
ctx.logger.info('[Workbench._packOrder] OSD缓存已写入 workbenchId=%d text=%s',
|
||||
validWorkbenchId, osdText);
|
||||
} catch (cacheErr) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD缓存写入失败 workbenchId=%d err=%s',
|
||||
validWorkbenchId, cacheErr.message);
|
||||
}
|
||||
})).catch(err => {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD批量下发异常 err=%s', err.message);
|
||||
|
||||
const OsdClient = require('../../lib/osd_client');
|
||||
const osdClient = new OsdClient(ctx);
|
||||
|
||||
try {
|
||||
await Promise.all(cameraIds.map(async cameraId => {
|
||||
try {
|
||||
const camera = await ctx.model.Camera.findOne({
|
||||
where: { id: cameraId, warehouse_id: warehouseId },
|
||||
raw: true,
|
||||
});
|
||||
if (!camera || !camera.ip) return;
|
||||
|
||||
const result = await osdClient.setOsd({
|
||||
camera,
|
||||
warehouseId,
|
||||
text: osdText,
|
||||
});
|
||||
|
||||
if (!result.success) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD下发失败 cameraId=%d error=%s',
|
||||
cameraId, result.error || '打印服务返回异常');
|
||||
}
|
||||
} catch (err) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD下发异常 cameraId=%d err=%s', cameraId, err.message);
|
||||
}
|
||||
}));
|
||||
} catch (err) {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD批量下发异常 err=%s', err.message);
|
||||
}
|
||||
};
|
||||
|
||||
// 若本请求关闭了上一个未结束任务,需等 OSD 复位为「无任务」完成后再下发新任务文字
|
||||
const osdTask = previousTaskOsdResetPromise
|
||||
? previousTaskOsdResetPromise.then(applyOsd)
|
||||
: applyOsd();
|
||||
|
||||
osdTask.catch(err => {
|
||||
ctx.logger.warn('[Workbench._packOrder] OSD下发流程异常 err=%s', err.message);
|
||||
});
|
||||
}
|
||||
|
||||
@ -1104,6 +1132,12 @@ class WorkbenchService extends Service {
|
||||
ctx.logger.info('[Workbench._finishPack] 工作台 %d 结束打包任务 taskId=%d orderId=%d',
|
||||
validWorkbenchId, lastTask.id, lastTask.order_id);
|
||||
|
||||
// 打包任务结束:复位工作台摄像头 OSD 为「无任务」(异步执行,不阻塞主流程)
|
||||
this._resetPackOsd({ warehouseId, workbenchId: validWorkbenchId }).catch(err => {
|
||||
ctx.logger.warn('[Workbench._finishPack] OSD复位异常 workbenchId=%d err=%s',
|
||||
validWorkbenchId, err.message);
|
||||
});
|
||||
|
||||
// 同步更新关联订单打包状态:散单更新单笔订单,团购批量更新波次下所有未拦截订单
|
||||
const isGroupTask = Number(lastTask.pack_mode) === 2;
|
||||
const taskOrderId = Number(lastTask.order_id || 0);
|
||||
@ -1154,6 +1188,84 @@ class WorkbenchService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 打包任务结束后复位工作台摄像头 OSD 叠加文字为「无任务」。
|
||||
* 覆盖所有结束路径:工作台手动结束(_finishPack)、新任务关闭旧任务(_packOrder)、
|
||||
* 定时任务自动结束(packTaskAutoFinish)。
|
||||
* - 回写 Redis osd_{workbenchId} 缓存为「无任务」,避免缓存残留上一个任务文字;
|
||||
* - 逐台摄像头下发「无任务」,失败仅打印告警,不影响打包主流程;
|
||||
* - 内部已捕获全部异常,永不 reject。
|
||||
*
|
||||
* @param {Object} params - { warehouseId, workbenchId }
|
||||
* @return {Promise<void>} 无返回值
|
||||
*/
|
||||
async _resetPackOsd(params = {}) {
|
||||
const { ctx } = this;
|
||||
const warehouseId = parseInt(params.warehouseId);
|
||||
const workbenchId = parseInt(params.workbenchId);
|
||||
|
||||
if (!Number.isInteger(warehouseId) || warehouseId <= 0) return;
|
||||
if (!Number.isInteger(workbenchId) || workbenchId <= 0) return;
|
||||
|
||||
// 1. 回写 OSD 缓存为「无任务」,与摄像头实际叠加文字保持一致
|
||||
try {
|
||||
await this.app.setCacheAsync(
|
||||
`${OSD_CACHE_KEY_PREFIX}${workbenchId}`,
|
||||
OSD_IDLE_TEXT,
|
||||
OSD_CACHE_TTL_SECONDS
|
||||
);
|
||||
} catch (cacheErr) {
|
||||
ctx.logger.warn('[Workbench._resetPackOsd] OSD缓存写入失败 workbenchId=%d err=%s',
|
||||
workbenchId, cacheErr.message);
|
||||
}
|
||||
|
||||
// 2. 查询工作台绑定的摄像头
|
||||
let deviceIds = null;
|
||||
try {
|
||||
const wb = await ctx.model.Workbench.findByPk(workbenchId, {
|
||||
attributes: [ 'device_ids' ],
|
||||
raw: true,
|
||||
});
|
||||
deviceIds = wb && wb.device_ids ? wb.device_ids : null;
|
||||
} catch (err) {
|
||||
ctx.logger.warn('[Workbench._resetPackOsd] 读取工作台绑定设备失败 workbenchId=%d err=%s',
|
||||
workbenchId, err.message);
|
||||
return;
|
||||
}
|
||||
|
||||
const cameraIds = Array.isArray(deviceIds) ? deviceIds : [];
|
||||
if (cameraIds.length === 0) return;
|
||||
|
||||
const OsdClient = require('../../lib/osd_client');
|
||||
const osdClient = new OsdClient(ctx);
|
||||
|
||||
await Promise.all(cameraIds.map(async cameraId => {
|
||||
try {
|
||||
const camera = await ctx.model.Camera.findOne({
|
||||
where: { id: cameraId, warehouse_id: warehouseId },
|
||||
raw: true,
|
||||
});
|
||||
if (!camera || !camera.ip) return;
|
||||
|
||||
const result = await osdClient.setOsd({
|
||||
camera,
|
||||
warehouseId,
|
||||
text: OSD_IDLE_TEXT,
|
||||
});
|
||||
|
||||
if (!result.success) {
|
||||
ctx.logger.warn('[Workbench._resetPackOsd] OSD复位失败 cameraId=%d error=%s',
|
||||
cameraId, result.error || '打印服务返回异常');
|
||||
}
|
||||
} catch (err) {
|
||||
ctx.logger.warn('[Workbench._resetPackOsd] OSD复位异常 cameraId=%d err=%s', cameraId, err.message);
|
||||
}
|
||||
}));
|
||||
|
||||
ctx.logger.info('[Workbench._resetPackOsd] 打包任务结束,OSD已复位为「%s」workbenchId=%d cameras=%d',
|
||||
OSD_IDLE_TEXT, workbenchId, cameraIds.length);
|
||||
}
|
||||
|
||||
/**
|
||||
* 称重上报:条码(sn) → 运单号 → 更新称重重量
|
||||
* 支持散单直接更新和团购波次批量称重
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user