diff --git a/wms-vue/src/components/Aside.vue b/wms-vue/src/components/Aside.vue
index c6656e7..24bd79f 100644
--- a/wms-vue/src/components/Aside.vue
+++ b/wms-vue/src/components/Aside.vue
@@ -44,7 +44,7 @@ export default {
             if (res.code == 200) {
               //存储
               sessionStorage.setItem("user", JSON.stringify(res.data.user))
-              console.log(res.data.menu)
+             // console.log(res.data.menu)
               this.$store.commit("setMenu",res.data.menu)
               //跳转页面
               this.$router.push('/index')
diff --git a/wms-vue/src/components/Login.vue b/wms-vue/src/components/Login.vue
index e411323..983fd6d 100644
--- a/wms-vue/src/components/Login.vue
+++ b/wms-vue/src/components/Login.vue
@@ -51,7 +51,7 @@ export default {
             if (res.code == 200) {
               //存储
               sessionStorage.setItem("user", JSON.stringify(res.data.user))
-              console.log(res.data.menu)
+              //console.log(res.data.menu)
               this.$store.commit("setMenu",res.data.menu)
               //跳转页面
               this.$router.push('/index')
diff --git a/wms-vue/src/components/duochaxun/Jianhuojiemian.vue b/wms-vue/src/components/duochaxun/Jianhuojiemian.vue
index 8f3ba1e..ed6ed62 100644
--- a/wms-vue/src/components/duochaxun/Jianhuojiemian.vue
+++ b/wms-vue/src/components/duochaxun/Jianhuojiemian.vue
@@ -271,7 +271,7 @@
       </el-table-column>
       <el-table-column
           label="工作站"
-          width="50">
+          width="60">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
             <span>{{ scope.row.END_REGION }}</span>
@@ -452,7 +452,7 @@
       </el-table-column>
       <el-table-column
           label="特殊标记"
-          width="60">
+          width="80">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
             <span>{{ scope.row.PROP_C3 }}</span>
@@ -505,7 +505,7 @@
     </el-table-column>
       <el-table-column
           label="加急标记"
-          width="60">
+          width="80">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
             <span>{{ scope.row.equated_Quantity }}</span>
diff --git a/wms-vue/src/components/duochaxun/Kucunhuizong.vue b/wms-vue/src/components/duochaxun/Kucunhuizong.vue
index 1c11145..07ec3d6 100644
--- a/wms-vue/src/components/duochaxun/Kucunhuizong.vue
+++ b/wms-vue/src/components/duochaxun/Kucunhuizong.vue
@@ -220,15 +220,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="序列号"
-          width="100">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.barCode }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="序列号"-->
+<!--          width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.barCode }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="状态"
           width="80">
@@ -238,24 +238,24 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="库位ID"
-          width="100">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.LOCATION_ID }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-          label="料号属性ID"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.ITEM_KEY_ID }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="库位ID"-->
+<!--          width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.LOCATION_ID }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--          label="料号属性ID"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.ITEM_KEY_ID }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="库存数量"
           width="100">
@@ -356,15 +356,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="入库单号"
-          width="160">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.soi }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="入库单号"-->
+<!--          width="160">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.soi }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="生产日期"
           width="180">
@@ -392,15 +392,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="库区ID"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.ZONE_ID }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="库区ID"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.ZONE_ID }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="是否盘点"
           width="80">
@@ -419,15 +419,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="是否SAP料号"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.Be_SAP_Item==1?"是":"否"}}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="是否SAP料号"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.Be_SAP_Item==1?"是":"否"}}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="体积"
           width="80">
@@ -453,15 +453,16 @@
             <span>{{ scope.row.SHIP_RULES }}</span>
           </div>
         </template>
-      </el-table-column><el-table-column
-        label="OA料号"
-        width="80">
-      <template slot-scope="scope">
-        <div slot="reference" class="name-wrapper">
-          <span>{{ scope.row.FEE_TYPE }}</span>
-        </div>
-      </template>
-    </el-table-column>
+     </el-table-column>
+<!--  <el-table-column-->
+<!--        label="OA料号"-->
+<!--        width="80">-->
+<!--      <template slot-scope="scope">-->
+<!--        <div slot="reference" class="name-wrapper">-->
+<!--          <span>{{ scope.row.FEE_TYPE }}</span>-->
+<!--        </div>-->
+<!--      </template>-->
+<!--    </el-table-column>-->
       <el-table-column
           label="是否批号管理"
           width="80">
