diff --git a/wms-vue/src/components/duochaxun/Pandianmingxi.vue b/wms-vue/src/components/duochaxun/Pandianmingxi.vue
index 628d05f..af1e732 100644
--- a/wms-vue/src/components/duochaxun/Pandianmingxi.vue
+++ b/wms-vue/src/components/duochaxun/Pandianmingxi.vue
@@ -6,23 +6,18 @@
       <el-form ref="form" :model="param" label-width="80px">
         <el-row :gutter="24">
           <el-col :span="4">
-            <el-form-item label="子任务号:">
-              <el-input type="textarea" v-model="param.BILLCODE" :rows="1"></el-input>
+            <el-form-item label="盘点计划号:" label-width="50">
+              <el-input type="text" v-model="param.cp_code" style="width: 105px"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="工单号:" >
-              <el-input  type="textarea" v-model="param.pt_code" :rows="1"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="SAP类型:">
-              <el-input type="text" v-model="param.sourceType" :rows="1"></el-input>
+            <el-form-item label="盘点单号:" >
+              <el-input  type="textarea" v-model="param.count_code" :rows="1"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
-            <el-form-item label="拣货库区">
+            <el-form-item label="库区">
               <el-select v-model="param.z_name"  multiple filterable placeholder="请选择库区" style="width: 100%;">
                 <el-option
                     v-for="item in Ku"
@@ -34,148 +29,56 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="所在库位:">
-              <el-input type="textarea" v-model="param.lc2_code" :rows="1"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="4">
             <el-form-item label="料号:">
               <el-input type="textarea" v-model="param.i_code" :rows="1"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="24" v-show="isShow">
           <el-col :span="4">
-            <el-form-item label="单据类型">
-              <el-select v-model="param.bt_name"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Dj"
-                    :key="item.index"
-                    :label="item.name"
-                    :value="item.name"
-                >
-                </el-option>
-              </el-select>
+            <el-form-item label="物料描述:">
+              <el-input type="text" v-model="param.i_name"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="4">
-            <el-form-item label="工作站">
-              <el-select v-model="param.END_REGION"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Gz"
-                    :key="item.index"
-                    :label="item.END_REGION"
-                    :value="item.END_REGION"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="拣货人">
-              <el-select v-model="param.w4_name"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Jhr"
-                    :key="item.index"
-                    :label="item.name"
-                    :value="item.name"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="波次号:">
-              <el-input type="text" v-model="param.wd_code"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="容器码:">
-              <el-input type="text" v-model="param.LP"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="拣货库位">
-              <el-select
-                  v-model="param.lc1_code"
-                  multiple
-                  filterable
-                  remote
-                  reserve-keyword
-                  placeholder="请输入关键词"
-                  :remote-method="remoteMethod"
-                  :loading="loading">
-                <el-option
-                    v-for="item in Kw"
-                    :key="item.index"
-                    :label="item.CODE"
-                    :value="item.CODE">
-                </el-option>
-              </el-select>
+            <el-form-item label="库位号:">
+              <el-input type="textarea" v-model="param.lc_code" :rows="1"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="24" v-show="isShow">
-          <el-col :span="8">
-            <el-form-item label="需求日期:">
-              <el-date-picker style="width: 325px"
-                              v-model="param.ORDER_DATE"
-                              type="daterange"
-                              align="right"
-                              unlink-panels
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              :picker-options="pickerOptions">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="分配日期:">
-              <el-date-picker style="width: 325px"
-                              v-model="param.CREATE_TIME"
-                              type="daterange"
-                              align="right"
-                              unlink-panels
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              :picker-options="pickerOptions">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="4">-->
+<!--            <el-form-item label="库区:">-->
+<!--              <el-select v-model="param.z_name" multiple filterable  placeholder="请选择" style="width: 100%;">-->
+<!--                <el-option-->
+<!--                    v-for="item in Ku"-->
+<!--                    :key="item.index"-->
+<!--                    :label="item.name"-->
+<!--                    :value="item.name"-->
+<!--                >-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="8">
-            <el-form-item label="拣货日期:">
-              <el-date-picker style="width: 325px"
-                              v-model="param.OPERATE_TIME"
-                              type="daterange"
-                              align="right"
-                              unlink-panels
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              :picker-options="pickerOptions">
-              </el-date-picker>
+          <el-col :span="4">
+            <el-form-item label="工作站:">
+              <el-input type="textarea" v-model="param.targetArea" :rows="1"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
-            <el-form-item label="拣货状态:">
-              <el-select v-model="param.Status"  placeholder="请选择" style="width: 100%;">
+            <el-form-item label="盘点人员:">
+              <el-input type="textarea" v-model="param.w_name" :rows="1"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <el-form-item label="是否盘点:">
+              <el-select v-model="param.NEED_COUNT"  placeholder="请选择" style="width: 100%;">
                 <el-option
