From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档,新增了几个字段需要加入到组托档中,不额外加字段 2.针对7.11接口文档,对outOrder方法进行重写,batchSeq在wrkMast表中新增一个字段放,entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档,上报时加上orderId出库单号 4.针对7.9接口文档,wcs会先请求wms,只需要palletId托盘码,errorMsg错误信息;wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档,ERP先按照这个文档发给wms,wms再发给wcs,发给wcs这块先不写

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

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 641086b..3b87269 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -69,11 +69,10 @@
 			+ "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
 	public List<WorkChartAxis> getChartAxis();
 
-	@Select("SELECT CONVERT(char(13), wrk_date, 120) AS ymd, "
-			+ "CAST(COUNT(CASE WHEN io_type IN (1,53,57) THEN 1 END) AS INT) AS inqty, "
-			+ "CAST(COUNT(CASE WHEN io_type IN (101,103,107) THEN 1 END) AS INT) AS outqty "
-			+ "FROM asr_wrk_mast WHERE wrk_date >= DATEADD(HOUR, -24, GETDATE()) "
-			+ "GROUP BY CONVERT(char(13), wrk_date, 120) ORDER BY ymd")
+	/**
+	 * 杩� 25 灏忔椂鎸夊皬鏃舵眹鎬伙紝渚濊禆搴撲腑瑙嗗浘 v_asr_inout_hourly_stat
+	 */
+	@Select("SELECT ymd, inqty, outqty FROM v_asr_inout_hourly_stat ORDER BY ymd")
 	List<WorkChartAxis> getChartAxisHourly();
 
 	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