#

luxiaotao1123

2021-08-03 67da83c698e77ccf178669a31e4bd3a4e8fc1ca7

 src/main/java/com/zy/asrs/controller/LocNormalController.java

@@ -174,6 +174,19 @@
        return R.ok("成功导入" + listener.getTotal() + "条物料信息");
    }

    /* 导出 */
    @RequestMapping(value = "/locNormal/export/auth")
    @ManagerAuth(memo = "平仓管理导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<LocNormal> wrapper = new EntityWrapper<LocNormal>();
        wrapper.ne("state", "3");
        Map<String, Object> map = excludeTrash(param.getJSONObject("exportData"));
        convert(map, wrapper);
        List<LocNormal> list = locNormalService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    /* 平仓入库 成品 */
    @RequestMapping(value = "/locNormal/in")
    @ManagerAuth(memo = "平仓入库")
@@ -311,7 +324,7 @@
    public R normalReportExport(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        @SuppressWarnings("unchecked")
        List<LocNormalReport> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalReport.class);
        List<LocNormalLog> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalLog.class);
        return R.ok(exportSupport(list, fields));
    }
}