-                    v-for="item in Zt"
+                    v-for="item in pd"
                     :key="item.label"
                     :label="item.values"
                     :value="item.label"
@@ -185,34 +88,34 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="下发日期:">
+              <el-date-picker style="width: 325px"
+                              v-model="param.issued_Date"
+                              type="daterange"
+                              align="right"
+                              unlink-panels
+                              range-separator="至"
+                              start-placeholder="开始日期"
+                              end-placeholder="结束日期"
+                              :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          
           <el-col :span="4">
-            <el-form-item label="加急标记">
-              <el-select v-model="param.equated_Quantity"   placeholder="请选择库区" style="width: 100%;">
+            <el-form-item label="是否差异:">
+              <el-select v-model="param.sfcy"  placeholder="请选择" style="width: 100%;">
                 <el-option
-                    v-for="item in Bj"
-                    :key="item.index"
-                    :label="item.equated_Quantity"
-                    :value="item.equated_Quantity"
+                    v-for="item in xy"
+                    :key="item.label"
+                    :label="item.values"
+                    :value="item.label"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="下发人">
-              <el-select v-model="param.strBill1"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Xf"
-                    :key="item.index"
-                    :label="item.strBill1"
-                    :value="item.strBill1"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
         </el-row>
 
         <el-button type="success" @click="find">查找</el-button>
@@ -270,7 +173,7 @@
         </template>
       </el-table-column>
       <el-table-column
-          show-overflow-tooltip="fase"
+          :show-overflow-tooltip=true
           label="描述"
           width="100">
         <template slot-scope="scope">
@@ -316,7 +219,7 @@
         </template>
       </el-table-column>
       <el-table-column
-          :show-overflow-tooltip="true"
+          :show-overflow-tooltip=false
           label="库位号"
           width="180">
         <template slot-scope="scope">
