From 8808ebb9bb3eb8e6bc9ed8bfc6cfaf53e63d6614 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 02 十一月 2023 16:44:20 +0800
Subject: [PATCH] 日志统计
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 10 +
src/main/webapp/static/js/report/reportStockUse.js | 6 +
src/main/resources/mapper/ViewStockUseMapper.xml | 201 ++++++++++++++++++++++++++++-----------
src/main/webapp/views/report/viewStockUse.html | 12 ++
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 22 ++++
5 files changed, 189 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index c05293c..5b05f15 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -39,11 +39,29 @@
public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+
ViewStockUseBean bean = new ViewStockUseBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
- int count = reportQueryMapper.getViewStockUseCount(bean);
+
+ List<ViewStockUseBean> list = new ArrayList<>();
+ int count = 0;
+
+ if(Cools.isEmpty(param.get("locType"))){
+ param.put("locType","asr_loc");
+ }
+
+ if("agv_loc_1".equals(param.get("locType").toString())){
+ list = reportQueryMapper.queryViewStockUse1List(bean);
+ count = reportQueryMapper.getViewStockUse1Count(bean);
+ }else if("agv_loc_3".equals(param.get("locType").toString())){
+ list = reportQueryMapper.queryViewStockUse3List(bean);
+ count = reportQueryMapper.getViewStockUse3Count(bean);
+ }else {
+ list = reportQueryMapper.queryViewStockUseList(bean);
+ count = reportQueryMapper.getViewStockUseCount(bean);
+ }
+
Page<ViewStockUseBean> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 71723d3..678ebb3 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -12,10 +12,18 @@
@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);
diff --git a/src/main/resources/mapper/ViewStockUseMapper.xml b/src/main/resources/mapper/ViewStockUseMapper.xml
index cc723f6..1bd682c 100644
--- a/src/main/resources/mapper/ViewStockUseMapper.xml
+++ b/src/main/resources/mapper/ViewStockUseMapper.xml
@@ -14,7 +14,7 @@
<select id="queryViewStockUseList" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="com.zy.asrs.entity.ViewStockUseBean">
select top (#{pageSize}) * from asr_stk_use_view
<where>
- row1 not in (select top ((#{pageNumber}-1)*#{pageSize}) row1 from asr_stk_use_view
+ row1 not in (select top ((#{pageNumber}-1)*#{pageSize}) row1 from asr_stk_use_view
<where>
1=1
<include refid="viewStockUseConditionSql"></include>
@@ -50,67 +50,150 @@
]]>
</where>
</select>
- <select id="selectWorkCountIn" resultType="com.zy.asrs.entity.ViewWorkCountInView">
- SELECT *
- FROM (
- select
- ROW_NUMBER() OVER(Order by a.oneday desc) as row
- , *
- FROM(
- SELECT * FROM asr_wrkin_count_view
- WHERE
- 1 = 1 AND
- (oneday >= #{start}
- AND
- oneday < #{end})
- <if test="matnr != null and matnr !=''">
- and matnr = #{matnr}
- </if>
+<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+<select id="queryViewStockUse1List" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="com.zy.asrs.entity.ViewStockUseBean">
+ select top (#{pageSize}) * from agv_stk_use_view1
+ <where>
+ row1 not in (select top ((#{pageNumber}-1)*#{pageSize}) row1 from agv_stk_use_view1
+ <where>
+ 1=1
+ <include refid="viewStockUseConditionSql"></include>
+ </where>
+ order by row1 asc)
+ <include refid="viewStockUseConditionSql"></include>
+ <![CDATA[
+ order by row1 asc
+]]>
+ </where>
+</select>
- ) a ) b
- WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+<select id="getViewStockUse1Count" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="Integer">
+ select count(1) from agv_stk_use_view1
+ <where>
+ <![CDATA[
+1=1
+]]>
+ <include refid="viewStockUseConditionSql"></include>
+ </where>
+</select>
- </select>
- <select id="selectWorkCountInTotal" resultType="java.lang.Integer">
- SELECT COUNT(*) FROM asr_wrkin_count_view
- WHERE 1= 1 AND
- (oneday >= #{start}
- AND
- oneday < #{end})
- <if test="matnr != null and matnr !='' ">
- and matnr = #{matnr}
- </if>
- </select>
- <select id="selectWorkCountOut" resultType="com.zy.asrs.entity.ViewWorkCountInView">
- SELECT *
- FROM (
- select
- ROW_NUMBER() OVER(Order by a.oneday desc) as row
- , *
- FROM(
- SELECT * FROM asr_wrkout_count_view
- WHERE
- 1 = 1 AND
- (oneday > #{start}
- AND
- oneday < #{end})
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+<select id="getViewStockUse1All" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="com.zy.asrs.entity.ViewStockUseBean">
+ select * from agv_stk_use_view1
+ <where>
+ <![CDATA[
+ 1=1
+]]>
+ <include refid="viewStockUseConditionSql"></include>
+ <![CDATA[
+ order by row1 asc
+]]>
+ </where>
+</select>
- <if test="matnr != null and matnr !=''">
- and matnr = #{matnr}
- </if>
- ) a ) b
- WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
- </select>
- <select id="selectWorkCountOutTotal" resultType="java.lang.Integer">
- SELECT COUNT(*) FROM asr_wrkout_count_view
- WHERE 1= 1 AND
- (oneday > #{start}
- AND
- oneday < #{end})
- <if test="matnr != null and matnr !='' ">
- and matnr = #{matnr}
- </if>
- </select>
+<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+<select id="queryViewStockUse3List" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="com.zy.asrs.entity.ViewStockUseBean">
+ select top (#{pageSize}) * from agv_stk_use_view3
+ <where>
+ row1 not in (select top ((#{pageNumber}-1)*#{pageSize}) row1 from agv_stk_use_view3
+ <where>
+ 1=1
+ <include refid="viewStockUseConditionSql"></include>
+ </where>
+ order by row1 asc)
+ <include refid="viewStockUseConditionSql"></include>
+ <![CDATA[
+ order by row1 asc
+]]>
+ </where>
+</select>
+
+<select id="getViewStockUse3Count" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="Integer">
+ select count(1) from agv_stk_use_view3
+ <where>
+ <![CDATA[
+1=1
+]]>
+ <include refid="viewStockUseConditionSql"></include>
+ </where>
+</select>
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+<select id="getViewStockUse3All" parameterType="com.zy.asrs.entity.ViewStockUseBean" resultType="com.zy.asrs.entity.ViewStockUseBean">
+ select * from agv_stk_use_view3
+ <where>
+ <![CDATA[
+ 1=1
+]]>
+ <include refid="viewStockUseConditionSql"></include>
+ <![CDATA[
+ order by row1 asc
+]]>
+ </where>
+</select>
+
+<select id="selectWorkCountIn" resultType="com.zy.asrs.entity.ViewWorkCountInView">
+ SELECT *
+ FROM (
+ select
+ ROW_NUMBER() OVER(Order by a.oneday desc) as row
+ , *
+ FROM(
+ SELECT * FROM asr_wrkin_count_view
+ WHERE
+ 1 = 1 AND
+ (oneday >= #{start}
+ AND
+ oneday < #{end})
+
+ <if test="matnr != null and matnr !=''">
+ and matnr = #{matnr}
+ </if>
+
+ ) a ) b
+ WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+
+</select>
+<select id="selectWorkCountInTotal" resultType="java.lang.Integer">
+ SELECT COUNT(*) FROM asr_wrkin_count_view
+ WHERE 1= 1 AND
+ (oneday >= #{start}
+ AND
+ oneday < #{end})
+ <if test="matnr != null and matnr !='' ">
+ and matnr = #{matnr}
+ </if>
+</select>
+<select id="selectWorkCountOut" resultType="com.zy.asrs.entity.ViewWorkCountInView">
+ SELECT *
+ FROM (
+ select
+ ROW_NUMBER() OVER(Order by a.oneday desc) as row
+ , *
+ FROM(
+ SELECT * FROM asr_wrkout_count_view
+ WHERE
+ 1 = 1 AND
+ (oneday > #{start}
+ AND
+ oneday < #{end})
+
+ <if test="matnr != null and matnr !=''">
+ and matnr = #{matnr}
+ </if>
+ ) a ) b
+ WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+</select>
+<select id="selectWorkCountOutTotal" resultType="java.lang.Integer">
+ SELECT COUNT(*) FROM asr_wrkout_count_view
+ WHERE 1= 1 AND
+ (oneday > #{start}
+ AND
+ oneday < #{end})
+ <if test="matnr != null and matnr !='' ">
+ and matnr = #{matnr}
+ </if>
+</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/report/reportStockUse.js b/src/main/webapp/static/js/report/reportStockUse.js
index 414dde2..6c92acb 100644
--- a/src/main/webapp/static/js/report/reportStockUse.js
+++ b/src/main/webapp/static/js/report/reportStockUse.js
@@ -115,6 +115,12 @@
}
});
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/report/viewStockUse.html b/src/main/webapp/views/report/viewStockUse.html
index 34825c2..596dda8 100644
--- a/src/main/webapp/views/report/viewStockUse.html
+++ b/src/main/webapp/views/report/viewStockUse.html
@@ -19,6 +19,18 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-input-inline">
+ <select id="floorSelect" name="locType" lay-filter="floorSelect">
+ <option value="">璇烽�夋嫨</option>
+ <option value="asr_loc">鍥涢」搴撳尯</option>
+ <option value="agv_loc_1">AGV1妤煎簱鍖�</option>
+ <option value="agv_loc_3">AGV3妤煎簱鍖�</option>
+ </select>
+ </div>
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
+ </div>
</div>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1