From b33e6f53dd537abaebad066de12474580fcc33b2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 21 八月 2025 15:03:14 +0800
Subject: [PATCH] Merge branch 'pim_ywx'
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index 64eefd2..bed5510 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -8,6 +8,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import io.swagger.annotations.Api;
@@ -23,42 +24,31 @@
public class WarehouseGoodsShelvesController extends BaseController {
@Autowired
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
- @GetMapping("/listPage")
- @ApiOperation("鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ")
- @Log(title = "鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, WarehouseGoodsShelves warehouseGoodsShelves) {
- IPage<WarehouseGoodsShelves> listPage = warehouseGoodsShelvesService.listPage(page, warehouseGoodsShelves);
- return AjaxResult.success(listPage);
- }
@GetMapping("/listById")
@ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listById(Long warehouseId) {
- List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
- .eq(WarehouseGoodsShelves::getWarehouseId, warehouseId));
+ public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+ List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
return AjaxResult.success(list);
}
@PostMapping("/add")
@ApiOperation("鍟嗗搧璐ф灦-娣诲姞")
@Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- boolean save = warehouseGoodsShelvesService.add(warehouseGoodsShelves);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
}
- @PostMapping("/update")
+ @PutMapping("/update")
@ApiOperation("鍟嗗搧璐ф灦-鏇存柊")
@Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- boolean update = warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves);
- return update ? AjaxResult.success("鏇存柊鎴愬姛") : AjaxResult.error("鏇存柊澶辫触");
+ return AjaxResult.success(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
}
@DeleteMapping("/delete")
@ApiOperation("鍟嗗搧璐ф灦-鍒犻櫎")
@Log(title = "鍟嗗搧璐ф灦-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- boolean remove = warehouseGoodsShelvesService.deleteByIds(ids);
- return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return AjaxResult.success(warehouseGoodsShelvesService.deleteByIds(ids));
}
}
--
Gitblit v1.9.3