From b366460d64876962e3f91928b53be035c53cd758 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 22 十二月 2023 12:10:59 +0800
Subject: [PATCH] #检料盘点工作档更新
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 22 ++++++++++++++++++++--
1 files changed, 20 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..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);
--
Gitblit v1.9.1