diff --git a/wms-vue/src/components/duochaxun/Rukuzhengli.vue b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
index be8efd5..aab7101 100644
--- a/wms-vue/src/components/duochaxun/Rukuzhengli.vue
+++ b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
@@ -57,7 +57,7 @@
           </el-col>
         </el-row>
 
-        <el-row :gutter="24" v-if="isShow">
+        <el-row :gutter="24" v-show="isShow">
           <el-col :span="8">
             <el-form-item label="收货日期:">
               <el-date-picker style="width: 325px"
@@ -120,6 +120,8 @@
 
 
     <el-table
+        v-loading="this.tableloding"
+        :max-height="480"
         :header-cell-style="{background:'#000',color:'#fff'}"
         :data="tableData"
         id="educe-table"
@@ -436,6 +438,7 @@ export default {
           }
         }]
       },
+      tableloding: false,
       isShow:false,//是否展示全部搜索条件
       value1: '',
       value2: '',
@@ -496,9 +499,10 @@ export default {
             } else {
               this.$message.error('获取数据失败');
             }
-          })
-          .catch(function (err) {
-            console.log(err);
+
+            // eslint-disable-next-line no-unused-vars
+          },err=>{
+            this.tableloding=false;
           })
     },
     PlantS(){
@@ -512,12 +516,14 @@ export default {
             } else {
               this.$message.error('获取数据失败');
             }
+            // eslint-disable-next-line no-unused-vars
+          },err=>{
+            this.tableloding=false;
           })
-          .catch(function (err) {
-            console.log(err);
-          })
+
     },
     queryUser() {
+      this.tableloding=true;
       //列表数据加载
       this.$axios.post(this.$httpUrl + '/Rukuzhengli/queryUser', {
         pageSize: this.pageSize,
@@ -533,16 +539,13 @@ export default {
               this.$message.error('获取数据失败');
             }
 
+            // eslint-disable-next-line no-unused-vars
+          },err=>{
+            this.tableloding=false;
+          })
 
-          })
-          .catch(function (err) {
-            console.log(err);
-          })
     },
     find(){
-      if(this.checked){
-        this.checked=false;
-      }
       this.queryUser();
     },
     Allquesr(){
@@ -555,6 +558,8 @@ export default {
     },
     rest() {
       //条件查询重置
+      this.checked=false;
+      this.isShow=false;
       this.param={};
     },
   }
