From 04ef1a453d35fab8742f185a33d2659f623b038c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 22 二月 2022 16:32:12 +0800
Subject: [PATCH] Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index f8285ce..bd14d54 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -1,5 +1,6 @@
package com.zy.asrs.mapper;
+import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@@ -24,6 +25,22 @@
"order by Min(wm.io_time) asc\n")
List<Map<String, Object>> queryPakinRep();
+ @Select("select\n" +
+ "Min(wm.io_time) as node,\n" +
+ "isnull(count(1), 0) as val\n" +
+ "from asr_wrk_mast_log wm\n" +
+ "where 1=1\n" +
+ "and ((wm.wrk_sts = 15 AND wm.io_type = 101) OR (wm.wrk_sts = 14 AND wm.io_type = 103))\n" +
+ "and datediff(d, wm.io_time, getdate())<=7\n" +
+ "group by datediff(day,wm.io_time,getdate())\n" +
+ "order by Min(wm.io_time) asc")
+ List<Map<String, Object>> queryPakOutRep();
+
+ //鏇茬嚎鍥�
+ @Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
+ + "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
+ public List<WorkChartAxis> getChartAxis();
+
@Select("select * from asr_loc_use_view")
LocChartPie getLocUseRate();
--
Gitblit v1.9.1