From 7f9ad8362df4f5c0ddf652055002e1a4cef2b06b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 05 九月 2024 16:46:29 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
index 6f489a1..fb3c929 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.web.BaseController;
@@ -8,13 +10,16 @@
import com.zy.asrs.common.wms.entity.ViewStockUseBean;
import com.zy.asrs.common.wms.entity.ViewWorkInBean;
import com.zy.asrs.common.wms.mapper.ReportQueryMapper;
+import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
/**
@@ -43,6 +48,15 @@
return R.ok(list);
}
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStockUseExport.action")
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
+ public R viewStockUseExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
+ return R.ok(exportSupport(list, fields));
+ }
+
//------------------搴撳瓨婊炵暀缁熻--------------------------------------
@RequestMapping("/viewStayTimeList.action")
public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
@@ -51,7 +65,7 @@
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- String locNo = String.valueOf(param.get("loc_no"));
+ String locNo = String.valueOf(param.get("locNo"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLocNo(locNo);
}
@@ -59,6 +73,16 @@
Page<ViewStayTimeBean> page = new Page<>(curr, limit);
IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
return R.ok(list);
+ }
+
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStayTimeExport.action")
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+ public R viewStayTimeExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map map = param.getObject("exportData", Map.class);
+ List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(map);
+ return R.ok(exportSupport(list, fields));
}
//------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
@@ -77,17 +101,43 @@
//------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkInList.action")
public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(1, 99999);
+ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
return R.ok(list);
+ }
+
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkInExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQueryDate(bean.getQueryDate());
+ Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(map);
+ return R.ok(exportSupport(list, fields));
}
//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkOutList.action")
public R viewWorkOutList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(1, 99999);
+ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
return R.ok(list);
}
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkOutExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQueryDate(bean.getQueryDate());
+ Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(map);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
--
Gitblit v1.9.1