From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态，显示清楚 （完成） 4. 站点保存报错， 修改人，创建人员显示 错误（完成） 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型，应该为入库 (完成)
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 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..cd42ffc 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -164,12 +164,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 +191,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瀵煎嚭
--
Gitblit v1.9.1