From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001
From: Administrator <876263681@qq.com>
Date: 星期三, 02 七月 2025 15:12:43 +0800
Subject: [PATCH] #优化库位检索
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 82 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index f2ecc1e..ed003c4 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -71,6 +71,10 @@
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLoc_no(locNo);
}
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ bean.setMatnr(matnr);
+ }
List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
int count = reportQueryMapper.getViewStayTimeCount(bean);
Page<ViewStayTimeBean> page = new Page<>();
@@ -164,12 +168,24 @@
public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")));
- Integer total = reportQueryMapper.selectWorkCountInTotal();
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime= split[0].split(" ")[0].replace("-",".");
+ endTime = split[1].split(" ")[0].replace("-",".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
+ Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime,endTime);
Page<ViewWorkCountInView> page = new Page<>();
page.setRecords(allCountIn);
page.setTotal(total);
- return R.ok(page);
+ Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime,endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page",page);
+ result.put("sum",sum);
+ return R.ok(result);
}
/**
@@ -179,12 +195,24 @@
public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")));
- Integer total = reportQueryMapper.selectWorkCountOutTotal();
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime= split[0].split(" ")[0].replace("-",".");
+ endTime = split[1].split(" ")[0].replace("-",".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
+ Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime,endTime);
Page<ViewWorkCountInView> page = new Page<>();
page.setRecords(allCountIn);
page.setTotal(total);
- return R.ok(page);
+ Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime,endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page",page);
+ result.put("sum",sum);
+ return R.ok(result);
}
//excel瀵煎嚭
@@ -222,4 +250,46 @@
return R.ok(exportSupport(list, fields));
}
+ @RequestMapping("/viewWorkOutTtlList.action")
+ public R viewWorkOutTtlList(ViewWorkInAllBean bean){
+ List<ViewWorkInAllBean> list = reportQueryMapper.queryViewWorkOutTtlList(bean);
+ int count = reportQueryMapper.getViewWorkOutTtlCount(bean);
+ Page<ViewWorkInAllBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
+
+ @RequestMapping("/viewWorkOutTtlExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗘眹鎬荤粺璁″鍑�")
+ public R viewWorkOutTtlExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInAllBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInAllBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInAllBean> list = reportQueryMapper.getViewWorkOutTtlAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping("/viewWorkInTtlList.action")
+ public Map<String,Object> viewWorkInTtlList(ViewWorkInAllBean bean){
+ List<ViewWorkInAllBean> list = reportQueryMapper.queryViewWorkInTtlList(bean);
+ int count = reportQueryMapper.getViewWorkInTtlCount(bean);
+ Page<ViewWorkInAllBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
+
+ @RequestMapping("/viewWorkInTtlExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗘眹鎬荤粺璁″鍑�")
+ public R viewWorkInTtlExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInAllBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInAllBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInAllBean> list = reportQueryMapper.getViewWorkInTtlAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
--
Gitblit v1.9.1