From b5d5cb947a194ceb34cd2797ab077f1484989305 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 11:39:31 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_New_pro_财务

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java |   52 +++++++++++-----------------------------------------
 1 files changed, 11 insertions(+), 41 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..6d45432 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,18 +1,16 @@
 package com.ruoyi.sales.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 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;
 import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
 import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
-import com.ruoyi.sales.dto.SalesLedgerProductDto;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import com.ruoyi.sales.service.ISalesLedgerProductService;
 import jakarta.servlet.http.HttpServletResponse;
@@ -42,45 +40,19 @@
 
 
     /**
-     * 鍥炴鐧昏鍒嗛〉鏌ヨ
-     */
-    @GetMapping("/listPageSalesLedger")
-    public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
-        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
-        return R.ok(list);
-    }
-
-
-    /**
-     * 浠樻鐧昏鍒嗛〉鏌ヨ
-     */
-    @GetMapping("/listPagePurchaseLedger")
-    public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
-        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
-        return R.ok(list);
-    }
-
-
-    /**
      * 鏌ヨ浜у搧淇℃伅鍒楄〃
      */
     @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);
         Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getProductModelId, item -> item.getSumReturnQuantity()));
 
         list.forEach(item -> {
-            if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
-                item.setFutureTickets(BigDecimal.ZERO);
-            }
-            if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
-                item.setFutureTicketsAmount(BigDecimal.ZERO);
-            }
             if (item.getApproveStatus() != 2) {
                 if (item.getHasSufficientStock() == 0) {
                     item.setApproveStatus(0);
@@ -93,7 +65,7 @@
             item.setReturnQuality(returnQuality);
             item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
         });
-        return R.ok(list);
+        return AjaxResult.success(list);
     }
 
     /**
@@ -112,9 +84,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 +94,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 +104,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