From 8e36d6e7a2837df41b35ca46bd3678cc1a8d0533 Mon Sep 17 00:00:00 2001
From: Administrator <876263681@qq.com>
Date: 星期一, 30 十二月 2024 08:06:15 +0800
Subject: [PATCH] #导出优化，低库位满时，低库位的货往高库位寻找
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 945baa4..ed003c4 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -250,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