From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 fed1eb9..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
@@ -40,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) {
@@ -64,11 +70,21 @@
}
@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")
@ApiOperation(value = "货架放置到图片")
public R fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO) {
--
Gitblit v1.7.1