From b0877a3275ed5bc96fb80f84949904e149946cf2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 19:37:51 +0800
Subject: [PATCH] 将erp下发直接生成任务改成先生成订单再出库

---
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index e7923be..e806003 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -66,38 +66,42 @@
 	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("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, -11, CONVERT(date, GETDATE())) "
+			+ "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