王佳豪
2021-07-08 4807619ff7d8721f4286ad8d62369b70dc929cd4
1.立库日出入库统计导出支持分页导出
2.平仓日入库查询支持分页导出
3个文件已修改
34 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/ReportQueryController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/report/workIn.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/report/workOut.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -158,6 +158,16 @@
        return R.ok(exportSupport(list, fields));
    }
    //excel导出
    @RequestMapping("/viewWorkInExportByPage.action")
    @ManagerAuth(memo = "日入库明细统计导出(分页数据)")
    public R viewWorkInExportByPage(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        @SuppressWarnings("unchecked")
        List<ViewWorkInBean> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), ViewWorkInBean.class);
        return R.ok(exportSupport(list, fields));
    }
    //------------------日出库明细统计--------------------------------------
    @RequestMapping("/viewWorkOutList.action")
    public R viewWorkOutList(ViewWorkInBean bean){
@@ -181,4 +191,14 @@
        return R.ok(exportSupport(list, fields));
    }
    //excel导出
    @RequestMapping("/viewWorkOutExportByPage.action")
    @ManagerAuth(memo = "日出库明细统计导出(分页数据)")
    public R viewWorkOutExportByPage(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        @SuppressWarnings("unchecked")
        List<ViewWorkInBean> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), ViewWorkInBean.class);
        return R.ok(exportSupport(list, fields));
    }
}
src/main/webapp/static/js/report/workIn.js
@@ -1,4 +1,5 @@
var pageCurr;
var workInData = [];
function getCol() {
    var cols = [
        {field: 'io_time', align: 'center', title: '入库日期', width: 200}
@@ -48,6 +49,8 @@
            }
            pageCurr=curr;
            limit();
            // 分页数据临时存储
            workInData = res.data;
        }
    });
@@ -94,10 +97,10 @@
                    });
                    var param = {
                        fields: fields,
                        exportData: exportData
                        exportData: workInData
                    };
                    $.ajax({
                        url: baseUrl+"/report/viewWorkInExport.action",
                        url: baseUrl+"/report/viewWorkInExportByPage.action",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
src/main/webapp/static/js/report/workOut.js
@@ -1,4 +1,5 @@
var pageCurr;
var workOutData = [];
function getCol() {
    var cols = [
        {field: 'io_time', align: 'center', title: '出库日期', width: 200}
@@ -50,6 +51,8 @@
            }
            pageCurr=curr;
            limit();
            // 分页数据临时存储
            workOutData = res.data;
        }
    });
@@ -96,10 +99,10 @@
                    });
                    var param = {
                        fields: fields,
                        exportData: exportData
                        exportData: workOutData
                    };
                    $.ajax({
                        url: baseUrl+"/report/viewWorkOutExport.action",
                        url: baseUrl+"/report/viewWorkOutExportByPage.action",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',