diff --git a/wms/src/main/java/com/yc/wms/controller/GGZXiaoLvController.java b/wms/src/main/java/com/yc/wms/controller/GGZXiaoLvController.java
index 4c45d01..5894efe 100644
--- a/wms/src/main/java/com/yc/wms/controller/GGZXiaoLvController.java
+++ b/wms/src/main/java/com/yc/wms/controller/GGZXiaoLvController.java
@@ -48,7 +48,8 @@ public class GGZXiaoLvController {
         }
         /* 基础sql数据查询*/
         String sql=" select  Row_number() OVER(order by v.库区,v.工作站 asc) as id,v.库区, "
-                +"  v.工作站,sum(v.有效时效) '有效时效', v.业务类型 ,sum(v.有效时效)/540 '有效时间占比' from ( "
+                +"  v.工作站,sum(v.有效时效) '有效时效', v.业务类型 ,sum(v.有效时效)/540 '有效时间占比' ," +
+                " count(DISTINCT(v.任务号)) 任务数 from ( "
                 +"  select (case when left(agv.targetArea,1)='1' then '货架到人' when left(agv.targetArea,1)='2' then '料箱到人' end) as '库区', "
                 +"  (agv.id) ID,(agv.robotJobId) as '任务号',left(agv.targetArea,3) as '工作站',(agv.status) as '状态', "
                 +" (CONVERT(VARCHAR,agv.createTime , 23)) as '创建时间', "
@@ -59,7 +60,8 @@ public class GGZXiaoLvController {
                 +"  from agvtask agv "
                 +"  where   CONVERT(VARCHAR,agv.createTime , 23)>='"+startDate+"'  "
                 +"  and CONVERT(VARCHAR,agv.createTime , 23)<='"+endDate+"' ) v "
-                +"  GROUP BY v.库区,v.工作站 ,v.业务类型 ";
+                +"  GROUP BY v.库区,v.工作站 ,v.业务类型 "
+                +"  order BY v.库区,v.工作站 ,v.业务类型 ";
         String sqlCount = "select count(t.id) as nums from (" + sql+") t";
         /* 总条数*/
         List<Integer> counts = entityManager.createNativeQuery(sqlCount).getResultList();
diff --git a/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java b/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java
index eebb5df..967abb7 100644
--- a/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java
+++ b/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java
@@ -49,9 +49,10 @@ public class KucunrizhiController {
 
         QueryPageUtil query =new QueryPageUtil();
         JSONObject jsonObject= JSONUtil.parseObj(json);
-        query.setPageSize((int)jsonObject.get("pageSize"));
-        query.setPageNum((int)jsonObject.get("pageNum"));
-
+      /*  query.setPageSize((int)jsonObject.get("pageSize"));
+        query.setPageNum((int)jsonObject.get("pageNum"));*/
+        query.setPageSize(200000);
+        query.setPageNum(1);
         JSONObject param= (JSONObject)jsonObject.get("param");
 
         com.yc.wms.bean.Kucunrizhi j = JSONUtil.toBean(param.toString(), com.yc.wms.bean.Kucunrizhi.class);
diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml
index 070239e..abdbdbc 100644
--- a/wms/src/main/resources/application.yml
+++ b/wms/src/main/resources/application.yml
@@ -13,9 +13,12 @@ server:
 spring:
   datasource:
     url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
+     #url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest
     driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
     username: wmsdb
     password: AmecDDbb32A
+     #username: WMSDB
+     #password: WmsYc@5688
 
     hikari:
       connection-timeout: 60000