From 6eb6a4b530627471d41979ccbc977a7371e99c1f Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期一, 04 十一月 2024 15:36:59 +0800 Subject: [PATCH] 找库位 --- src/main/webapp/static/js/report/workCountOut.js | 4 src/main/java/com/zy/asrs/controller/ReportDownloadController.java | 69 ++++++++++++++++ src/main/webapp/static/js/report/workOut.js | 54 +++++++------ src/main/webapp/views/report/viewWorkCountOut.html | 2 src/main/webapp/views/report/viewWorkOut.html | 2 src/main/webapp/static/js/report/workIn.js | 54 +++++++------ src/main/webapp/views/report/viewWorkIn.html | 2 src/main/webapp/static/js/report/workCountIn.js | 2 src/main/webapp/views/report/viewWorkCountIn.html | 2 9 files changed, 133 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java index 79b80a2..e36cb0c 100644 --- a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java +++ b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java @@ -8,7 +8,9 @@ import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.AgvWrkMastLog; +import com.zy.asrs.entity.ViewInOutBean; import com.zy.asrs.entity.ViewWorkCountInView; +import com.zy.asrs.entity.ViewWorkInBean; import com.zy.asrs.mapper.ReportQueryMapper; import com.zy.asrs.service.AgvWrkMastLogService; import com.zy.common.web.BaseController; @@ -41,7 +43,7 @@ * * @since 2.1.1 */ - @GetMapping("/in") + @GetMapping("/countIn") public void download1(HttpServletResponse response, @RequestParam Map<String, Object> param) throws IOException { try { @@ -85,7 +87,7 @@ * * @since 2.1.1 */ - @RequestMapping("/out") + @RequestMapping("/countOut") public void download2(HttpServletResponse response, @RequestParam Map<String, Object> param) throws IOException { try { @@ -178,4 +180,67 @@ } } } + + + /** + * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛� + * 鏃ュ嚭搴撴槑缁嗙粺璁� + * + * @since 2.1.1 + */ + @RequestMapping("/out") + public void out(HttpServletResponse response, + @RequestParam ViewWorkInBean bean) throws IOException { + try { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴 + String fileName = URLEncoder.encode("鏃ュ嚭搴撴槑缁嗙粺璁�", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean); + // 杩欓噷闇�瑕佽缃笉鍏抽棴娴� + EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(list); + } catch (Exception e) { + // 閲嶇疆response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + Map<String, String> map = new HashMap<>(); + map.put("status", "failure"); + map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage()); + response.getWriter().println(JSON.toJSONString(map)); + } + } + + /** + * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛� + * 鏃ュ叆搴撴槑缁嗙粺璁� + * + * @since 2.1.1 + */ + @RequestMapping("/in") + public void in(HttpServletResponse response, + @RequestParam ViewWorkInBean bean) throws IOException { + try { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴 + String fileName = URLEncoder.encode("鏃ュ叆搴撴槑缁嗙粺璁�", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean); + // 杩欓噷闇�瑕佽缃笉鍏抽棴娴� + EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(list); + } catch (Exception e) { + // 閲嶇疆response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + Map<String, String> map = new HashMap<>(); + map.put("status", "failure"); + map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage()); + response.getWriter().println(JSON.toJSONString(map)); + } + } } diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js index 58a2bd5..70912b6 100644 --- a/src/main/webapp/static/js/report/workCountIn.js +++ b/src/main/webapp/static/js/report/workCountIn.js @@ -99,7 +99,7 @@ exportData[this.name] = this.value; param += this.name + '=' + this.value + '&'; }); - window.location.href = baseUrl + "/report/download/in" + param; + window.location.href = baseUrl + "/report/download/countIn" + param; layer.closeAll(); // var param = { // fields: fields, diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js index 85c7a45..41dcd9c 100644 --- a/src/main/webapp/static/js/report/workCountOut.js +++ b/src/main/webapp/static/js/report/workCountOut.js @@ -92,12 +92,10 @@ } }); var param = '?'; - var exportData = {}; $.each($('#search-box [name]').serializeArray(), function() { - exportData[this.name] = this.value; param += this.name + '=' + this.value + '&'; }); - window.location.href = baseUrl + "/report/download/in" + param; + window.location.href = baseUrl + "/report/download/countOut" + param; layer.closeAll(); // var param = { // fields: fields, diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js index ec329f9..2ca190e 100644 --- a/src/main/webapp/static/js/report/workIn.js +++ b/src/main/webapp/static/js/report/workIn.js @@ -88,32 +88,38 @@ fields.push(col.field); } }); - var exportData = {}; + var param = '?'; $.each($('#search-box [name]').serializeArray(), function() { - exportData[this.name] = this.value; + param += this.name + '=' + this.value + '&'; }); - var param = { - fields: fields, - exportData: exportData - }; - $.ajax({ - url: baseUrl+"/report/viewWorkInExport.action", - headers: {'token': localStorage.getItem('token')}, - data: JSON.stringify(param), - dataType:'json', - contentType:'application/json;charset=UTF-8', - method: 'POST', - success: function (res) { - layer.closeAll(); - if (res.code === 200) { - table.exportFile(titles,res.data,'xls'); - } else if (res.code === 403) { - top.location.href = baseUrl+"/"; - } else { - layer.msg(res.msg) - } - } - }); + window.location.href = baseUrl + "/report/download/in" + param; + layer.closeAll(); + // var exportData = {}; + // $.each($('#search-box [name]').serializeArray(), function() { + // exportData[this.name] = this.value; + // }); + // var param = { + // fields: fields, + // exportData: exportData + // }; + // $.ajax({ + // url: baseUrl+"/report/viewWorkInExport.action", + // headers: {'token': localStorage.getItem('token')}, + // data: JSON.stringify(param), + // dataType:'json', + // contentType:'application/json;charset=UTF-8', + // method: 'POST', + // success: function (res) { + // layer.closeAll(); + // if (res.code === 200) { + // table.exportFile(titles,res.data,'xls'); + // } else if (res.code === 403) { + // top.location.href = baseUrl+"/"; + // } else { + // layer.msg(res.msg) + // } + // } + // }); }); break; } diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js index c8b06bf..5074519 100644 --- a/src/main/webapp/static/js/report/workOut.js +++ b/src/main/webapp/static/js/report/workOut.js @@ -90,32 +90,38 @@ fields.push(col.field); } }); - var exportData = {}; + var param = '?'; $.each($('#search-box [name]').serializeArray(), function() { - exportData[this.name] = this.value; + param += this.name + '=' + this.value + '&'; }); - var param = { - fields: fields, - exportData: exportData - }; - $.ajax({ - url: baseUrl+"/report/viewWorkOutExport.action", - headers: {'token': localStorage.getItem('token')}, - data: JSON.stringify(param), - dataType:'json', - contentType:'application/json;charset=UTF-8', - method: 'POST', - success: function (res) { - layer.closeAll(); - if (res.code === 200) { - table.exportFile(titles,res.data,'xls'); - } else if (res.code === 403) { - top.location.href = baseUrl+"/"; - } else { - layer.msg(res.msg) - } - } - }); + window.location.href = baseUrl + "/report/download/out" + param; + layer.closeAll(); + // var exportData = {}; + // $.each($('#search-box [name]').serializeArray(), function() { + // exportData[this.name] = this.value; + // }); + // var param = { + // fields: fields, + // exportData: exportData + // }; + // $.ajax({ + // url: baseUrl+"/report/viewWorkOutExport.action", + // headers: {'token': localStorage.getItem('token')}, + // data: JSON.stringify(param), + // dataType:'json', + // contentType:'application/json;charset=UTF-8', + // method: 'POST', + // success: function (res) { + // layer.closeAll(); + // if (res.code === 200) { + // table.exportFile(titles,res.data,'xls'); + // } else if (res.code === 403) { + // top.location.href = baseUrl+"/"; + // } else { + // layer.msg(res.msg) + // } + // } + // }); }); break; } diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html index daa6cee..a62668d 100644 --- a/src/main/webapp/views/report/viewWorkCountIn.html +++ b/src/main/webapp/views/report/viewWorkCountIn.html @@ -57,7 +57,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/report/workCountIn.js?v=3" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/report/workCountIn.js?v=4" charset="utf-8"></script> </body> </html> diff --git a/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html index 44d60f3..272b34a 100644 --- a/src/main/webapp/views/report/viewWorkCountOut.html +++ b/src/main/webapp/views/report/viewWorkCountOut.html @@ -58,7 +58,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/report/workCountOut.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/report/workCountOut.js?v=1" charset="utf-8"></script> </body> </html> diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html index 63930ca..31dd485 100644 --- a/src/main/webapp/views/report/viewWorkIn.html +++ b/src/main/webapp/views/report/viewWorkIn.html @@ -55,7 +55,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/report/workIn.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/report/workIn.js?v=2" charset="utf-8"></script> </body> </html> diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html index a115e3c..225dfac 100644 --- a/src/main/webapp/views/report/viewWorkOut.html +++ b/src/main/webapp/views/report/viewWorkOut.html @@ -55,7 +55,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/report/workOut.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/report/workOut.js?v=1" charset="utf-8"></script> </body> </html> -- Gitblit v1.9.1