From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index ceb3702..dfca752 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -10,7 +10,6 @@
 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.ruoyi.framework.web.domain.R;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.sales.dto.InvoiceLedgerDto;
@@ -67,7 +66,7 @@
     @Log(title = "瀵煎叆閿�鍞彴璐�", businessType = BusinessType.INSERT)
     @PostMapping("/import")
     @Operation(summary = "瀵煎叆閿�鍞彴璐�")
-    public AjaxResult importData(@RequestParam("file")
+    public R<?> importData(@RequestParam("file")
                                  @ApiParam(value = "Excel鏂囦欢", required = true)
                                  MultipartFile file) {
         return salesLedgerService.importData(file);
@@ -183,8 +182,9 @@
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
     @PostMapping("/addOrUpdateSalesLedger")
-    public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
-        return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
+    public R<?> add(@RequestBody SalesLedgerDto salesLedgerDto) {
+        salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto);
+        return R.ok();
     }
 
     /**
@@ -192,11 +192,12 @@
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
     @DeleteMapping("/delLedger")
-    public AjaxResult remove(@RequestBody Long[] ids) {
+    public R<?> remove(@RequestBody Long[] ids) {
         if (ids == null || ids.length == 0) {
-            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+            return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
-        return toAjax(salesLedgerService.deleteSalesLedgerByIds(ids));
+        salesLedgerService.deleteSalesLedgerByIds(ids);
+        return R.ok();
     }
 
     /**
@@ -206,9 +207,9 @@
      * @return
      */
     @GetMapping("/listNoPage")
-    public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
+    public R<?> listNoPage(SalesLedgerDto salesLedgerDto) {
         List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     /**
@@ -216,23 +217,24 @@
      */
     @Log(title = "閿�鍞彴璐﹂檮浠跺垹闄�", businessType = BusinessType.DELETE)
     @DeleteMapping("/delLedgerFile")
-    public AjaxResult delLedgerFile(@RequestBody Long[] ids) {
+    public R<?> delLedgerFile(@RequestBody Long[] ids) {
         if (ids == null || ids.length == 0) {
-            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+            return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
-        return toAjax(commonFileService.deleteSalesLedgerByIds(ids));
+        commonFileService.deleteSalesLedgerByIds(ids);
+        return R.ok();
     }
 
     /**
      * 鏈湀閿�鍞悎鍚岄噾棰�
      */
     @GetMapping("/getContractAmount")
-    public AjaxResult getContractAmount() {
+    public R<?> getContractAmount() {
         try {
             BigDecimal contractAmount = salesLedgerService.getContractAmount();
-            return AjaxResult.success(contractAmount != null ? contractAmount : BigDecimal.ZERO);
+            return R.ok(contractAmount != null ? contractAmount : BigDecimal.ZERO);
         } catch (Exception e) {
-            return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+            return R.fail("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
         }
     }
 
@@ -240,16 +242,16 @@
      * 瀹㈡埛鍚堝悓閲戦TOP5缁熻
      */
     @GetMapping("/getTopFiveList")
-    public AjaxResult getTopFiveList() {
-        return AjaxResult.success(salesLedgerService.getTopFiveList());
+    public R<?> getTopFiveList() {
+        return R.ok(salesLedgerService.getTopFiveList());
     }
 
     /**
      * 杩戝崐骞村紑绁�,鍥炴閲戦
      */
     @GetMapping("/getAmountHalfYear")
-    public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
-        return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
+    public R<?> getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+        return R.ok(salesLedgerService.getAmountHalfYear(type));
     }
 
     /**

--
Gitblit v1.9.3