From ad663df3b38b873d79fff48570dfb56b69697ac6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:06:56 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 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 c9b1d0e..4c2ed56 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,6 +3,7 @@
 
 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;
@@ -27,7 +28,7 @@
  */
 @RestController
 @RequestMapping("/sl-goods-shelf")
-@Api(value = "货架接口", tags = "货架接口", description = "货架接口")
+@Api(value = "货架管理", tags = "货架管理", description = "货架管理")
 public class SlGoodsShelfController {
 
     @Resource
@@ -39,6 +40,12 @@
         return R.ok(slGoodsShelfService.getGoodsShelfList(slGoodsShelfQuery));
     }
 
+    @PostMapping("/getBGoodsShelfList")
+    @ApiOperation(value = "分页不获货架表管理")
+    public R<List<SlGoodsShelf>> getBGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery) {
+        return R.ok(slGoodsShelfService.getBGoodsShelfList(slGoodsShelfQuery));
+    }
+
     @PostMapping("/addSlGoodsShelf")
     @ApiOperation(value = "添加/修改货架管理")
     public R addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO) {
@@ -46,18 +53,36 @@
         return R.ok();
     }
 
+    @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();
     }
 
     @PostMapping("/wfanzGoodsShelfList")
-    @ApiOperation(value = "货架获取未放置")
+    @ApiOperation(value = "货架获放置")
     public R<List<SlGoodsShelf>> wfanzGoodsShelfList(@RequestBody GoodsShelfQuery goodsShelfQuery) {
         return R.ok(slGoodsShelfService.wfanzGoodsShelfList(goodsShelfQuery));
+    }
+
+    @PostMapping("/wfanzGoodsShelfListDel/{id}")
+    @ApiOperation(value = "货架获放置删除")
+    public R wfanzGoodsShelfListDel(
+            @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id){
+        SlGoodsShelf byId = slGoodsShelfService.getById(id);
+        byId.setIsStoreManagement(1);
+        slGoodsShelfService.updateById(byId);
+        return R.ok();
     }
 
     @PostMapping("/fanzGoodsShelfList")
@@ -68,7 +93,7 @@
     }
 
     @PostMapping("/getStoreManagementimgSheif")
-    @ApiOperation(value = "获取仓库管理平面圖的仓库")
+    @ApiOperation(value = "获取仓库管理平面圖的货架")
     public R<List<SlGoodsShelf>> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO) {
         return R.ok(slGoodsShelfService.getStoreManagementimgSheif(goodsShelfDTO));
     }

--
Gitblit v1.7.1