diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index 0131fca0..0f0014d1 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -1,13 +1,48 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-row>
-      <!-- 筛选区 -->
-      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择开始时间"></el-date-picker>
-      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
-      <el-button type="primary" @click="exportData">导出</el-button>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
@@ -18,7 +53,7 @@
 
     <el-descriptions title="明细信息" :column="3" border>
     </el-descriptions>
-    <el-table :data="list" border  height="calc(100vh - 320px)">
+    <el-table :data="list" border height="calc(100vh - 320px)">
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
         <template slot-scope="scope">
           <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
@@ -50,13 +85,20 @@ import { listMaterialCoil } from "@/api/wms/coil";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 
 export default {
   components: {
     ProductInfo,
     RawMaterialInfo,
     CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect
   },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
   data() {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
@@ -71,6 +113,14 @@ export default {
         status: 1,
         startTime: startTime,
         endTime: endTime,
+        selectType: 'product',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
       },
       loading: false,
     }
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index 28bb1daa..419efea9 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -1,13 +1,48 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-row>
-      <!-- 筛选区 -->
-      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择开始时间"></el-date-picker>
-      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary"  style="margin-left: 10px;" @click="getList">查询</el-button>
-      <el-button type="primary" @click="exportData">导出</el-button>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
@@ -52,13 +87,20 @@ import {
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 
 export default {
   components: {
     ProductInfo,
     RawMaterialInfo,
     CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
   },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
   data() {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
@@ -73,6 +115,14 @@ export default {
         status: 1,
         startTime: startTime,
         endTime: endTime,
+        selectType: 'product',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
       },
       loading: false,
     }
@@ -113,6 +163,7 @@ export default {
           return
         }
         listMaterialCoil({
+          ...this.queryParams,
           coilIds: coilIds,
         }).then(res => {
           this.list = res.rows
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
index 26218005..f64a3f9f 100644
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -1,13 +1,48 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-row>
-      <!-- 筛选区 -->
-      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择开始时间"></el-date-picker>
-      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
-      <el-button type="primary" @click="exportData">导出</el-button>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
@@ -51,13 +86,21 @@ import {
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+
 
 export default {
   components: {
     ProductInfo,
     RawMaterialInfo,
     CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
   },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
   data() {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
@@ -72,6 +115,14 @@ export default {
         status: 1,
         startTime: startTime,
         endTime: endTime,
+        selectType: 'product',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
       },
       loading: false,
     }
@@ -95,6 +146,7 @@ export default {
       Promise.all([
         // 酸连轧成品库
         listMaterialCoil({
+          ...this.queryParams,
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: 9999,
@@ -105,6 +157,7 @@ export default {
         }),
         // 镀锌原料库
         listMaterialCoil({
+          ...this.queryParams,
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: 9999,
@@ -115,6 +168,7 @@ export default {
         }),
         // 脱脂原料库
         listMaterialCoil({
+          ...this.queryParams,
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: 9999,