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/SlGoodsShelfController.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
index ae97127..fed1eb9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
@@ -3,12 +3,14 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlGoodsMaterials;
 import com.ruoyi.management.domain.SlGoodsShelf;
 import com.ruoyi.management.domain.SlStoreManagement;
 import com.ruoyi.management.domain.SlStoreManagementImg;
 import com.ruoyi.management.domain.dto.*;
 import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
 import com.ruoyi.management.service.SlGoodsShelfService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,7 @@
  */
 @RestController
 @RequestMapping("/sl-goods-shelf")
+@Api(value = "货架管理", tags = "货架管理", description = "货架管理")
 public class SlGoodsShelfController {
 
     @Resource
@@ -44,11 +47,19 @@
         return R.ok();
     }
 
-    @ApiOperation("删除仓库管理")
+    @GetMapping("/SlGoodsShelf/{id}")
+    @ApiOperation(value = "货架管理详情")
+    public R<SlGoodsShelfVO> getSlGoodsShelfOne(@ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) {
+        return R.ok(slGoodsShelfService.getSlGoodsShelfOne(id));
+    }
+
+    @ApiOperation("删除货架")
     @DeleteMapping("/{id}")
     public R<?> delStoreManagement(
-            @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) {
-        slGoodsShelfService.removeById(id);
+            @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) {
+        SlGoodsShelf byId = slGoodsShelfService.getById(id);
+        byId.setDelFlag("1");
+        slGoodsShelfService.updateById(byId);
         return R.ok();
     }
 
@@ -66,9 +77,15 @@
     }
 
     @PostMapping("/getStoreManagementimgSheif")
-    @ApiOperation(value = "獲取仓库管理平面圖的仓库")
+    @ApiOperation(value = "获取仓库管理平面圖的货架")
     public R<List<SlGoodsShelf>> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO) {
         return R.ok(slGoodsShelfService.getStoreManagementimgSheif(goodsShelfDTO));
     }
 
+    @PostMapping("/getGoodsSheManagementlfList")
+    @ApiOperation(value = "分页通过仓库和层数货架表管理")
+    public R<List<SlGoodsShelf>> getGoodsSheManagementlfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery) {
+        return R.ok(slGoodsShelfService.getGoodsSheManagementlfList(slGoodsShelfQuery));
+    }
+
 }

--
Gitblit v1.7.1