From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 01 八月 2024 14:26:56 +0800 Subject: [PATCH] 代码提交 bug解决 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 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 b6d25c1..130e02d 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 @@ -5,9 +5,7 @@ import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlVolumeProductionRk; import com.ruoyi.management.domain.dto.*; -import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; -import com.ruoyi.management.domain.vo.VolumeProductionRkgInventoryVO; -import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO; +import com.ruoyi.management.domain.vo.*; import com.ruoyi.management.service.SlVolumeProductionRkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,6 +37,15 @@ public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlGoodsMaterialsSlVolumeProductionRkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkDTO) { return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO)); } + + + @PostMapping("/gethuojRkList") + @ApiOperation(value = "分页获取通过货架来获取当前批次入库的物资") + public R<PageDTO<gethuojRkVO>> gethuojRkList(@RequestBody gethuojRkQuery gethuojRkQuery) { + return R.ok(slVolumeProductionRkService.gethuojRkList(gethuojRkQuery)); + } + + @PostMapping("/addSlVolumeProductionRk") @ApiOperation(value = "添加入库批次管理") @@ -73,8 +80,9 @@ @PostMapping("/codeInfo/{id}") @ApiOperation(value = "获取二维码样式") - public R<ManagementimgVolumeProductionRkVO> codeInfo( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id){ - return R.ok(slVolumeProductionRkService.codeInfo(id)); + public R<List<QRCodeVO>> codeInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id){ + slVolumeProductionRkService.codeInfo(id); + return R.ok(); } @PostMapping("/getSlvolumeVolumeProductionRkList") -- Gitblit v1.7.1