diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml
index 2950b1e4..1fb475d8 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml
@@ -11,13 +11,17 @@
         FROM act_ru_execution exe
         left join act_re_procdef def on exe.deployment_id = def.deployment_id
         <where>
-            exe.parent_id is null
+            1=1
             <if test="query.search != null and query.search != ''">
                 and def.model_key LIKE '%${query.search}%'
             </if>
             <if test="query.proc_inst_id != null and query.proc_inst_id != ''">
+                and exe.parent_id is null
                 and exe.proc_inst_id like '%${query.proc_inst_id}%'
             </if>
+            <if test="query.child_id != null and query.child_id != ''">
+                and exe.proc_inst_id like '%${query.child_id}%'
+            </if>
         </where>
         ORDER BY exe.create_time DESC
     </select>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java
index 02963a8c..616d35b8 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java
@@ -18,6 +18,7 @@ public class ExecutionQuery extends BaseQuery<ActRuExecution> {
     private String search;
 
     private String proc_inst_id;
+    private String child_id;
 
     @Override
     public void paramMapping() {
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java
index 5139384e..ef73d680 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java
@@ -53,6 +53,9 @@ public class ActRuExecutionServiceImpl extends ServiceImpl<ActRuExecutionMapper,
     @Override
     public Object getAll(ExecutionQuery query, PageQuery pageQuery) {
         Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        query.setChild_id(StringUtils.isNotBlank(query.getChild_id())?query.getChild_id().trim():query.getChild_id());
+        query.setProc_inst_id(StringUtils.isNotBlank(query.getProc_inst_id())?query.getProc_inst_id().trim():query.getProc_inst_id());
+        query.setSearch(StringUtils.isNotBlank(query.getSearch())?query.getSearch().trim():query.getSearch());
         List<Map> list = actRuExecutionMapper.pageGetAll(query, pageQuery);
         TableDataInfo<Map> build = TableDataInfo.build(list);
         build.setTotalElements(page.getTotal());
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
index 28c44c48..2aa8dfd0 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
@@ -120,6 +120,18 @@
             <if test="query.code != null and query.code != ''">
                 and code = #{query.code}
             </if>
+            <if test="query.mater != null and query.mater != ''">
+                and md_me_materialbase.material_code like '%${query.mater}%'
+            </if>
+            <if test="query.start_time != null and query.start_time != ''">
+                and pm_form_data.create_time >= #{query.start_time}
+            </if>
+            <if test="query.end_time != null and query.end_time != ''">
+                and #{query.end_time} >= pm_form_data.create_time
+            </if>
+            <if test="query.code != null and query.code != ''">
+                and code = #{query.code}
+            </if>
             <if test="query.search != null and query.search != ''">
                 and code = #{query.search}
             </if>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
index 736730ad..f9f05ef3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
@@ -14,12 +14,15 @@ import java.util.Map;
  */
 @Data
 public class FormDataQuery extends BaseQuery<PmFormData> {
-
     private String form_type;
     private String code;
     private String search;
     private String parent_id;
+    private String mater;
     private String[] status;
+    private String start_time;
+    private String end_time;
+
     private Map<String,String> form_query;
 
     @Override