From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 45fe997..0876334 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -1,14 +1,16 @@
package com.ruoyi.warehouse.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.AjaxResult;
-
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.ruoyi.warehouse.pojo.Warehouse;
+import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.annotations.Api;
@@ -25,22 +27,26 @@
public class WarehouseController extends BaseController {
@Autowired
private WarehouseService warehouseService;
-
-
- @GetMapping("/listPage")
+ @GetMapping("/tree")
+ @ApiOperation("浠撳簱-鏌ヨ鏍�")
+ @Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
+ public AjaxResult listTree() {
+ return AjaxResult.success(warehouseService.findListTree());
+ }
+ @GetMapping("/list")
@ApiOperation("浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage( Warehouse warehouse) {
- return AjaxResult.success(warehouseService.listPage( warehouse));
+ public AjaxResult list(Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.findList(warehouse));
}
@PostMapping("/add")
@ApiOperation("浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Warehouse warehouse) {
- return warehouseService.save(warehouse) ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return AjaxResult.success(warehouseService.save(warehouse));
}
- @PostMapping("/update")
+ @PutMapping("/update")
@ApiOperation("浠撳簱-鏇存柊")
@Log(title = "浠撳簱-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Warehouse warehouse) {
@@ -52,6 +58,6 @@
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return warehouseService.deleteByIds(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return AjaxResult.success(warehouseService.deleteByIds(ids));
}
}
--
Gitblit v1.9.3