From db0b39fdde2904e31b7cd07e7a353cf537421b0c Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期五, 26 七月 2024 09:44:29 +0800 Subject: [PATCH] 森林防火 供应商管理 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java index 27e7db8..73b0f09 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java @@ -5,13 +5,12 @@ import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlGoodsMaterials; import com.ruoyi.management.domain.SlStoreManagement; -import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO; -import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery; -import com.ruoyi.management.domain.dto.SlGoodsShelfDTO; -import com.ruoyi.management.domain.dto.SlGoodsShelfQuery; +import com.ruoyi.management.domain.dto.*; import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; +import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO; import com.ruoyi.management.service.SlGoodsMaterialsService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; @@ -28,6 +27,7 @@ */ @RestController @RequestMapping("/sl-goods-materials") +@Api(value = "物资管理接口", tags = "物资管理接口", description = "物资管理接口") public class SlGoodsMaterialsController { @Resource private SlGoodsMaterialsService slGoodsMaterialsService; @@ -48,15 +48,23 @@ @ApiOperation("删除物资管理") @DeleteMapping("/{id}") public R<?> delStoreManagement( - @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) { - slGoodsMaterialsService.removeById(id); + @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) { + SlGoodsMaterials byId = slGoodsMaterialsService.getById(id); + byId.setDelFlag("1"); + slGoodsMaterialsService.updateById(byId); return R.ok(); } - @PostMapping("/getGoodSmaterialsOne") + @GetMapping("/getGoodSmaterialsOne/{id}") @ApiOperation(value = "物资管理詳情") - public R<SlGoodsMaterials> getGoodSmaterialsOne(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Integer id) { + public R<SlGoodsMaterials> getGoodSmaterialsOne(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Long id) { return R.ok(slGoodsMaterialsService.getById(id)); } + @PostMapping("/getStoreManagementGoodSmaterialsOne") + @ApiOperation(value = "库存管理查看详情") + public R<PageDTO<StoreManagementGoodSmaterialsVO>> getStoreManagementGoodSmaterialsOne(@RequestBody StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) { + return R.ok(slGoodsMaterialsService.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsQuery)); + } + } -- Gitblit v1.7.1