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/sales/controller/SalesLedgerProductController.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index f487aea..9485919 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -7,6 +7,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.AjaxResult;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.procurementrecord.service.ProcurementRecordService;
 import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -45,9 +46,9 @@
      * 鍥炴鐧昏鍒嗛〉鏌ヨ
      */
     @GetMapping("/listPageSalesLedger")
-    public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+    public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
         IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
-        return R.ok(list);
+        return AjaxResult.success(list);
     }
 
 
@@ -55,9 +56,9 @@
      * 浠樻鐧昏鍒嗛〉鏌ヨ
      */
     @GetMapping("/listPagePurchaseLedger")
-    public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+    public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
         IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
-        return R.ok(list);
+        return AjaxResult.success(list);
     }
 
 
@@ -65,10 +66,10 @@
      * 鏌ヨ浜у搧淇℃伅鍒楄〃
      */
     @GetMapping("/list")
-    public R<?> list(SalesLedgerProduct salesLedgerProduct) {
+    public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
         List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
         if (CollUtil.isEmpty(list)) {
-            return R.ok(list);
+            return AjaxResult.success(list);
         }
         List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
         List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
@@ -93,7 +94,7 @@
             item.setReturnQuality(returnQuality);
             item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
         });
-        return R.ok(list);
+        return AjaxResult.success(list);
     }
 
     /**
@@ -112,9 +113,9 @@
      * 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
      */
     @GetMapping(value = "/{id}")
-    public R<?> getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return R.ok(salesLedgerProductService.selectSalesLedgerProductById(id));
+        return success(salesLedgerProductService.selectSalesLedgerProductById(id));
     }
 
     /**
@@ -122,10 +123,9 @@
      */
     @Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
     @PostMapping  ("/addOrUpdateSalesLedgerProduct")
-    public R<?> add(@RequestBody SalesLedgerProduct salesLedgerProduct)
+    public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
     {
-        salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct);
-        return R.ok();
+        return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
     }
 
     /**
@@ -133,13 +133,12 @@
      */
     @Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
 	@DeleteMapping("/delProduct")
-    public R<?> remove(@RequestBody Long[] ids)
+    public AjaxResult remove(@RequestBody Long[] ids)
     {
         if (ids == null || ids.length == 0) {
-            return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
-        salesLedgerProductService.deleteSalesLedgerProductByIds(ids);
-        return R.ok();
+        return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
     }
 
     //鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻

--
Gitblit v1.9.3