From 7bbce72b03664f56400fe7e70e8dcd4ea737a8da Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 02 八月 2024 14:19:30 +0800 Subject: [PATCH] 代码提交 bug解决 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java index 51b4e74..fcd96c2 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlVolumeProductionCk; import com.ruoyi.management.domain.dto.*; +import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO; import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO; import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO; import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; @@ -33,7 +34,11 @@ @Resource private SlVolumeProductionCkService slVolumeProductionCkService; - + @PostMapping("/getMaterialByManagementIdList") + @ApiOperation(value = "发起出库 根据仓库Id 选择物资") + public R<PageDTO<InventoriesSuppliesInfoVO>> getMaterialByManagementIdList(@RequestBody GetMaterialsByManagementIdQuery query) { + return R.ok(slVolumeProductionCkService.getMaterialByManagementIdList(query)); + } @PostMapping("/getManagementimgSlVolumeProductionCkList") @ApiOperation(value = "分页获取通过物资来获取当前批次出库的物资") public R<PageDTO<ManagementimgSlVolumeProductionCkVO>> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) { @@ -43,15 +48,15 @@ @PostMapping("/addSlVolumeProductionCk") @ApiOperation(value = "添加出库") - public R addSlVolumeProductionCk(@RequestBody AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO) { - slVolumeProductionCkService.addSlVolumeProductionCk(addSlVolumeProductionCkDTO); + public R addSlVolumeProductionCk(@RequestBody ADDCKGLDTO addckgldto ) { + slVolumeProductionCkService.addSlVolumeProductionCk(addckgldto.getAddSlVolumeProductionCkDTO()); return R.ok(); } @PostMapping("/updSlVolumeProductionCk") @ApiOperation(value = "修改出库") - public R updSlVolumeProductionCk(@RequestBody List<SlVolumeProductionCkDTO> slVolumeProductionCkDTO) { - slVolumeProductionCkService.updSlVolumeProductionCk(slVolumeProductionCkDTO); + public R updSlVolumeProductionCk(@RequestBody ADDCKGLDTO addckgldto ) { + slVolumeProductionCkService.updSlVolumeProductionCk(addckgldto.getAddSlVolumeProductionCkDTO()); return R.ok(); } @@ -71,7 +76,9 @@ @DeleteMapping("/{id}") public R<?> delStoreManagement( @ApiParam(name = "id", value = "出库批次id", required = true) @PathVariable("id") Integer id) { - slVolumeProductionCkService.removeById(id); + SlVolumeProductionCk byId = slVolumeProductionCkService.getById(id); + byId.setDelFlag("1"); + slVolumeProductionCkService.updateById(byId); return R.ok(); } } -- Gitblit v1.7.1