diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementPageReqVO.java
index 5401c6a1a..fdf1f769e 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementPageReqVO.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementPageReqVO.java
@@ -54,4 +54,10 @@ public class TaskManagementPageReqVO extends PageParam {
     @Schema(description = "id集合导出用")
     private String ids;
 
+    @Schema(description = "设备ID集合", example = "6979")
+    private List<Long> machineryIds;
+
+    @Schema(description = "产线")
+    private String deviceLineId;
+
 }
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java
index 9928fc35d..230f2db2f 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java
@@ -62,4 +62,9 @@ public class TicketManagementPageReqVO extends PageParam {
     @Schema(description = "取消原因")
     private String cancelReason;
 
+    @Schema(description = "设备集合", example = "6979")
+    private List<String> machineryNames;
+
+    @Schema(description = "产线")
+    private String deviceLineId;
 }
\ No newline at end of file
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/taskmanagement/TaskManagementMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/taskmanagement/TaskManagementMapper.java
index cf13e9193..a65a97246 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/taskmanagement/TaskManagementMapper.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/taskmanagement/TaskManagementMapper.java
@@ -3,9 +3,11 @@ package cn.iocoder.yudao.module.mes.dal.mysql.taskmanagement;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.planmaintenance.PlanMaintenanceDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.taskmanagement.TaskManagementDO;
 import com.alibaba.excel.util.StringUtils;
@@ -22,6 +24,11 @@ public interface TaskManagementMapper extends BaseMapperX<TaskManagementDO> {
 
     default PageResult<TaskManagementDO> selectPage(TaskManagementPageReqVO reqVO) {
         LambdaQueryWrapperX<TaskManagementDO> taskManagementDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+
+        if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
+            taskManagementDOLambdaQueryWrapperX.in(TaskManagementDO::getDeviceList,reqVO.getMachineryIds());
+        }
+
         taskManagementDOLambdaQueryWrapperX
                 .likeIfPresent(TaskManagementDO::getName, reqVO.getName())
                 .eqIfPresent(TaskManagementDO::getTaskType, reqVO.getTaskType())
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java
index ad2841f52..07ec136fb 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java
@@ -3,9 +3,11 @@ package cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.taskmanagement.TaskManagementDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
 import com.alibaba.excel.util.StringUtils;
@@ -24,6 +26,9 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
     default PageResult<TicketManagementDO> selectPage(TicketManagementPageReqVO reqVO) {
 
         LambdaQueryWrapperX<TicketManagementDO> ticketManagementDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        if(CollUtil.isNotEmpty(reqVO.getMachineryNames())){
+            ticketManagementDOLambdaQueryWrapperX.in(TicketManagementDO::getDeviceName,reqVO.getMachineryNames());
+        }
         ticketManagementDOLambdaQueryWrapperX
                 .eqIfPresent(TicketManagementDO::getTaskId, reqVO.getTaskId())
                 .eqIfPresent(TicketManagementDO::getPlanId, reqVO.getPlanId())
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java
index 73a35282a..eeb8875c4 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.mes.service.taskmanagement;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.iot.controller.admin.device.enums.TaskTypeEnum;
 import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.scheduler.TaskSchedulerManager;
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
@@ -154,7 +156,19 @@ public class TaskManagementServiceImpl implements TaskManagementService {
 
     @Override
     public PageResult<TaskManagementDO> getTaskManagementPage(TaskManagementPageReqVO pageReqVO) {
-
+        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())) {
+            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(new LambdaQueryWrapperX<DeviceLedgerDO>()
+                    .eq(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId())
+            );
+            List<Long> machineryIds = deviceLedgerDOS.stream().map(DeviceLedgerDO::getId).distinct().collect(Collectors.toList());
+            if(CollUtil.isNotEmpty(machineryIds)){
+                pageReqVO.setMachineryIds(machineryIds);
+            }else {
+                List<Long> objects = new ArrayList<>();
+                objects.add((long) -1);
+                pageReqVO.setMachineryIds(objects);
+            }
+        }
         PageResult<TaskManagementDO> taskManagementDOPageResult = taskManagementMapper.selectPage(pageReqVO);
         for (TaskManagementDO taskManagementDO : taskManagementDOPageResult.getList()) {
             PlanMaintenanceDO planMaintenanceDO = planMaintenanceMapper.selectById(taskManagementDO.getProjectForm());
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java
index 7433100bd..e231f4822 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.service.ticketmanagement;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO;
 import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.JobStatusEnum;
@@ -92,6 +93,20 @@ public class TicketManagementServiceImpl implements TicketManagementService {
 
     @Override
     public PageResult<TicketManagementDO> getTicketManagementPage(TicketManagementPageReqVO pageReqVO) {
+        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())) {
+            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(new LambdaQueryWrapperX<DeviceLedgerDO>()
+                    .eq(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId())
+            );
+            List<String> machineryNames = deviceLedgerDOS.stream().map(DeviceLedgerDO::getDeviceName).distinct().collect(Collectors.toList());
+            if(CollUtil.isNotEmpty(machineryNames)){
+                pageReqVO.setMachineryNames(machineryNames);
+            }else {
+                List<String> objects = new ArrayList<>();
+                objects.add("adsaf");
+                pageReqVO.setMachineryNames(objects);
+            }
+        }
+
         return ticketManagementMapper.selectPage(pageReqVO);
     }