@@ -507,24 +508,24 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="标准价"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.STR_EXTEND3 }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-          label="库存单位"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.STR_EXTEND4 }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="标准价"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.STR_EXTEND3 }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--          label="库存单位"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.STR_EXTEND4 }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="是否在GAV仓"
           width="80">
@@ -534,15 +535,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="库位id"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.locId }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="库位id"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.locId }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="库位类型"
           width="80">
@@ -568,15 +569,16 @@
             <span>{{ new Date(scope.row.storageDate).toISOString().replace('T','').substring(0,10)}}</span>
           </div>
         </template>
-      </el-table-column> <el-table-column
-        label="工作站"
-        width="80">
-      <template slot-scope="scope">
-        <div slot="reference" class="name-wrapper">
-          <span>{{ scope.row.moveStatus }}</span>
-        </div>
-      </template>
-    </el-table-column>
+      </el-table-column>
+<!--      <el-table-column-->
+<!--        label="工作站"-->
+<!--        width="80">-->
+<!--      <template slot-scope="scope">-->
+<!--        <div slot="reference" class="name-wrapper">-->
+<!--          <span>{{ scope.row.moveStatus }}</span>-->
+<!--        </div>-->
+<!--      </template>-->
+<!--    </el-table-column>-->
       <el-table-column
           label="退料标记"
           width="80">
diff --git a/wms-vue/src/components/duochaxun/Kucunrizhi.vue b/wms-vue/src/components/duochaxun/Kucunrizhi.vue
index fcbe98f..9fa7ab6 100644
--- a/wms-vue/src/components/duochaxun/Kucunrizhi.vue
+++ b/wms-vue/src/components/duochaxun/Kucunrizhi.vue
@@ -234,13 +234,22 @@
       </el-table-column>
       <el-table-column
           label="发生日期"
-          width="180">
+          width="100">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
             <span>{{ scope.row.OCCUR_TIME!=null?new Date(scope.row.OCCUR_TIME).toISOString().replace('T','').substring(0,10):scope.row.OCCUR_TIME}}</span>
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+          label="发生时间"
+          width="100">
+        <template slot-scope="scope">
+          <div slot="reference" class="name-wrapper">
+            <span>{{ scope.row.OCCUR_TIME!=null?new Date(scope.row.OCCUR_TIME).toISOString().replace('T','').substring(10,18):scope.row.OCCUR_TIME}}</span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
           :show-overflow-tooltip="true"
           label="备注"
diff --git a/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue b/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
index e8e311b..f91bb73 100644
--- a/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
+++ b/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
@@ -33,19 +33,19 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="4">
-            <el-form-item  label="状态:" >
-              <el-select v-model="param.s_status" multiple filterable placeholder="请选择状态"  >
-                <el-option
-                    v-for="item in Sstatus"
-                    :key="item.label"
-                    :label="item.values"
-                    :value="item.values"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="4">-->
+<!--            <el-form-item  label="状态:" >-->
+<!--              <el-select v-model="param.s_status" multiple filterable placeholder="请选择状态"  >-->
+<!--                <el-option-->
+<!--                    v-for="item in Sstatus"-->
+<!--                    :key="item.label"-->
+<!--                    :label="item.values"-->
+<!--                    :value="item.values"-->
+<!--                >-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
         </el-row>
 
@@ -55,8 +55,7 @@
     </div>
 
     <el-table
-        :summary-method="getSummaries"
-        show-summary
+        border
         v-loading="this.tableloding"
         :height="MaxHeight"
         :header-cell-style="{background:'#000',color:'#fff'}"
@@ -72,13 +71,14 @@
           fixed
           label="序号"
           v-if="false"
-          width="180">
+          width="80">
         <template slot-scope="scope">
           <span style="margin-left: 10px">{{ scope.row.code }}</span>
         </template>
       </el-table-column>
       <el-table-column
