diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java
index a0219bab..583fc9cd 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java
@@ -1,6 +1,7 @@
 package com.klp.mes.qc.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.mes.qc.domain.WmsCheckTask;
@@ -16,7 +17,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface WmsCheckTaskMapper extends BaseMapperPlus<WmsCheckTaskMapper, WmsCheckTask, WmsCheckTaskVo> {
 
-    Page<WmsCheckTaskVo> selectVoPagePlus(Page<Object> build,@Param("ew") LambdaQueryWrapper<WmsCheckTask> lqw);
+    Page<WmsCheckTaskVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<WmsCheckTask> qw);
 
     WmsCheckTaskVo selectVoByIdPlus(Long taskId);
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index d1291cae..f34f08f1 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -1,6 +1,7 @@
 package com.klp.mes.qc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -68,10 +69,25 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
      */
     @Override
     public TableDataInfo<WmsCheckTaskVo> queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsCheckTask> lqw = buildQueryWrapper(bo);
-        Page<WmsCheckTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
+        QueryWrapper<WmsCheckTask> qw = buildQueryWrapperPlus(bo);
+        Page<WmsCheckTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
         return TableDataInfo.build(result);
     }
+    private QueryWrapper<WmsCheckTask> buildQueryWrapperPlus(WmsCheckTaskBo bo) {
+        Map<String, Object> params = bo.getParams();
+        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<WmsCheckTask> qw = Wrappers.query();
+        qw.like(StringUtils.isNotBlank(bo.getTaskName()), "t.task_name", bo.getTaskName());
+        // 新增字段查询条件
+        qw.like(StringUtils.isNotBlank(bo.getVerifyTarget()), "t.verify_target", bo.getVerifyTarget());
+        qw.like(StringUtils.isNotBlank(bo.getWorkshopSection()), "t.workshop_section", bo.getWorkshopSection());
+        qw.like(StringUtils.isNotBlank(bo.getProcess()), "t.process", bo.getProcess());
+        qw.like(StringUtils.isNotBlank(bo.getUnitGroup()), "t.unit_group", bo.getUnitGroup());
+        qw.eq(bo.getInspectionResult() != null, "t.inspection_result", bo.getInspectionResult());
+        qw.like(StringUtils.isNotBlank(bo.getInspectionType()), "t.inspection_type", bo.getInspectionType());
+        //逻辑删除
+        qw.eq("t.del_flag", 0);
+        return qw;
+    }
     /**
      * 查询检查任务列表
      */
@@ -82,6 +98,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
         return TableDataInfo.build(result);
     }
 
+
+
     /**
      * 查询检查任务列表
      */
diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml
index 489b471b..0904914d 100644
--- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml
@@ -25,11 +25,10 @@
         FROM wms_check_task t
         LEFT JOIN wms_check_task_item ti ON t.task_id = ti.check_task_id AND ti.del_flag = 0
         LEFT JOIN wms_check_item i ON ti.check_item_id = i.item_id AND i.del_flag = 0
-        WHERE t.del_flag = 0
+        ${ew.customSqlSegment}
         AND EXISTS (
             SELECT 1 FROM wms_check_task_item ti2 WHERE ti2.check_task_id = t.task_id AND ti2.status = 0 AND ti2.del_flag = 0
         )
-        ${ew.customSqlSegment}
         GROUP BY t.task_id
     </select>
     <select id="selectVoByIdPlus" resultType="com.klp.mes.qc.domain.vo.WmsCheckTaskVo">