diff --git a/app/service/hikvision.js b/app/service/hikvision.js index 6fb5f97..caaddd0 100644 --- a/app/service/hikvision.js +++ b/app/service/hikvision.js @@ -28,11 +28,14 @@ class HikvisionService extends BaseService { const tasks = await app.mysql.get('wms').query( `SELECT t.id, t.order_id, t.warehouse_id, t.workbench_id, t.wave_no, t.waybill_code, t.device_ids, t.status AS task_status, - t.start_time, t.operator_text + t.start_time, t.end_time, t.operator_text FROM wms_pack_task t WHERE t.warehouse_id = ? AND t.pack_mode = 1 AND t.deleted_at IS NULL + AND t.end_time IS NOT NULL + AND t.device_ids IS NOT NULL + AND t.device_ids != '[]' AND t.id NOT IN ( SELECT v.pack_task_id FROM wms_pack_task_video v WHERE v.deleted_at IS NULL )