no message

wms-vue/src/components/duochaxun/JianHuoXiaoLv.vue

@@ -176,9 +176,9 @@ export default {
           label: '下发时间'
         },
         {
-          prop: '全部拣货完成时间',
+          prop: '拣货时间',
           minWidth: '150px',
-          label: '全部拣货完成时间'
+          label: '拣货时间'
         },
         {
           prop: '清点时间',

wms/src/main/java/com/yc/wms/controller/GGZXiaoLvController.java

@@ -45,6 +45,10 @@ public class GGZXiaoLvController {
         if (param.getStr("日期")!=null&&param.getJSONArray("日期").size()>0){
             startDate=sdf.format(param.getJSONArray("日期").getDate(0));
             endDate=sdf.format(param.getJSONArray("日期").getDate(1));
+        }else {
+            Result result=Result.result(500,"请选择日期范围",0, null);
+
+            return result;
         }
         /* 当前页数据*/
         int pageNum = query.getPageNum();//当前页
@@ -55,7 +59,7 @@ public class GGZXiaoLvController {
                 +"     v.库区, "
                 +"     v.工作站, "
                 +"     SUM(v.有效时效)/60 AS 有效时效, "
-                +" 		SUM(v.有效时效)/60/9 AS 有效时效占比, "
+                +" 	   round(SUM(v.有效时效)/60/540.0 ,3)AS 有效时效占比, "
                 +"     COUNT(DISTINCT CASE WHEN v.业务类型 = '入库' THEN v.任务号 END) AS 入库, "
                 +"     COUNT(DISTINCT CASE WHEN v.业务类型 = '拣货' THEN v.任务号 END) AS 拣货, "
                 +"     COUNT(DISTINCT CASE WHEN v.业务类型 = '料箱整理' THEN v.任务号 END) AS 整理, "
@@ -88,8 +92,8 @@ public class GGZXiaoLvController {
                 +" FROM "
                 +"     agvtask agv "
                 +" WHERE "
-                +"     CONVERT(VARCHAR, agv.createTime, 23) >= '2025-01-01' "
+                +"     CONVERT(VARCHAR, agv.createTime, 23) >= '"+startDate+"' "
-                +"     AND CONVERT(VARCHAR, agv.createTime, 23) <= '2025-03-20' "
+                +"     AND CONVERT(VARCHAR, agv.createTime, 23) <= '"+endDate+"' "
                 +"             AND agv.classification IN ('入库', '拣货', '料箱整理', '盘点') "
                 +"     ) v "
                 +" GROUP BY "

wms/src/main/java/com/yc/wms/controller/JianHuoXiaoLvController.java

@@ -61,13 +61,13 @@ public class JianHuoXiaoLvController {
                 +"         CONVERT(VARCHAR(19), MIN(t.ARRIVAL_TIME), 20) AS '清点时间', "
                 +"         CONVERT(VARCHAR(19), MIN(t.operator_Date), 20) AS '合单时间', "
                 +"         CONVERT(VARCHAR(19), MIN(t.dateline), 20) AS '交单时间', "
-                +"         DATEDIFF(SECOND, MIN(pt.UPDATE_TIME), MIN(t.dateBill1)) / 60 AS '创建 - 下发时间', "
+                +"         DATEDIFF(SECOND, MIN(pt.UPDATE_TIME), MIN(t.dateBill1)) / 60 AS '创建-下发时间', "
-                +"         DATEDIFF(SECOND, MIN(t.dateBill1), MIN(t.OPERATE_TIME)) / 60 AS '下发 - 拣货时间', "
+                +"         DATEDIFF(SECOND, MIN(t.dateBill1), MIN(t.OPERATE_TIME)) / 60 AS '下发-拣货时间', "
-                +"         DATEDIFF(SECOND, MIN(t.OPERATE_TIME), MIN(t.operator_Date)) / 60 AS '拣货 - 合单时间', "
+                +"         DATEDIFF(SECOND, MIN(t.OPERATE_TIME), MIN(t.operator_Date)) / 60 AS '拣货-合单时间', "
-                +"         DATEDIFF(SECOND, MIN(t.operator_Date), MIN(t.dateline)) / 60 AS '合单 - 交单时间', "
+                +"         DATEDIFF(SECOND, MIN(t.operator_Date), MIN(t.dateline)) / 60 AS '合单-交单时间', "
-                +"         DATEDIFF(SECOND, MIN(t.OPERATE_TIME), MIN(t.ARRIVAL_TIME)) / 60 AS '拣货 - 清点时间', "
+                +"         DATEDIFF(SECOND, MIN(t.OPERATE_TIME), MIN(t.ARRIVAL_TIME)) / 60 AS '拣货-清点时间', "
-                +"         DATEDIFF(SECOND, MIN(t.ARRIVAL_TIME), MIN(t.operator_Date)) / 60 AS '清点 - 合单时间', "
+                +"         DATEDIFF(SECOND, MIN(t.ARRIVAL_TIME), MIN(t.operator_Date)) / 60 AS '清点-合单时间', "
-                +"         DATEDIFF(SECOND, MIN(t.OPERATE_TIME), MIN(t.dateline)) / 60 AS '拣货 - 交单时间' "
+                +"         DATEDIFF(SECOND, MIN(t.OPERATE_TIME), MIN(t.dateline)) / 60 AS '拣货-交单时间' "
                 +"     FROM  "
                 +"         task t "
                 +"     LEFT JOIN  "
@@ -111,8 +111,8 @@ public class JianHuoXiaoLvController {
         }
         if (param.getStr("创建日期")!=null&&param.getJSONArray("创建日期").size()>0){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            querySql=querySql+" and pt.UPDATE_TIME >= '"+sdf.format(param.getJSONArray("创建日期").getDate(0))+"'";
+            querySql=querySql+" and CAST(pt.UPDATE_TIME AS DATE) >= '"+sdf.format(param.getJSONArray("创建日期").getDate(0))+"'";
-            querySql=querySql+" and pt.UPDATE_TIME <= '"+sdf.format(param.getJSONArray("创建日期").getDate(1))+"'";
+            querySql=querySql+" and CAST(pt.UPDATE_TIME AS DATE) <= '"+sdf.format(param.getJSONArray("创建日期").getDate(1))+"'";
         }
         /* 当前页数据*/
         int pageNum = query.getPageNum();//当前页

wms/src/main/resources/application.yml

@@ -13,14 +13,16 @@ server:
 
 spring:
   datasource:
-    url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
+#    url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
 #    url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest
+    url: jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest
     driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
-    username: wmsdb
+#    username: wmsdb
-    password: AmecDDbb32A
+#    password: AmecDDbb32A
 #    username: WMSDB
 #    password: WmsYc@5688
-
+    username: sa
+    password: Amecadmin1!
     hikari:
       connection-timeout: 60000