From e15139e4ec5daffb4e4d4a8e48fb1237baeb5fad Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 14:02:03 +0800
Subject: [PATCH] 新增电视机显示小车异常异常信息提示

---
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java |  149 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 92 insertions(+), 57 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..5bac1d0 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -1,5 +1,7 @@
 package com.zy.asrs.mapper;
 
+import com.zy.asrs.domain.dto.WorkChartAxis;
+import com.zy.asrs.domain.vo.LocChartPie;
 import com.zy.asrs.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -7,77 +9,110 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @Repository
 public interface ReportQueryMapper {
-	
-	//鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
-	List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
-	int getViewStockUseCount(ViewStockUseBean viewStockUse);
-	List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
-
-	//鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
-	public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
-	public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
-	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
-	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_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_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);
 
 
-	//鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
-	public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
-	public int getViewInOutCount(ViewInOutBean viewInOut);
-	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
-	public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
+    @Select("select \n" +
+            "Min(wm.io_time) as node,\n" +
+            "isnull(count(1), 0) as val\n" +
+            "from asr_wrk_mast_log wm\n" +
+            "where wm.wrk_sts = 5 \n" +
+            "and (wm.io_type = 1 OR wm.io_type = 54)\n" +
+            "and datediff(d, wm.io_time, getdate())<=7 \n" +
+            "group by datediff(day,wm.io_time,getdate())\n" +
+            "order by Min(wm.io_time) asc\n")
+    List<Map<String, Object>> queryPakinRep();
 
-	//鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
-	public List<ViewWorkInBean> queryViewWorkInList(ViewWorkInBean viewWorkIn);
-	public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
-	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
-	public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+    @Select("select\n" +
+            "Min(wm.io_time) as node,\n" +
+            "isnull(count(1), 0) as val\n" +
+            "from asr_wrk_mast_log wm\n" +
+            "where 1=1\n" +
+            "and ((wm.wrk_sts = 15 AND wm.io_type = 101) OR (wm.wrk_sts = 14 AND wm.io_type = 103))\n" +
+            "and datediff(d, wm.io_time, getdate())<=7\n" +
+            "group by datediff(day,wm.io_time,getdate())\n" +
+            "order by Min(wm.io_time) asc")
+    List<Map<String, Object>> queryPakOutRep();
 
-	//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
-	public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
-	public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
-	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
-	public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+    //鏇茬嚎鍥�
+    @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();
+
+    @Select("select * from asr_loc_use_view")
+    LocChartPie getLocUseRate();
+
+    @Select("select count(1) as totalWrk from asr_wrk_mast_log where crn_no = #{crnNo}")
+    Integer getTotalWrkByCrnId(Integer crnNo);
+
+    @Select("select count(1) as totalLoc from asr_loc_mast")
+    Integer getTotalLocByCrnId();
+
+    //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
+    List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
+    int getViewStockUseCount(ViewStockUseBean viewStockUse);
+    List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
+
+    //鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
+    public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
+    public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
+    //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+    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_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_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);
 
 
-	// ------鍥捐〃
-	//楗肩姸鍥�
-	@Select("select * from asr_loc_use_view")
-	public LocChartPie getLocUseRate();
-	//鏇茬嚎鍥�
-	@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();
+    //鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
+    public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
+    public int getViewInOutCount(ViewInOutBean viewInOut);
+    //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+    public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
 
-	List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
+    //鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
+    public List<ViewWorkInBean> queryViewWorkInList(ViewWorkInBean viewWorkIn);
+    public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
+    //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+    public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
 
-	Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+    //鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
+    public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
+    public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
+    //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+    public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
 
-	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);
+    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