From 9f1e1bbdfa9d8d3b747a50ea2f2a3432c7c06639 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 八月 2025 18:07:00 +0800
Subject: [PATCH] 修改销售管理-回款登记,金额不许超过发票金额

---
 src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java |   17 ++++++++---------
 1 files changed, 8 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 a7281f0..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,19 +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) {
-        boolean save = warehouseService.save(warehouse);
-        return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+        return warehouseService.save(warehouse) ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
     }
 
     @PostMapping("/update")
@@ -52,7 +52,6 @@
     @Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody List<Long> ids) {
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
-        boolean remove = warehouseService.deleteByIds(ids);
-        return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+        return warehouseService.deleteByIds(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
     }
 }

--
Gitblit v1.9.3