@@ -552,8 +455,61 @@ export default {
       pageNum: 1,
       total: 3,
       param: {
+        //盘点计划号
+         cp_code: '',
+
+        //盘点单点
+        count_code: '',
+
+        //料号
+       i_code: '',
+
+        //描述
+        i_name: '',
+
+        //库位号
+        lc_code: '',
+
+        //库区
+        z_name: [],
+
+        //工作站
+        targetArea: '',
+
+        //盘点人员
+        w_name: '',
+
+        //是否盘点
+        NEED_COUNT: '',
+
+        //是否差异
+        sfcy: '',
+
+        //任务下发日期
+        issued_Date: []
 
       },
+      Ku: [],
+      //是否盘点
+      pd: [
+        {
+          label:0,
+          values:"是",
+        },{
+          label:1,
+          values:"否",
+        }
+      ],
+      //是否批次号管理
+      xy: [
+        {
+          label:0,
+          values:"是",
+        },{
+          label:1,
+          values:"否",
+        }
+      ],
 
       loading: false,
       checked: false,
@@ -566,11 +522,6 @@ export default {
   mounted: function () {
     this.queryUser();
     this.KuS();
-    this.DjS();
-    this.GzS();
-    this.JhrS();
-    this.BjS();
-    this.XfS();
   },
   methods: {
 
@@ -608,113 +559,6 @@ export default {
             this.tableloding=false;
           })
     },
-    DjS(){
-
-      this.$axios.post(this.$httpUrl + '/Jianhuojiemian/dj', {
-
-      }).then(res => res.data)
-          .then(res => {
-            if (res.code == 200) {
-              this.Dj = res.data;
-            } else {
-              this.$message.error('获取数据失败');
-            }
-
-            // eslint-disable-next-line no-unused-vars
-          },err=>{
-            this.tableloding=false;
-          })
-    },
-    GzS(){
-
-      this.$axios.post(this.$httpUrl + '/Jianhuojiemian/gz', {
-
-      }).then(res => res.data)
-          .then(res => {
-            if (res.code == 200) {
-              this.Gz = res.data;
-            } else {
-              this.$message.error('获取数据失败');
-            }
-
-            // eslint-disable-next-line no-unused-vars
-          },err=>{
-            this.tableloding=false;
-          })
-    },
-    JhrS(){
-      this.$axios.post(this.$httpUrl + '/Jianhuojiemian/jhr', {
-      }).then(res => res.data)
-          .then(res => {
-            if (res.code == 200) {
-              this.Jhr = res.data;
-            } else {
-              this.$message.error('获取数据失败');
-            }
-
-            // eslint-disable-next-line no-unused-vars
-          },err=>{
-            this.tableloding=false;
-          })
-    },
-    remoteMethod(query) {
-
-      if (query !== '') {
-        if(query.length>2) {
-
-          this.$axios.post(this.$httpUrl + '/Jianhuojiemian/kw', {
-            query
-          }).then(res => res.data)
-              .then(res => {
-                if (res.code == 200) {
-                  this.Kw = res.data;
-                } else {
-                  this.$message.error('获取数据失败');
-                }
-
-                // eslint-disable-next-line no-unused-vars
-              }, err => {
-                this.tableloding = false;
-              })
-        }
-      } else {
-        this.Kw = [];
-      }
-    },
-    XfS(){
-      this.$axios.post(this.$httpUrl + '/Jianhuojiemian/xf', {
-
-      }).then(res => res.data)
-          .then(res => {
-            if (res.code == 200) {
-              this.Xf = res.data;
-            } else {
-              this.$message.error('获取数据失败');
-            }
-
-            // eslint-disable-next-line no-unused-vars
-          },err=>{
-            this.tableloding=false;
-          })
-    },
-    BjS(){
-
-      this.$axios.post(this.$httpUrl + '/Jianhuojiemian/bj', {
-
-      }).then(res => res.data)
-          .then(res => {
-            if (res.code == 200) {
-              this.Bj = res.data;
-            } else {
-              this.$message.error('获取数据失败');
-            }
-
-            // eslint-disable-next-line no-unused-vars
-          },err=>{
-            this.tableloding=false;
-          })
-    },
-
     queryUser() {
       //列表数据加载
       this.$axios.post(this.$httpUrl + '/Pandianmingxi/queryPan', {
@@ -724,6 +568,7 @@ export default {
       }).then(res => res.data)
           .then(res => {
             if (res.code == 200) {
+              console.log(res.data)
               this.tableData = res.data
               this.total = res.total
             } else {
diff --git a/wms-vue/src/components/duochaxun/Xuliehao.vue b/wms-vue/src/components/duochaxun/Xuliehao.vue
index 5f034f5..339c92f 100644
--- a/wms-vue/src/components/duochaxun/Xuliehao.vue
+++ b/wms-vue/src/components/duochaxun/Xuliehao.vue
@@ -6,23 +6,49 @@
       <el-form ref="form" :model="param" label-width="80px">
         <el-row :gutter="24">
           <el-col :span="4">
-            <el-form-item label="子任务号:">
-              <el-input type="textarea" v-model="param.BILLCODE" :rows="1"></el-input>
+            <el-form-item label="库位:">
+              <el-input type="textarea" v-model="param.lc_code" :rows="1"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="工单号:" >
-              <el-input  type="textarea" v-model="param.pt_code" :rows="1"></el-input>
+            <el-form-item label="序列号:" >
+              <el-input  type="textarea" v-model="param.BAR_CODE" :rows="1"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="SAP类型:">
-              <el-input type="text" v-model="param.sourceType" :rows="1"></el-input>
+            <el-form-item label="料号:">
+              <el-input type="textarea" v-model="param.i_code" :rows="1"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="物料描述:">
+              <el-input type="text" v-model="param.i_name"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="批次号:">
+              <el-input type="textarea" v-model="param.PROP_C1" :rows="1"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
-            <el-form-item label="拣货库区">
+            <el-form-item label="库存状态">
+              <el-select v-model="param.STATUS"  multiple filterable placeholder="请选择库区" style="width: 100%;">
+                <el-option
+                    v-for="item in Zt"
+                    :key="item.index"
+                    :label="item.STATUS"
+                    :value="item.STATUS"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24" v-show="isShow">
+          <el-col :span="4">
+            <el-form-item label="库区">
               <el-select v-model="param.z_name"  multiple filterable placeholder="请选择库区" style="width: 100%;">
                 <el-option
                     v-for="item in Ku"
@@ -36,146 +62,62 @@
           </el-col>
 
           <el-col :span="4">
-            <el-form-item label="所在库位:">
-              <el-input type="textarea" v-model="param.lc2_code" :rows="1"></el-input>
+            <el-form-item label="LOC">
+              <el-select v-model="param.PROP_C2"  multiple filterable placeholder="请选择库区" style="width: 100%;">
+                <el-option
+                    v-for="item in Loc"
+                    :key="item.ID"
+                    :label="item.PROP_C2"
+                    :value="item.PROP_C2"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
-            <el-form-item label="料号:">
-              <el-input type="textarea" v-model="param.i_code" :rows="1"></el-input>
+            <el-form-item label="工厂">
+              <el-select v-model="param.PROP_C9"  multiple filterable placeholder="请选择库区" style="width: 100%;">
+                <el-option
+                    v-for="item in Plant"
+                    :key="item.ID"
+                    :label="item.PROP_C9"
+                    :value="item.PROP_C9"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <el-form-item label="供应商代码:" label-width="50">
+              <el-input type="textarea" v-model="param.PROP_C5" :rows="1" style="width: 105px"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="存货日期:">
+              <el-date-picker style="width: 325px"
+                              v-model="param.STORAGE_DATE"
+                              type="daterange"
+                              align="right"
+                              unlink-panels
+                              range-separator="至"
+                              start-placeholder="开始日期"
+                              end-placeholder="结束日期"
+                              :picker-options="pickerOptions">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="24" v-show="isShow">
-          <el-col :span="4">
-            <el-form-item label="单据类型">
-              <el-select v-model="param.bt_name"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Dj"
-                    :key="item.index"
-                    :label="item.name"
-                    :value="item.name"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
 
           <el-col :span="4">
-            <el-form-item label="工作站">
-              <el-select v-model="param.END_REGION"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Gz"
-                    :key="item.index"
-                    :label="item.END_REGION"
-                    :value="item.END_REGION"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="拣货人">
-              <el-select v-model="param.w4_name"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Jhr"
-                    :key="item.index"
-                    :label="item.name"
-                    :value="item.name"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="波次号:">
-              <el-input type="text" v-model="param.wd_code"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="容器码:">
-              <el-input type="text" v-model="param.LP"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="拣货库位">
-              <el-select
-                  v-model="param.lc1_code"
-                  multiple
-                  filterable
-                  remote
-                  reserve-keyword
-                  placeholder="请输入关键词"
-                  :remote-method="remoteMethod"
-                  :loading="loading">
-                <el-option
-                    v-for="item in Kw"
-                    :key="item.index"
-                    :label="item.CODE"
-                    :value="item.CODE">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" v-show="isShow">
-          <el-col :span="8">
-            <el-form-item label="需求日期:">
-              <el-date-picker style="width: 325px"
-                              v-model="param.ORDER_DATE"
-                              type="daterange"
-                              align="right"
-                              unlink-panels
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              :picker-options="pickerOptions">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="分配日期:">
-              <el-date-picker style="width: 325px"
-                              v-model="param.CREATE_TIME"
-                              type="daterange"
-                              align="right"
-                              unlink-panels
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              :picker-options="pickerOptions">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="拣货日期:">
-              <el-date-picker style="width: 325px"
-                              v-model="param.OPERATE_TIME"
-                              type="daterange"
-                              align="right"
-                              unlink-panels
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              :picker-options="pickerOptions">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="拣货状态:">
+            <el-form-item label="是否批次号管理:">
               <el-select v-model="param.Status"  placeholder="请选择" style="width: 100%;">
                 <el-option
-                    v-for="item in Zt"
+                    v-for="item in pc"
                     :key="item.label"
                     :label="item.values"
                     :value="item.label"
@@ -186,27 +128,13 @@
           </el-col>
 
           <el-col :span="4">
-            <el-form-item label="加急标记">
-              <el-select v-model="param.equated_Quantity"   placeholder="请选择库区" style="width: 100%;">
+            <el-form-item label="盘点是否锁定:">
+              <el-select v-model="param.sfpd"  placeholder="请选择" style="width: 100%;">
                 <el-option
-                    v-for="item in Bj"
-                    :key="item.index"
-                    :label="item.equated_Quantity"
-                    :value="item.equated_Quantity"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item label="下发人">
-              <el-select v-model="param.strBill1"  multiple filterable placeholder="请选择库区" style="width: 100%;">
-                <el-option
-                    v-for="item in Xf"
-                    :key="item.index"
-                    :label="item.strBill1"
-                    :value="item.strBill1"
+                    v-for="item in pd"
+                    :key="item.label"
+                    :label="item.values"
+                    :value="item.label"
                 >
                 </el-option>
               </el-select>
@@ -270,7 +198,7 @@
         </template>
       </el-table-column>
       <el-table-column
-          show-overflow-tooltip="fase"
+          :show-overflow-tooltip=true
           label="描述"
           width="100">
         <template slot-scope="scope">
@@ -373,7 +301,7 @@
       </el-table-column>
 
       <el-table-column
-          label="到期日"
+          label="库区"
           width="100">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
@@ -384,10 +312,10 @@
 
       <el-table-column
           label="存货日期"
-          width="100">
+          width="210">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.STORAGE_DATE }}</span>
+            <span>{{new Date(scope.row.STORAGE_DATE).toISOString().replace('T','')}}</span>
           </div>
         </template>
       </el-table-column>
@@ -454,9 +382,73 @@ export default {
       pageNum: 1,
       total: 3,
       param: {
+        //库位
+        lc_code: '',
+
+        //序列号
+        BAR_CODE: '',
+
+        //料号
+        i_code: '',
+
+        //物料描述
+        i_name: '',
+
+        //批次号
+        PROP_C1: '',
+
+        //库存状态
+        STATUS: [],
+
+        //库区
+        z_name: [],
+
+        //LOC
+        PROP_C2: [],
+
+        //特殊标记
+        PROP_C3: '',
+
+        //工厂
+        PROP_C9: [],
+
+        //供应商代码
+       PROP_C5: '',
+
+        //是否批次号管理
+        //public String ;
+
+        //存货日期
+        STORAGE_DATE: [],
+
+        //盘点是否锁定
+        sfpd: '',
 
       },
-
+      //是否盘点
+      pd: [
+        {
+          label:0,
+          values:"否",
+        },{
+          label:1,
+          values:"是",
+        }
+      ],
+      //是否批次号管理
+      pc: [
+        {
+          label:0,
+          values:"否",
+        },{
+          label:1,
+          values:"是",
+        }
+      ],
+      Ku: [],
+      Loc: [],
+      Plant: [],
+      Zt: [],
       loading: false,
       checked: false,
     }
@@ -468,11 +460,10 @@ export default {
   mounted: function () {
     this.queryUser();
     this.KuS();
-    this.DjS();
-    this.GzS();
-    this.JhrS();
-    this.BjS();
-    this.XfS();
+    this.PlantS();
+    this.LocS();
+    this.ZtS();
+
   },
   methods: {
 
@@ -493,7 +484,72 @@ export default {
       this.pageNum = val;
       this.queryUser();
     },
+    ZtS(){
+      //状态下拉列表数据加载
+      this.$axios.post(this.$httpUrl + '/Kucunhuizong/zt', {
 
+      }).then(res => res.data)
+          .then(res => {
+            if (res.code == 200) {
+              this.Zt = res.data;
+            } else {
+              this.$message.error('获取数据失败');
+            }
+
+            // eslint-disable-next-line no-unused-vars
+          },err=>{
+            this.tableloding=false;
+          })
+    },
+    KuS(){
+      //库区下拉列表数据加载
+      this.$axios.post(this.$httpUrl + '/Kucunhuizong/ku', {
+
+      }).then(res => res.data)
+          .then(res => {
+            if (res.code == 200) {
+              this.Ku = res.data;
+            } else {
+              this.$message.error('获取数据失败');
+            }
+
+            // eslint-disable-next-line no-unused-vars
+          },err=>{
+            this.tableloding=false;
+          })
+    },
+    PlantS(){
+      //下拉数据架子啊
+      this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZPlant', {
+      }).then(res => res.data)
+          .then(res => {
+            if (res.code == 200) {
+              console.log(res.data)
+              this.Plant = res.data
+            } else {
+              this.$message.error('获取数据失败');
+            }
+          })
+          .catch(function (err) {
+            console.log(err);
+          })
+    },
+    LocS(){
+      //下拉数据架子啊
+      this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZLOC', {
+      }).then(res => res.data)
+          .then(res => {
+            if (res.code == 200) {
+              console.log(res.data)
+              this.Loc = res.data
+            } else {
+              this.$message.error('获取数据失败');
+            }
+            // eslint-disable-next-line no-unused-vars
+          },err =>{
+            this.tableloding=false
+          })
+    },
     queryUser() {
       //列表数据加载
       this.$axios.post(this.$httpUrl + '/Xuliehaoqingdan/queryXu', {
diff --git a/wms/src/main/java/com/yc/wms/bean/Pandianming.java b/wms/src/main/java/com/yc/wms/bean/Pandianming.java
index 332f5f8..d3e41a7 100644
--- a/wms/src/main/java/com/yc/wms/bean/Pandianming.java
+++ b/wms/src/main/java/com/yc/wms/bean/Pandianming.java
@@ -1,6 +1,40 @@
 package com.yc.wms.bean;
 
+import java.util.Date;
+
 public class Pandianming {
-    //
-    public String code;
+
+    //盘点计划号
+    public String cp_code;
+
+    //盘点单号
+    public String count_code;
+
+    //料号
+    public String i_code;
+
+    //描述
+    public String i_name;
+
+    //库位号
+    public String lc_code;
+
+    //库区
+    public String[] z_name;
+
+    //工作站
+    public String targetArea;
+
+    //盘点人员
+    public String w_name;
+
+    //是否盘点
+    public String NEED_COUNT;
+
+    //是否差异
+    public String sfcy;
+
+    //任务下发日期
+    public Date[] issued_Date;
+
 }
diff --git a/wms/src/main/java/com/yc/wms/bean/Xuliehao.java b/wms/src/main/java/com/yc/wms/bean/Xuliehao.java
index 1c8ff45..95b992d 100644
--- a/wms/src/main/java/com/yc/wms/bean/Xuliehao.java
+++ b/wms/src/main/java/com/yc/wms/bean/Xuliehao.java
@@ -1,5 +1,49 @@
 package com.yc.wms.bean;
 
+import java.security.PublicKey;
+import java.util.Date;
+
 public class Xuliehao {
-    public String code;
+    //库位
+    public String lc_code;
+
+    //序列号
+    public String BAR_CODE;
+
+    //料号
+    public String i_code;
+
+    //物料描述
+    public String i_name;
+
+    //批次号
+    public String PROP_C1;
+
+    //库存状态
+    public String[] STATUS;
+
+    //库区
+    public String[] z_name;
+
+    //LOC
+    public String[] PROP_C2;
+
+    //特殊标记
+    public String PROP_C3;
+
+    //工厂
+    public String[] PROP_C9;
+
+    //供应商代码
+    public String PROP_C5;
+
+    //是否批次号管理
+    public String sfpc;
+
+    //存货日期
+    public Date[] STORAGE_DATE;
+
+    //盘点是否锁定
+    public String sfpd;
+
 }
diff --git a/wms/src/main/java/com/yc/wms/service/impl/PandianmingxiImpl.java b/wms/src/main/java/com/yc/wms/service/impl/PandianmingxiImpl.java
index af3cd20..19928e6 100644
--- a/wms/src/main/java/com/yc/wms/service/impl/PandianmingxiImpl.java
+++ b/wms/src/main/java/com/yc/wms/service/impl/PandianmingxiImpl.java
@@ -25,6 +25,7 @@ public class PandianmingxiImpl implements Pandianmingxi {
     @Override
     public Result QueryJson(QueryPageUtil query, Pandianming pandianming) {
 
+
         int pageNum = query.getPageNum();//当前页
         int pageSize = query.getPageSize();//条数
 
@@ -49,16 +50,156 @@ public class PandianmingxiImpl implements Pandianmingxi {
                 " left join item i on i.id=ik.ITEM_ID\n" +
                 " where cr.count_Code is not NULL ";
 
+        //盘点计划号
+        if(pandianming.cp_code!=null){
+            if(!pandianming.cp_code.trim().equals("")){
+                sql+=" and cp.CODE="+"'"+pandianming.cp_code.trim()+"'";
+            }
+        }
+
+        //盘点单号
+        if(pandianming.count_code!=null){
+            if(!pandianming.count_code.trim().equals("")){
+                String[] str=pandianming.count_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]+"'"+",");
+                    }
+                }
+                sql+=" and cr.count_Code in ("+sb.toString()+")";
+            }
+        }
+
+        //料号
+        if(pandianming.i_code!=null){
+            if(!pandianming.i_code.trim().equals("")){
+                String[] str=pandianming.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]+"'"+",");
+                    }
+                }
+                sql+=" and i.code in ("+sb.toString()+")";
+            }
+        }
+
+        //物料描述
+        if(pandianming.i_name!=null){
+            if(!pandianming.i_name.trim().equals("")){
+                sql+=" and i.NAME like "+"'%"+pandianming.i_name.trim()+"%'";
+            }
+        }
+
+        //库位号
+        if(pandianming.lc_code!=null){
+            if(!pandianming.lc_code.trim().equals("")){
+                String[] str=pandianming.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]+"'"+",");
+                    }
+                }
+                sql+=" and lc.code in ("+sb.toString()+")";
+            }
+        }
+
+        //库区
+        if(pandianming.z_name!=null&& pandianming.z_name.length>0){
+
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i< pandianming.z_name.length; i++){
+                if(pandianming.z_name.length-1==i){
+                    sb.append("'"+ pandianming.z_name[i]+"'");
+                }else {
+                    sb.append("'"+ pandianming.z_name[i]+"'"+",");
+                }
+            }
+            sql+=" and z.NAME in ("+sb.toString()+")";;
+        }
+
+        //工作站
+        if(pandianming.targetArea!=null){
+            if(!pandianming.targetArea.trim().equals("")){
+                String[] str=pandianming.targetArea.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]+"'"+",");
+                    }
+                }
+                sql+=" and cr.targetArea in ("+sb.toString()+")";
+            }
+        }
+
+        //盘点人员
+        if(pandianming.w_name!=null){
+            if(!pandianming.w_name.trim().equals("")){
+                String[] str=pandianming.w_name.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]+"'"+",");
+                    }
+                }
+                sql+=" and w.NAME in ("+sb.toString()+")";
+            }
+        }
+
+        //是否盘点
+        if(pandianming.NEED_COUNT!=null&& !pandianming.NEED_COUNT.equals("")){
+            if (Integer.parseInt(pandianming.NEED_COUNT)==0) {
+                sql+=" and cr.NEED_COUNT =1";
+            }else {
+                sql+=" and cr.NEED_COUNT =0";
+            }
+        }
+
+        //是否差异
+        if(pandianming.sfcy!=null&& !pandianming.sfcy.equals("")){
+            if (Integer.parseInt(pandianming.sfcy)==0) {
+                sql+=" and cr.DELTA_QUANTITY =1";
+            }else {
+                sql+=" and cr.DELTA_QUANTITY  =0";
+            }
+        }
+
+        //任务下发日期
+        if(pandianming.issued_Date!=null&&pandianming.issued_Date.length>0){
+            String startDate = simpleDateFormat.format(pandianming.issued_Date[0]);
+            String endDate = simpleDateFormat.format(pandianming.issued_Date[1]);
+            sql+=" and cr.issued_Date "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
+        }
+
 
         String sqlCount = "select count(t.id) as nums from (" + sql+") t";
         String sqlFy = "select t.* from(" + sql+") t";
 
         sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;
 
