From 7294ef58d1a343bdc765773ba69928820ce0d20f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 20 四月 2026 21:30:43 +0800
Subject: [PATCH] 1.出库任务下发 2.新增双伸堆垛机入库找库位 3.12天入库体积统计

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

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 01cd112..9f86a69 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -72,7 +72,7 @@
 	/**
 	 * 鎸夊皬鏃舵眹鎬伙紙瑙嗗浘 v_asr_inout_hourly_stat锛寉md 涓庢帴鍙� yyyy-MM-dd HH 瀵归綈锛�
 	 */
-	@Select("SELECT ymd, inqty, outqty FROM v_asr_inout_hourly_stat ORDER BY ymd")
+	@Select("SELECT ymd, inqty, outqty,cube_inqty as cubeInqty,cube_outqty as cubeOutqty FROM v_asr_inout_hourly_stat ")
 	List<WorkChartAxis> getChartAxisHourly();
 
 	/**
@@ -81,6 +81,44 @@
 	@Select("SELECT ymd, teu_total FROM asr_wrk_detl_teu_day_view ORDER BY ymd")
 	List<WorkTeuTotalAxis> getteuTotal();
 
+	/**
+	 * 鏈�杩� 12 澶╀綋绉眹鎬�
+	 */
+	@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")
+	List<WorkCubeTotalAxis> getCubeTotal();
+
+	/**
+	 * 鏈�杩� 12 澶╁叆搴撲綋绉眹鎬伙紝鍏堢瓫閫夊畬鎴愮姸鎬佷富妗o紝鍐嶅叧鑱旀槑缁嗭紝閬垮厤鏄庣粏鏃ュ織澶ц寖鍥撮鑱氬悎銆�
+	 */
+	@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)")
+	List<WorkCubeTotalAxis> getInboundCubeTotal();
+
 
 
 	List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);

--
Gitblit v1.9.1