From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1
---
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 6a804db..5b4ae01 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -12,16 +12,30 @@
@Repository
public interface ReportQueryMapper {
- //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
+ //鍒嗛〉鏌ヨ鍥涢」搴撳簱浣嶄娇鐢ㄧ巼
List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
int getViewStockUseCount(ViewStockUseBean viewStockUse);
List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
+ //鍒嗛〉鏌ヨagv1妤煎簱浣嶄娇鐢ㄧ巼
+ List<ViewStockUseBean> queryViewStockUse1List(ViewStockUseBean viewStockUse);
+ int getViewStockUse1Count(ViewStockUseBean viewStockUse);
+ List<ViewStockUseBean> getViewStockUse1All(ViewStockUseBean viewStockUse);
+ //鍒嗛〉鏌ヨagv3妤煎簱浣嶄娇鐢ㄧ巼
+ List<ViewStockUseBean> queryViewStockUse3List(ViewStockUseBean viewStockUse);
+ int getViewStockUse3Count(ViewStockUseBean viewStockUse);
+ List<ViewStockUseBean> getViewStockUse3All(ViewStockUseBean viewStockUse);
//鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
+
+ //鍒嗛〉鏌ヨAGV鍜屽洓椤瑰簱搴撳瓨婊炵暀鏃堕棿
+ public List<ViewStayTimeBean> queryAllViewStayTimeList(ViewStayTimeBean viewStayTime);
+ public int getAllViewStayTimeCount(ViewStayTimeBean viewStayTime);
+ //涓嶅垎椤垫煡璇GV鍜屽洓椤瑰簱鎵�鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewStayTimeBean> getAllViewStayTimeAll(ViewStayTimeBean viewStayTime);
// // 搴撲綅Map
@Select("select distinct row1 from asr_loc_mast order by row1 asc")
@@ -30,7 +44,7 @@
@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_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 where row1=#{row1} and lev1=#{lev1} and status=0 order by bay1")
public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
// 搴撲綅Map
@@ -52,12 +66,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();
// ------鍥捐〃
@@ -71,6 +89,7 @@
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);
--
Gitblit v1.9.1