From 34e3301ff24f10100dae8c9b4b98cafef1b6a653 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期日, 25 六月 2023 21:17:51 +0800 Subject: [PATCH] 出入库流程优化-入库详单优化 --- igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java b/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java index 4c5e2f3..2ef17de 100644 --- a/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java +++ b/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java @@ -292,7 +292,19 @@ @RequestMapping("/init-inout-data") @ResponseBody public PageResponse<String> initInoutData(@RequestBody BaseParam param) { - inoutCommonManager.initInoutScreen(param.getDeptId()); + + if (null == param.getCompanyId()) { + IUser user = ContextUtil.getLoginUser(); + + param.setCompanyId(user.getCompanyId()); + + if (null == param.getDeptId()) { + param.setDeptId(ContextUtil.subDeptId(user)); + } + } + + inoutCommonManager.initInoutScreen(param.getCompanyId(),param.getDeptId()); + return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�"); } @@ -373,7 +385,21 @@ @RequestMapping("/init-check-data") @ResponseBody public PageResponse<String> initCheckData(@RequestBody BaseParam param) { - inoutCommonManager.initInoutScreen(param.getCompanyId()); + + if (null == param.getCompanyId()) { + IUser user = ContextUtil.getLoginUser(); + + param.setCompanyId(user.getCompanyId()); + + if (null == param.getDeptId()) { + param.setDeptId(ContextUtil.subDeptId(user)); + } + } + + + inoutCommonManager.initInoutScreen(param.getCompanyId(),param.getDeptId()); + + return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�"); } -- Gitblit v1.9.3