From 2e67b4a6d474c584daf2ab1ff1df9d785f902b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 8b675ee..45fe997 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -9,6 +9,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.Warehouse;
+import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,18 +26,18 @@
@Autowired
private WarehouseService warehouseService;
+
@GetMapping("/listPage")
- @ApiOperation("浠撳簱-鍒嗛〉鏌ヨ")
- @Log(title = "浠撳簱-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, Warehouse warehouse) {
- IPage<Warehouse> listPage = warehouseService.listPage(page, warehouse);
- return AjaxResult.success(listPage);
+ @ApiOperation("浠撳簱-鏌ヨ")
+ @Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPage( Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.listPage( warehouse));
}
@PostMapping("/add")
@ApiOperation("浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Warehouse warehouse) {
- return AjaxResult.success(warehouseService.save(warehouse));
+ return warehouseService.save(warehouse) ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
}
@PostMapping("/update")
@@ -51,6 +52,6 @@
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(warehouseService.deleteByIds(ids));
+ return warehouseService.deleteByIds(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
}
--
Gitblit v1.9.3