diff --git a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
index 0e453ca..af85e85 100644
--- a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
+++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
@@ -602,10 +602,6 @@ export default {
     this.Plant();
     this.Loc();
     this.z_Name();
-    // this.$nextTick(()=> {
-    //
-    //   this.MaxHeight = window.innerHeight - 220;//300是页面中除了表格外其他组件的高度
-    // })
   },
   methods: {
     handleEdit(index, row) {
@@ -652,9 +648,9 @@ export default {
             } else {
               this.$message.error('获取数据失败');
             }
-          })
-          .catch(function (err) {
-            console.log(err);
+            // eslint-disable-next-line no-unused-vars
+          },err =>{
+            this.tableloding=false
           })
     },
     z_Name(){
@@ -668,10 +664,10 @@ export default {
             } else {
               this.$message.error('获取数据失败');
             }
-          })
-          .catch(function (err) {
-            console.log(err);
-          })
+            // eslint-disable-next-line no-unused-vars
+          },err =>{
+        this.tableloding=false
+      })
     },
     queryUser() {
       this.tableloding=true
@@ -695,9 +691,10 @@ export default {
           })
     },
     find(){
-      if(this.checked){
-        this.checked=false;
-      }
+      // if(this.checked){
+      //   this.checked=false;
+      //   this.isShow=false;
+      // }
       this.queryUser();
     },
     Allquesr(){
@@ -711,6 +708,8 @@ export default {
     rest() {
       //表单重置
       this.param={};
+      this.isShow=false;
+      this.checked=false;
     },
     add() {
       //点击新增按弹窗
diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js
index 227a9b7..267bc1f 100644
--- a/wms-vue/src/router/router.js
+++ b/wms-vue/src/router/router.js
@@ -22,7 +22,7 @@ const routes=[
                 meta:{
                     title:'首页'
                 },
-                component: () => import('../components/duochaxun/Zhengliqingdan.vue')
+                component: () => import('../components/duochaxun/Rukuzhengli.vue')
             },
             {
                 path:'/Zhengliqingdan',
diff --git a/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java b/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java
index 57cf94c..3c34475 100644
--- a/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java
+++ b/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java
@@ -46,63 +46,75 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
 
         //查询条件
         //采购订单
-        if(rukuzhengli.sourceId!=null&&!rukuzhengli.sourceId.equals("")){
-            String[] str=rukuzhengli.sourceId.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(rukuzhengli.sourceId!=null){
+            if(!rukuzhengli.sourceId.trim().equals("")){
+                String[] str=rukuzhengli.sourceId.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql_bz+=" and ad.sourceId in ("+sb.toString()+")";
             }
-            sql_bz+=" and ad.sourceId in ("+sb.toString()+")";
+
         }
 
         //收货凭证
-        if(rukuzhengli.strBill7!=null&&!rukuzhengli.strBill7.equals("")){
-            String[] str=rukuzhengli.strBill7.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(rukuzhengli.strBill7!=null){
+            if(!rukuzhengli.strBill7.trim().equals("")){
+                String[] str=rukuzhengli.strBill7.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql_bz+=" and ad.strBill7 in ("+sb.toString()+")";
             }
-            sql_bz+=" and ad.strBill7 in ("+sb.toString()+")";
+
         }
 
         //料号
-        if(rukuzhengli.code!=null&&!rukuzhengli.code.equals("")){
-            String[] str=rukuzhengli.code.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(rukuzhengli.code!=null){
+            if(!rukuzhengli.code.trim().equals("")){
+                String[] str=rukuzhengli.code.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql_bz+=" and i.code in ("+sb.toString()+")";
             }
-            sql_bz+=" and i.code in ("+sb.toString()+")";
+
         }
 
         //批次号
-        if(rukuzhengli.PROP_C1!=null&&!rukuzhengli.PROP_C1.equals("")){
-            String[] str=rukuzhengli.PROP_C1.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(rukuzhengli.PROP_C1!=null){
+            if(!rukuzhengli.PROP_C1.trim().equals("")){
+                String[] str=rukuzhengli.PROP_C1.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql_bz+=" and ad.PROP_C1 in ("+sb.toString()+")";
             }
-            sql_bz+=" and ad.PROP_C1 in ("+sb.toString()+")";
+
         }
 
         //收货日期
@@ -120,8 +132,11 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
 
         }
         //特殊标记
-        if(rukuzhengli.PROP_C3!=null&&!rukuzhengli.PROP_C3.equals("")){
-            sql_bz+=" and ad.PROP_C3 ="+"'"+ rukuzhengli.PROP_C3+"'";
+        if(rukuzhengli.PROP_C3!=null){
+            if(!rukuzhengli.PROP_C3.trim().equals("")){
+                sql_bz+=" and ad.PROP_C3 ="+"'"+ rukuzhengli.PROP_C3.trim()+"'";
+            }
+
         }
 
         //工厂
@@ -150,15 +165,17 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
         }
 
         //SAP接口
-        if(rukuzhengli.CODE!=null&&!rukuzhengli.CODE.equals("")){
-
-            sql_bz+=" and a.CODE ="+"'"+ rukuzhengli.CODE+"'";
+        if(rukuzhengli.CODE!=null){
+            if(!rukuzhengli.CODE.trim().equals("")){
+                sql_bz+=" and a.CODE ="+"'"+ rukuzhengli.CODE.trim()+"'";
+            }
         }
 
         //加急标记
-        if(rukuzhengli.strBill11!=null&&!rukuzhengli.strBill11.equals("")){
-
-            sql_bz+=" and ad.strBill11 ="+"'"+ rukuzhengli.strBill11+"'";
+        if(rukuzhengli.strBill11!=null){
+            if(rukuzhengli.strBill11.trim().equals("")){
+                sql_bz+=" and ad.strBill11 ="+"'"+ rukuzhengli.strBill11.trim()+"'";
+            }
         }
 
         String sqlCount = "select count(t.id) as nums from(" + sql_bz+") t";
diff --git a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
index e2980de..d967a6a 100644
--- a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
+++ b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
@@ -46,43 +46,51 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
 
         //查询条件
         //采购单号
-        System.out.println(zhengliqingdan.sourceId.trim()==null);
-        if(zhengliqingdan.sourceId!=null&&!zhengliqingdan.sourceId.equals("")){
-            sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId.trim()+"'";
+        if(zhengliqingdan.sourceId!=null){
+            if(!zhengliqingdan.sourceId.trim().equals("")){
+                sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId.trim()+"'";
+            }
         }
         //收货凭证
-        if(zhengliqingdan.strBill7!=null&&!zhengliqingdan.strBill7.equals("")){
-            String[] str=zhengliqingdan.strBill7.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(zhengliqingdan.strBill7!=null){
+            if(!zhengliqingdan.strBill7.trim().equals("")){
+                String[] str=zhengliqingdan.strBill7.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql+=" and ad.strBill7 in ("+sb.toString()+")";
             }
-            sql+=" and ad.strBill7 in ("+sb.toString()+")";
+
         }
 
         //料号
-        if(zhengliqingdan.i_CODE!=null&&!zhengliqingdan.i_CODE.equals("")){
-            String[] str=zhengliqingdan.i_CODE.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(zhengliqingdan.i_CODE!=null){
+            if(!zhengliqingdan.i_CODE.trim().equals("")){
+                String[] str=zhengliqingdan.i_CODE.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql+=" and i.CODE in ("+sb.toString()+")";
             }
-            sql+=" and i.CODE in ("+sb.toString()+")";
         }
 
         //物料描述
-        if(zhengliqingdan.i_name!=null&&!zhengliqingdan.i_name.equals("")){
-            sql+=" and i.NAME="+"'"+zhengliqingdan.i_name+"'";
+        if(zhengliqingdan.i_name!=null){
+            if(!zhengliqingdan.i_name.trim().equals("")){
+                sql+=" and i.NAME like "+"'%"+zhengliqingdan.i_name.trim()+"%'";
+            }
         }
 
         //库区
@@ -99,23 +107,28 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
         }
 
         //库位号
-        if(zhengliqingdan.lc_CODE!=null&&!zhengliqingdan.lc_CODE.equals("")){
-            String[] str=zhengliqingdan.lc_CODE.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(zhengliqingdan.lc_CODE!=null){
+            if(!zhengliqingdan.lc_CODE.trim().equals("")){
+                String[] str=zhengliqingdan.lc_CODE.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql+=" and lc.CODE in ("+sb.toString()+")";
             }
-            sql+=" and lc.CODE in ("+sb.toString()+")";
         }
 
         //批次号
-        if(zhengliqingdan.PROP_C1!=null&&!zhengliqingdan.PROP_C1.equals("")){
-            sql+=" and ik.PROP_C1="+"'"+zhengliqingdan.PROP_C1+"'";
+        if(zhengliqingdan.PROP_C1!=null){
+            if(!zhengliqingdan.PROP_C1.trim().equals("")){
+                sql+=" and ik.PROP_C1="+"'"+zhengliqingdan.PROP_C1.trim()+"'";
+            }
+
         }
 
         //LOC
@@ -132,8 +145,10 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
         }
 
         //特殊标记
-        if(zhengliqingdan.PROP_C3!=null&&!zhengliqingdan.PROP_C3.equals("")){
-            sql+=" and ik.PROP_C3="+"'"+zhengliqingdan.PROP_C3+"'";
+        if(zhengliqingdan.PROP_C3!=null){
+            if(!zhengliqingdan.PROP_C3.trim().equals("")){
+                sql+=" and ik.PROP_C3="+"'"+zhengliqingdan.PROP_C3.trim()+"'";
+            }
         }
 
         //工厂
@@ -150,23 +165,27 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
         }
 
         //整理人
-        if(zhengliqingdan.OPERATOR!=null&&!zhengliqingdan.OPERATOR.equals("")){
-            String[] str=zhengliqingdan.OPERATOR.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(zhengliqingdan.OPERATOR!=null){
+            if(!zhengliqingdan.OPERATOR.trim().equals("")){
+                String[] str=zhengliqingdan.OPERATOR.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql+=" and rd.OPERATOR in ("+sb.toString()+")";
             }
-            sql+=" and rd.OPERATOR in ("+sb.toString()+")";
         }
 
         //SAP接口
-        if(zhengliqingdan.a_CODE!=null&&!zhengliqingdan.a_CODE.equals("")){
-            sql+=" and a.CODE="+"'"+zhengliqingdan.a_CODE+"'";
+        if(zhengliqingdan.a_CODE!=null){
+            if(!zhengliqingdan.a_CODE.trim().equals("")){
+                sql+=" and a.CODE="+"'"+zhengliqingdan.a_CODE.trim()+"'";
+            }
         }
 
         //整理日期
@@ -185,23 +204,28 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
         }
 
         //备注
-        if(zhengliqingdan.description!=null&&!zhengliqingdan.description.equals("")){
-            sql+=" and ad.description like"+"'%"+zhengliqingdan.description+"%'";
+        if(zhengliqingdan.description!=null){
+            if(!zhengliqingdan.description.trim().equals("")){
+                sql+=" and ad.description like"+"'%"+zhengliqingdan.description.trim()+"%'";
+            }
         }
 
         //容器码
-        if(zhengliqingdan.LP!=null&&!zhengliqingdan.LP.equals("")){
-            String[] str=zhengliqingdan.LP.split("\n");
-            StringBuffer sb = new StringBuffer();
-            for (int i=0;i<str.length;i++){
+        if(zhengliqingdan.LP!=null){
+            if(!zhengliqingdan.LP.trim().equals("")){
+                String[] str=zhengliqingdan.LP.trim().split("\n");
+                StringBuffer sb = new StringBuffer();
+                for (int i=0;i<str.length;i++){
 
-                if(str.length-1==i){
-                    sb.append("'"+ str[i]+"'");
-                }else {
-                    sb.append("'"+ str[i]+"'"+",");
+                    if(str.length-1==i){
+                        sb.append("'"+ str[i]+"'");
+                    }else {
+                        sb.append("'"+ str[i]+"'"+",");
+                    }
                 }
+                sql+=" and s.LP in ("+sb.toString()+")";
             }
-            sql+=" and s.LP in ("+sb.toString()+")";
+
         }