From 2dd645b5346f510d1207346347f1fa70a204d9d3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:34 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化，补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联，支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入，支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典，完善操作日志及附件下载。
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index 644cea9..5aebb76 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+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;
@@ -25,27 +25,27 @@
@GetMapping("/listById")
@Operation(summary = "鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+ public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@PostMapping("/add")
@Operation(summary = "鍟嗗搧璐ф灦-娣诲姞")
@Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- return R.ok(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
+ public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
+ return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
}
@PutMapping("/update")
@Operation(summary = "鍟嗗搧璐ф灦-鏇存柊")
@Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- return R.ok(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
+ public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
+ return AjaxResult.success(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
}
@DeleteMapping("/delete")
@Operation(summary = "鍟嗗搧璐ф灦-鍒犻櫎")
@Log(title = "鍟嗗搧璐ф灦-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(warehouseGoodsShelvesService.deleteByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(warehouseGoodsShelvesService.deleteByIds(ids));
}
}
--
Gitblit v1.9.3