From 9145f8a44c6ae733019e43c775cc30243032e502 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 16:16:43 +0800
Subject: [PATCH] 拍照触发修改
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 47 +++++++++++++++++------------------------------
1 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 9f86a69..e806003 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -66,57 +66,44 @@
public LocChartPie getLocUseRate();
//鏇茬嚎鍥�
@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")
+ + "where ymd>CONVERT(char(10), DATEADD(DAY,-7,GETDATE()), 120) group by ymd order by ymd")
public List<WorkChartAxis> getChartAxis();
/**
* 鎸夊皬鏃舵眹鎬伙紙瑙嗗浘 v_asr_inout_hourly_stat锛寉md 涓庢帴鍙� yyyy-MM-dd HH 瀵归綈锛�
*/
- @Select("SELECT ymd, inqty, outqty,cube_inqty as cubeInqty,cube_outqty as cubeOutqty FROM v_asr_inout_hourly_stat ")
+ @Select("SELECT ymd, inqty, outqty,cube_inqty as cubeInqty,cube_outqty as cubeOutqty,out_teu as outTeu FROM v_asr_inout_hourly_stat ")
List<WorkChartAxis> getChartAxisHourly();
/**
* 鎸夊皬鏃舵眹鎬伙紙瑙嗗浘 v_asr_inout_hourly_stat锛寉md 涓庢帴鍙� yyyy-MM-dd HH 瀵归綈锛�
*/
- @Select("SELECT ymd, teu_total FROM asr_wrk_detl_teu_day_view ORDER BY ymd")
+ @Select("SELECT ymd, teu_total FROM asr_wrk_detl_teu_day_view "
+ + "WHERE ymd>CONVERT(char(10), DATEADD(DAY,-7,GETDATE()), 120) ORDER BY ymd")
List<WorkTeuTotalAxis> getteuTotal();
/**
- * 鏈�杩� 12 澶╀綋绉眹鎬�
+ * 鏈�杩� 7 澶╀綋绉眹鎬�
*/
@Select("SELECT CONVERT(char(10), stat_date, 23) AS ymd, "
+ "CAST(ISNULL(wrk_sts_5_cube_sum, 0) AS decimal(18,4)) AS cube5Total, "
+ "CAST(ISNULL(wrk_sts_15_cube_sum, 0) AS decimal(18,4)) AS cube15Total "
- + "FROM dbo.asr_wrk_cube_day_stat ORDER BY stat_date")
+ + "FROM dbo.asr_wrk_cube_day_stat "
+ + "WHERE stat_date >= DATEADD(DAY, -6, CONVERT(date, GETDATE())) "
+ + " AND stat_date < DATEADD(DAY, 1, CONVERT(date, GETDATE())) "
+ + "ORDER BY stat_date")
List<WorkCubeTotalAxis> getCubeTotal();
/**
- * 鏈�杩� 12 澶╁叆搴撲綋绉眹鎬伙紝鍏堢瓫閫夊畬鎴愮姸鎬佷富妗ｏ紝鍐嶅叧鑱旀槑缁嗭紝閬垮厤鏄庣粏鏃ュ織澶ц寖鍥撮鑱氬悎銆�
+ * 鏈�杩� 7 澶╁叆搴撲綋绉眹鎬汇��
+ * 鎺ュ彛鍙鍙栨眹鎬昏〃锛岄伩鍏嶆瘡娆¤姹傚疄鏃舵壂鎻忓伐浣滄棩蹇楁槑缁嗐��
*/
- @Select("WITH dates AS ( "
- + " SELECT DATEADD(DAY, -v.n, CONVERT(date, GETDATE())) AS stat_date "
- + " FROM (VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11)) AS v(n) "
- + "), completed_mast AS ( "
- + " SELECT DISTINCT m.wrk_no, m.io_time "
- + " FROM dbo.asr_wrk_mast_log AS m "
- + " WHERE m.wrk_sts = 5 "
- + " AND m.io_time >= DATEADD(DAY, -11, CONVERT(date, GETDATE())) "
- + " AND m.io_time < DATEADD(DAY, 1, CONVERT(date, GETDATE())) "
- + "), agg AS ( "
- + " SELECT CONVERT(date, cm.io_time) AS stat_date, "
- + " SUM(ISNULL(d.cube_number, 0)) AS wrk_sts_5_cube_sum "
- + " FROM completed_mast AS cm "
- + " INNER JOIN dbo.asr_wrk_detl_log AS d "
- + " ON d.wrk_no = cm.wrk_no "
- + " AND d.io_time = cm.io_time "
- + " GROUP BY CONVERT(date, cm.io_time) "
- + ") "
- + "SELECT CONVERT(char(10), ds.stat_date, 23) AS ymd, "
- + " CAST(ISNULL(a.wrk_sts_5_cube_sum, 0) AS decimal(18,4)) AS cube5Total "
- + "FROM dates AS ds "
- + "LEFT JOIN agg AS a ON a.stat_date = ds.stat_date "
- + "ORDER BY ds.stat_date "
- + "OPTION (RECOMPILE)")
+ @Select("SELECT CONVERT(char(10), stat_date, 23) AS ymd, "
+ + "CAST(ISNULL(wrk_sts_5_cube_sum, 0) AS decimal(18,4)) AS cube5Total "
+ + "FROM dbo.asr_wrk_cube_day_stat "
+ + "WHERE stat_date >= DATEADD(DAY, -6, CONVERT(date, GETDATE())) "
+ + " AND stat_date < DATEADD(DAY, 1, CONVERT(date, GETDATE())) "
+ + "ORDER BY stat_date")
List<WorkCubeTotalAxis> getInboundCubeTotal();
--
Gitblit v1.9.1