+
         //查询单数据
         Map<String,Object> listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>());
         //查询多条数据据
         List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>());
+
         return  Result.success(Long.parseLong(listCount.get("nums").toString()),maps);
     }
 }
diff --git a/wms/src/main/java/com/yc/wms/service/impl/XuliehaoqingdanImpl.java b/wms/src/main/java/com/yc/wms/service/impl/XuliehaoqingdanImpl.java
index 664030e..7fae7a6 100644
--- a/wms/src/main/java/com/yc/wms/service/impl/XuliehaoqingdanImpl.java
+++ b/wms/src/main/java/com/yc/wms/service/impl/XuliehaoqingdanImpl.java
@@ -44,6 +44,184 @@ public class XuliehaoqingdanImpl implements Xuliehaoqingdan {
                 " and i.BE_MARK_WEIGHT=1";
 
 
+        //库位
+        if(xuliehao.lc_code!=null){
+            if(!xuliehao.lc_code.trim().equals("")){
+                String[] str=xuliehao.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]+"'"+",");
+                    }
+                }
+                sql+=" and lc.CODE in ("+sb.toString()+")";
+            }
+        }
+
+        //序列号
+        if(xuliehao.BAR_CODE!=null){
+            if(!xuliehao.BAR_CODE.trim().equals("")){
+                String[] str=xuliehao.BAR_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]+"'"+",");
+                    }
+                }
+                sql+=" and inv.BAR_CODE in ("+sb.toString()+")";
+            }
+        }
+
+        //料号
+        if(xuliehao.i_code!=null){
+            if(!xuliehao.i_code.trim().equals("")){
+                String[] str=xuliehao.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]+"'"+",");
+                    }
+                }
+                sql+=" and i_code in ("+sb.toString()+")";
+            }
+        }
+
+        //物料描述
+        if(xuliehao.i_name!=null){
+            if(!xuliehao.i_name.trim().equals("")){
+                sql+=" and i.NAME like "+"'%"+xuliehao.i_name.trim()+"%'";
+            }
+        }
+
+        //批次号
+        if(xuliehao.PROP_C1!=null){
+            if(!xuliehao.PROP_C1.trim().equals("")){
+                String[] str=xuliehao.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]+"'"+",");
+                    }
+                }
+                sql+=" and ik.PROP_C1 in ("+sb.toString()+")";
+            }
+        }
+
+
+        //库存状态
+        if(xuliehao.STATUS!=null&& xuliehao.STATUS.length>0){
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i< xuliehao.STATUS.length; i++){
+                if(xuliehao.STATUS.length-1==i){
+                    sb.append("'"+ xuliehao.STATUS[i]+"'");
+                }else {
+                    sb.append("'"+ xuliehao.STATUS[i]+"'"+",");
+                }
+            }
+            sql+=" and z.NAME in ("+sb.toString()+")";;
+        }
+
+        //库区
+        if(xuliehao.z_name!=null&& xuliehao.z_name.length>0){
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i< xuliehao.z_name.length; i++){
+                if(xuliehao.z_name.length-1==i){
+                    sb.append("'"+ xuliehao.z_name[i]+"'");
+                }else {
+                    sb.append("'"+ xuliehao.z_name[i]+"'"+",");
+                }
+            }
+            sql+=" and z.NAME in ("+sb.toString()+")";;
+        }
+
+        //LOC
+        if(xuliehao.PROP_C2!=null&& xuliehao.PROP_C2.length>0){
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i< xuliehao.PROP_C2.length; i++){
+                if(xuliehao.PROP_C2.length-1==i){
+                    sb.append("'"+ xuliehao.z_name[i]+"'");
+                }else {
+                    sb.append("'"+ xuliehao.z_name[i]+"'"+",");
+                }
+            }
+            sql+=" and ik.PROP_C2 in ("+sb.toString()+")";;
+        }
+
+        //特殊标记
+        if(xuliehao.PROP_C3!=null){
+            if(!xuliehao.PROP_C3.trim().equals("")){
+                sql+=" and ik.PROP_C3 ="+"'"+xuliehao.PROP_C3.trim()+"'";
+            }
+        }
+
+        //工厂
+        if(xuliehao.PROP_C9!=null&& xuliehao.PROP_C9.length>0){
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i< xuliehao.PROP_C9.length; i++){
+                if(xuliehao.PROP_C9.length-1==i){
+                    sb.append("'"+ xuliehao.z_name[i]+"'");
+                }else {
+                    sb.append("'"+ xuliehao.z_name[i]+"'"+",");
+                }
+            }
+            sql+=" and ik.PROP_C9 in ("+sb.toString()+")";;
+        }
+
+        //供应商代码
+        if(xuliehao.PROP_C5!=null){
+            if(!xuliehao.PROP_C5.trim().equals("")){
+                String[] str=xuliehao.PROP_C5.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]+"'"+",");
+                    }
+                }
+                sql+=" and ik.PROP_C5 in ("+sb.toString()+")";
+            }
+        }
+
+        //是否盘点
+        if(xuliehao.sfpd!=null&& !xuliehao.sfpd.equals("")){
+            if (Integer.parseInt(xuliehao.sfpd)==1) {
+                sql+=" and inv.coun_Plan is null";
+            }else {
+                sql+=" and inv.coun_Plan is not null";
+            }
+        }
+
+        //是否批次号管理
+        if(xuliehao.sfpc!=null&& !xuliehao.sfpc.equals("")){
+
+            if (Integer.parseInt(xuliehao.sfpc)==1) {
+                sql+=" and ik.PROP_C1 is null";
+            }else {
+                sql+=" and ik.PROP_C1 is not null";
+            }
+        }
+
+        //存货日期
+        if(xuliehao.STORAGE_DATE!=null&&xuliehao.STORAGE_DATE.length>0){
+            String startDate = simpleDateFormat.format(xuliehao.STORAGE_DATE[0]);
+            String endDate = simpleDateFormat.format(xuliehao.STORAGE_DATE[1]);
+            sql+=" and inv.STORAGE_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
+        }
+
 
         String sqlCount = "select count(t.id) as nums from (" + sql+") t";
         String sqlFy = "select t.* from(" + sql+") t";