From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新

---
 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index ebbd718..3290499 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -8,7 +8,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.framework.web.page.TableDataInfo;
 import com.ruoyi.purchase.dto.PurchaseLedgerDto;
 import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -67,7 +67,7 @@
     @Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
     @PostMapping("/import")
     @Operation(summary = "瀵煎叆閲囪喘鍙拌处")
-    public R<?> importData(@RequestParam("file")
+    public AjaxResult importData(@RequestParam("file")
                                  @ApiParam(value = "Excel鏂囦欢", required = true)
                                          MultipartFile file) {
         return purchaseLedgerService.importData(file);
@@ -151,9 +151,8 @@
      */
     @Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
     @PostMapping("/addOrEditPurchase")
-    public R<?> addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
-        purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto);
-        return R.ok();
+    public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
+        return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
     }
 
     /**
@@ -161,7 +160,7 @@
      */
     @Operation(summary = "/鏌ヨ閲囪喘妯℃澘")
     @GetMapping("/getPurchaseTemplateList")
-    public R<?> getPurchaseTemplateList() {
+    public AjaxResult getPurchaseTemplateList() {
         List<PurchaseLedgerTemplate>  purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
         purchaseLedgers.forEach(purchaseLedgerDto1 -> {
             LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
@@ -172,15 +171,14 @@
                 purchaseLedgerDto1.setProductList(list);
             }
         });
-        return R.ok(purchaseLedgers);
+        return AjaxResult.success(purchaseLedgers);
     }
     /**
      * 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
      */
     @PostMapping("/updateApprovalStatus")
-    public R<?> addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
-        purchaseLedgerService.updateById(purchaseLedger);
-        return R.ok();
+    public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+        return toAjax(purchaseLedgerService.updateById(purchaseLedger));
     }
     /**
      * 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
@@ -203,9 +201,8 @@
      */
     @Log(title = "閲囪喘鍙拌处", businessType = BusinessType.DELETE)
     @DeleteMapping("/delPurchase")
-    public R<?> remove(@RequestBody Long[] ids) {
-        purchaseLedgerService.deletePurchaseLedgerByIds(ids);
-        return R.ok();
+    public AjaxResult remove(@RequestBody Long[] ids) {
+        return toAjax(purchaseLedgerService.deletePurchaseLedgerByIds(ids));
     }
 
     /**
@@ -221,8 +218,8 @@
      * 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
      */
     @GetMapping("/getProductBySalesNo")
-    public R<?> getProductBySalesNo(Long id) {
-        return R.ok(purchaseLedgerService.getProductBySalesNo(id));
+    public AjaxResult getProductBySalesNo(Long id) {
+        return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
     }
 
     /**
@@ -237,8 +234,8 @@
      * 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
      */
     @GetMapping("/getPurchaseNoById")
-    public R<?> getPurchaseNoById(Long id) {
-        return R.ok(purchaseLedgerService.getPurchaseNoById(id));
+    public AjaxResult getPurchaseNoById(Long id) {
+        return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
     }
 
     /**
@@ -253,22 +250,22 @@
      * 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
      */
     @GetMapping("/getInfo")
-    public R<?> getInfo(PurchaseLedgerDto purchaseLedgerDto) {
-        return R.ok(purchaseLedgerService.getInfo(purchaseLedgerDto));
+    public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+        return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
     }
 
     /**
      * 鏌ヨ閲囪喘鍙拌处鍒楄〃
      */
     @GetMapping("/listPage")
-    public R<?> listPage(Page page, PurchaseLedgerDto purchaseLedger) {
-        return R.ok(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
+    public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
+        return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
     }
 
     @Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
     @GetMapping("/createPurchaseNo")
     @Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
-    public R<?> createPurchaseNo() {
-        return R.ok(purchaseLedgerService.getPurchaseNo(), "鐢熸垚鎴愬姛");
+    public AjaxResult createPurchaseNo() {
+        return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
     }
 }

--
Gitblit v1.9.3