From 4e7fce25f60aaf58603a3d2f3d749d1a83675c44 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期四, 04 七月 2024 15:33:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index d3dce46..c8e20c1 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -24,17 +24,17 @@
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
// // 搴撲綅Map
- @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+ @Select("select distinct row1 from asr_loc_mast_man_node_merge order by row1 asc")
List<Integer> getViewLocRowTotal();
- @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
+ @Select("select distinct lev1 from asr_loc_mast_man_node_merge where row1=#{row1} order by lev1 desc")
public List<String> getViewLocLevCount(@Param("row1") int row1);
//
- @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+ @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast_man_node_merge where row1=#{row1} and lev1=#{lev1} order by bay1")
public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
// 搴撲綅Map
- @Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
+ @Select("select distinct bay1 from asr_loc_mast_man_node_merge where row1=#{row1} order by bay1")
public List<String> getViewLocBayCount(@Param("row1") int row1);
@Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
@@ -64,16 +64,29 @@
//楗肩姸鍥�
@Select("select * from asr_loc_use_view")
public LocChartPie getLocUseRate();
+
+ //绔嬪簱鏁版嵁
+ @Select("select * from asr_loc_use_view_L")
+ public LocChartPie getLocUseRateL();
+
+ //骞冲簱鏁版嵁
+ @Select("select * from asr_loc_use_view_P")
+ public LocChartPie getLocUseRateP();
+
//鏇茬嚎鍥�
@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();
- List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit);
+ List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
- Integer selectWorkCountInTotal();
+ Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
- List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize);
+ List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);
- Integer selectWorkCountOutTotal();
+ Integer selectWorkCountOutTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountInSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountOutSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
}
--
Gitblit v1.9.1