-          label="类型"
+          label=""
+          width="100"
           >
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
@@ -88,36 +88,56 @@
       </el-table-column>
 
       <el-table-column
-          label="状态"
+          label="总数"
+          width="100"
           >
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.STATUS}}</span>
+            <span>{{ scope.row.zs}}</span>
           </div>
         </template>
       </el-table-column>
 
       <el-table-column
-          label="是否在AGV库"
+          width="100"
+          label="满不在库"
           >
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.agvFlag==1?'是':'否'}}</span>
+            <span>{{ scope.row.mbzk}}</span>
           </div>
         </template>
       </el-table-column>
       <el-table-column
-          label="箱子数"
+          label="满在库"
+          width="100"
           >
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.shu}}</span>
+            <span>{{ scope.row.mzk}}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="空不在库"
+          width="100"
+      >
+        <template slot-scope="scope">
+          <div slot="reference" class="name-wrapper">
+            <span>{{ scope.row.kbzk}}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="空在库"
+          width="100"
+      >
+        <template slot-scope="scope">
+          <div slot="reference" class="name-wrapper">
+            <span>{{ scope.row.kzk}}</span>
           </div>
         </template>
       </el-table-column>
-
-
-
 
     </el-table>
     <el-pagination
@@ -140,6 +160,7 @@ export default {
       tableloding: false,
       isShow:false,//是否展示全部搜索条件
       tableData: [],
+
       pageSize: 50,
       pageNum: 1,
       total: 3,
@@ -214,41 +235,41 @@ export default {
   },
   methods: {
     // 求和操作
-    getSummaries(param) {
-      //解构赋值
-      //columns:所有列的集合
-      //data:你的原始数据  [{id:1,num:1,price:20},{id:2,num:1,price:20},{id:3,num:1,price:20}]
-      const {
-        columns,
-        data
-      } = param;
-      //准备一个空的结果数组,用来存放每一列的和
-      const sums = [];
-
-      columns.forEach((column, index) => {
-
-        //金额的计算   data里的num字段和price相乘
-        if (index == 4) {
-          sums[index]="汇总:"
-          const values = data.map(item => Number(item['shu']));
-           sums[index] += values.reduce((prev, curr) => {
-           const value = Number(curr);
-           //确定数据是否为空,不为空进行计算,为空返回原值
-           if (!isNaN(value)) {
-             return prev + curr;
-           } else {
-             return prev;
-           }
-          },0)
-
-        }
-        else {
-          sums[index] = '';
-        }
-      });
-
-      return sums;
-    },
+    // getSummaries(param) {
+    //   //解构赋值
+    //   //columns:所有列的集合
+    //   //data:你的原始数据  [{id:1,num:1,price:20},{id:2,num:1,price:20},{id:3,num:1,price:20}]
+    //   const {
+    //     columns,
+    //     data
+    //   } = param;
+    //   //准备一个空的结果数组,用来存放每一列的和
+    //   const sums = [];
+    //
+    //   columns.forEach((column, index) => {
+    //
+    //     //金额的计算   data里的num字段和price相乘
+    //     if (index == 4) {
+    //       sums[index]="汇总:"
+    //       const values = data.map(item => Number(item['shu']));
+    //        sums[index] += values.reduce((prev, curr) => {
+    //        const value = Number(curr);
+    //        //确定数据是否为空,不为空进行计算,为空返回原值
+    //        if (!isNaN(value)) {
+    //          return prev + curr;
+    //        } else {
+    //          return prev;
+    //        }
+    //       },0)
+    //
+    //     }
+    //     else {
+    //       sums[index] = '';
+    //     }
+    //   });
+    //
+    //   return sums;
+    // },
     handleEdit(index, row) {
       console.log(index, row);
     },
@@ -293,6 +314,7 @@ export default {
             if (res.code == 200) {
               this.tableData = res.data
               this.total = res.total
+              //console.log(res.data)
             } else {
               this.$message.error('获取数据失败');
             }
diff --git a/wms-vue/src/components/duochaxun/Rukuzhengli.vue b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
index 6903e4e..587b440 100644
--- a/wms-vue/src/components/duochaxun/Rukuzhengli.vue
+++ b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
@@ -249,15 +249,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="区域"
-          width="80">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.PROP_C8 }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="区域"-->
+<!--          width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.PROP_C8 }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="工厂"
           width="80">
@@ -382,7 +382,7 @@
           width="80">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.BE_QUALITY }}</span>
