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/SlVolumeProductionZyController.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java index 1b87f65..ad47960 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java @@ -3,11 +3,10 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.management.domain.SlVolumeProductionZy; import com.ruoyi.management.domain.dto.*; -import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO; -import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO; -import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO; -import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO; +import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO; +import com.ruoyi.management.domain.vo.*; import com.ruoyi.management.service.SlVolumeProductionZyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * <p> @@ -32,6 +32,11 @@ @Resource private SlVolumeProductionZyService slVolumeProductionZyService; + @PostMapping("/getNumberAndShelfByManagementId") + @ApiOperation(value = "根据仓库id 查询楼层和货架") + public R<NumberAndShelfVO> getNumberAndShelfByManagementId(@RequestBody QueryDTO dto) { + return R.ok(slVolumeProductionZyService.getNumberAndShelfByManagementId(dto)); + } @PostMapping("/getVolumeProductionzyCode") @ApiOperation(value = "获取转移管理二维码") public R<PageDTO<getVolumeProductionzyCodeVO>> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) { @@ -47,7 +52,7 @@ @PostMapping("/updSlVolumeProductionZy") @ApiOperation(value = "修改转移") - public R updSlVolumeProductionZy(@RequestBody UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO) { + public R updSlVolumeProductionZy(@RequestBody List<UpdaddSlVolumeProductionZyDTO> updaddSlVolumeProductionZyDTO) { slVolumeProductionZyService.updSlVolumeProductionZy(updaddSlVolumeProductionZyDTO); return R.ok(); } @@ -62,7 +67,9 @@ @DeleteMapping("/{id}") public R<?> delStoreManagement( @ApiParam(name = "id", value = "转移批次id", required = true) @PathVariable("id") Integer id) { - slVolumeProductionZyService.removeById(id); + SlVolumeProductionZy byId = slVolumeProductionZyService.getById(id); + byId.setDelFlag("1"); + slVolumeProductionZyService.updateById(byId); return R.ok(); } -- Gitblit v1.7.1