From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 03 九月 2024 16:52:49 +0800 Subject: [PATCH] 代码提交 bug解决 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java index 6067978..dea6920 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java @@ -3,6 +3,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.common.security.service.TokenService; import com.ruoyi.management.domain.SlVolumeProductionRk; import com.ruoyi.management.domain.dto.*; import com.ruoyi.management.domain.vo.*; @@ -31,10 +32,12 @@ @Resource private SlVolumeProductionRkService slVolumeProductionRkService; - + @Resource + private TokenService tokenService; @PostMapping("/getSlGoodsMaterialsSlVolumeProductionRkList") @ApiOperation(value = "分页获取通过物资来获取当前批次入库的物资") public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlGoodsMaterialsSlVolumeProductionRkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkDTO) { + tokenService.getLoginUser(); return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO)); } @@ -42,6 +45,7 @@ @PostMapping("/gethuojRkList") @ApiOperation(value = "分页获取通过货架来获取当前批次入库的物资") public R<PageDTO<gethuojRkVO>> gethuojRkList(@RequestBody gethuojRkQuery gethuojRkQuery) { + tokenService.getLoginUser(); return R.ok(slVolumeProductionRkService.gethuojRkList(gethuojRkQuery)); } @@ -49,7 +53,7 @@ @PostMapping("/addSlVolumeProductionRk") @ApiOperation(value = "添加入库批次管理") - public R addVolumeProductionRkgl(@RequestBody Map<String, List<SlVolumeProductionRkListDTO>> slVolumeProductionRkListDTO1) { + public R addVolumeProductionRkgl(@RequestBody Map<String, List<SlVolumeProductionRkListDTO>> slVolumeProductionRkListDTO1) {tokenService.getLoginUser(); List<SlVolumeProductionRkListDTO> schools = slVolumeProductionRkListDTO1.get("slVolumeProductionRkListDTO"); slVolumeProductionRkService.addVolumeProductionRkgl(schools); return R.ok(); @@ -57,7 +61,7 @@ @PostMapping("/uplSlVolumeProductionRk") @ApiOperation(value = "修改入库批次管理") - public R uplSlVolumeProductionRk(@RequestBody UpdateRKDTO slVolumeProductionRkDTOS) { + public R uplSlVolumeProductionRk(@RequestBody UpdateRKDTO slVolumeProductionRkDTOS) {tokenService.getLoginUser(); slVolumeProductionRkService.uplSlVolumeProductionRk(slVolumeProductionRkDTOS.getSlVolumeProductionRkDTOS()); return R.ok(); } @@ -66,6 +70,7 @@ @DeleteMapping("/{id}") public R<?> delStoreManagement( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id) { + tokenService.getLoginUser(); SlVolumeProductionRk byId = slVolumeProductionRkService.getById(id); byId.setDelFlag("1"); slVolumeProductionRkService.updateById(byId); @@ -75,25 +80,27 @@ @PostMapping("/getVolumeProductionRkgCode") @ApiOperation(value = "获取入库管理二维码") public R<PageDTO<getVolumeProductionRkgCodeVO>> getVolumeProductionRkgCode(@RequestBody VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) { + tokenService.getLoginUser(); return R.ok(slVolumeProductionRkService.getVolumeProductionRkgCode(volumeProductionRkgCodeQuery)); } - @PostMapping("/codeInfo/{id}") + @GetMapping("/codeInfo") @ApiOperation(value = "获取二维码样式") - public R<List<QRCodeVO>> codeInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) throws Exception { - - return R.ok(slVolumeProductionRkService.codeInfo(id)); + public R<List<QRCodeVO>> codeInfo(Long id,Integer count) throws Exception { + tokenService.getLoginUser(); + return R.ok(slVolumeProductionRkService.codeInfo(id,count)); } @PostMapping("/codeInfo1") @ApiOperation(value = "转移数据获取二维码样式") public R<List<QRCodeVO>> codeInfo( Long id,Long zyglId) throws Exception { - + tokenService.getLoginUser(); return R.ok(slVolumeProductionRkService.codeInfo1(id,zyglId)); } @PostMapping("/getSlvolumeVolumeProductionRkList") @ApiOperation(value = "分页获取通过入库管理ID当前批次入库的物资") public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlvolumeVolumeProductionRkList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) { + tokenService.getLoginUser(); return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO)); } @@ -101,8 +108,15 @@ @PostMapping("/getroductionRkList") @ApiOperation(value = "分页获取通过仓库管理ID和仓库层数和货架获取前批次入库的物资") public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList(@RequestBody umeProductionRkQuery meProductionRkQuery) { + tokenService.getLoginUser(); return R.ok(slVolumeProductionRkService.getroductionRkList(meProductionRkQuery)); } + @PostMapping("/getroductionRkList1") + @ApiOperation(value = "分页获取通过仓库管理ID和仓库层数和货架获取前批次入库的物资") + public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList1(@RequestBody umeProductionRkQueryA meProductionRkQuery) { + tokenService.getLoginUser(); + return R.ok(slVolumeProductionRkService.getroductionRkList1(meProductionRkQuery)); + } } -- Gitblit v1.7.1