+            <span>{{ scope.row.BE_QUALITY==0?'否':'是' }}</span>
           </div>
         </template>
       </el-table-column>
diff --git a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
index cdb87e4..c6fbb85 100644
--- a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
+++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
@@ -320,6 +320,15 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+          label="收货时间"
+          width="100">
+        <template slot-scope="scope">
+          <div slot="reference" class="name-wrapper">
+            <span>{{new Date(scope.row.ORDER_DATE).toISOString().replace('T','').substring(10,18) }}</span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
           label="整理日期"
           width="100">
@@ -329,6 +338,15 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+          label="整理时间"
+          width="100">
+        <template slot-scope="scope">
+          <div slot="reference" class="name-wrapper">
+            <span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(10,18) }}</span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="整理人"
         width="60">
@@ -392,15 +410,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-          label="区域"
-          width="100">
-        <template slot-scope="scope">
-          <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.PROP_C8 }}</span>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          label="区域"-->
+<!--          width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div slot="reference" class="name-wrapper">-->
+<!--            <span>{{ scope.row.PROP_C8 }}</span>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
           label="工厂"
           width="80">
diff --git a/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java b/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java
index 309973f..f6917b8 100644
--- a/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java
+++ b/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java
@@ -29,10 +29,19 @@ public class LiaoxiangjiankongImpl implements com.yc.wms.service.Liaoxiangjianko
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        String sql="select Row_number() OVER(ORDER BY ct.code) as Row_Num,ct.code,s.STATUS,s.agvFlag,count(s.LP) shu\n" +
-                "from stock s\n" +
-                "left join containerType ct on  ct.id= s.containerType\n" +
-                "where 1=1 and s.LP like 'X%'";
+        String sql="SELECT\n" +
+                "    ct.code,\n" +
+                "    SUM(CASE WHEN s.STATUS = 'OCCUPY'  OR s.STATUS = 'FREE'  THEN 1 ELSE 0 END) AS zs,\n" +
+                "\t\tSUM(CASE WHEN s.STATUS = 'OCCUPY' AND s.agvFlag = 0 THEN 1 ELSE 0 END) AS mbzk,\n" +
+                "    SUM(CASE WHEN s.STATUS = 'OCCUPY' AND s.agvFlag = 1 THEN 1 ELSE 0 END) AS mzk,\n" +
+                "\t\tSUM(CASE WHEN s.STATUS = 'FREE' AND s.agvFlag = 0 THEN 1 ELSE 0 END) AS kbzk,\n" +
+                "    SUM(CASE WHEN s.STATUS = 'FREE' AND s.agvFlag = 1 THEN 1 ELSE 0 END) AS kzk\n" +
+                "FROM\n" +
+                "    stock s\n" +
+                "LEFT JOIN containerType ct ON ct.id = s.containerType\n" +
+                "WHERE\n" +
+                "    s.LP LIKE 'X%'\n" +
+                "    AND ct.code != 'XN'";
 
 
         //类型
@@ -67,16 +76,16 @@ public class LiaoxiangjiankongImpl implements com.yc.wms.service.Liaoxiangjianko
 
         }
 
-        String sqlCount = "select count(t.code) as nums from(" + sql+"\n GROUP BY ct.code,s.STATUS,s.agvFlag \n"+
-        ") t";
-        String sqlFy = "select t.* from(" + sql+"GROUP BY ct.code,s.STATUS,s.agvFlag \n" +
-                ") t";
-        sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;
+        String sqlCount = "select count(t.code) as nums from (" + sql+"\n GROUP BY ct.code\n" + ") t";
+        String sqlFy =  sql+"GROUP BY ct.code\n " +
+                                "ORDER BY ct.code";
+
+        sqlFy+= " OFFSET "+(pageNum-1) * pageSize+ " ROWS FETCH NEXT "+(pageNum) * pageSize +" ROWS ONLY";
+
         //查询单数据
         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);
     }