From 1a30303df506698d09d106060d93d196c90c5c18 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 08 三月 2023 07:57:53 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 1df34a7..99f034f 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -24,17 +24,20 @@
 	public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
 
 //	// 搴撲綅Map
+	@Select("select distinct row1 from asr_loc_mast order by row1 asc")
+	List<Integer> getViewLocRowTotal();
+
 	@Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
 	public List<String> getViewLocLevCount(@Param("row1") int row1);
 //
-	@Select("select loc_no as locNo, bay1,loc_type as locType 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 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")
 	public List<String> getViewLocBayCount(@Param("row1") int row1);
 
-	@Select("select lev1,loc_type as locType from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
+	@Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
 	public List<ViewLocMapDto> getViewLocLevs(@Param("row1") int row1, @Param("bay1") int bay1);
 
 
@@ -49,12 +52,16 @@
 	public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
 	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
 	public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+	public List<ViewWorkInBean> getViewWorkInERP();
 
 	//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
 	public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
 	public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
 	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
 	public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+	public List<ViewWorkInBean> getViewWorkOutERP();
 
 
 	// ------鍥捐〃
@@ -65,4 +72,16 @@
 	@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, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+	Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+	List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+	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