From 78ff74dfc9c42ee12993ac01c43063d0432231e3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 15:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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..9e69514 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);
@@ -151,6 +169,9 @@
@RequestMapping("/viewWorkInList.action")
public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
+ for (ViewWorkInBean viewWorkInBean : list) {
+ viewWorkInBean.sype();
+ }
int count = reportQueryMapper.getViewWorkInCount(bean);
Page<ViewWorkInBean> page = new Page<>();
page.setRecords(list);
@@ -229,6 +250,9 @@
@RequestMapping("/viewWorkOutList.action")
public R viewWorkOutList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ for (ViewWorkInBean viewWorkInBean : list) {
+ viewWorkInBean.sype();
+ }
int count = reportQueryMapper.getViewWorkOutCount(bean);
Page<ViewWorkInBean> page = new Page<>();
page.setRecords(list);
--
Gitblit v1.9.1