From c15e67c83394c1734eb4e9802d8f343c6076efc1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 13 五月 2026 16:16:45 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java
index 8ad55fe..ddf4a57 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java
@@ -9,7 +9,7 @@
import com.ruoyi.account.service.AccountSalesService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
-import com.ruoyi.sales.mapper.ShippingInfoMapper;
+import com.ruoyi.stock.mapper.StockOutRecordMapper;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -28,30 +28,30 @@
@RequiredArgsConstructor
public class AccountSalesServiceImpl implements AccountSalesService {
- private final ShippingInfoMapper shippingInfoMapper;
+ private final StockOutRecordMapper stockOutRecordMapper;
private final ReturnManagementMapper returnManagementMapper;
@Override
- public IPage<SalesOutboundVo> listPageByOutbound(Page page, SalesOutboundDto salesOutboundDto) {
- return shippingInfoMapper.listPageByOutbound(page,salesOutboundDto);
+ public IPage<SalesOutboundVo> listPageAccountSales(Page page, SalesOutboundDto salesOutboundDto) {
+ return stockOutRecordMapper.listPageAccountSales(page,salesOutboundDto);
}
@Override
public void exportAccountSalesOutbound(HttpServletResponse response, SalesOutboundDto salesOutboundDto) {
- List<SalesOutboundVo> list = shippingInfoMapper.listPageByOutbound(new Page(1,-1),salesOutboundDto).getRecords();
+ List<SalesOutboundVo> list = stockOutRecordMapper.listPageAccountSales(new Page(1,-1),salesOutboundDto).getRecords();
ExcelUtil<SalesOutboundVo> util = new ExcelUtil<>(SalesOutboundVo.class);
util.exportExcel(response, list , "閿�鍞嚭搴�");
}
@Override
- public IPage<SalesReturnVo> listPageBySalesReturn(Page page, SalesReturnDto salesReturnDto) {
- return returnManagementMapper.listPageBySalesReturn(page,salesReturnDto);
+ public IPage<SalesReturnVo> listPageAccountSalesReturn(Page page, SalesReturnDto salesReturnDto) {
+ return returnManagementMapper.listPageAccountSalesReturn(page,salesReturnDto);
}
@Override
public void exportAccountSalesReturn(HttpServletResponse response, SalesReturnDto salesReturnDto) {
- List<SalesReturnVo> list = returnManagementMapper.listPageBySalesReturn(new Page(1,-1),salesReturnDto).getRecords();
+ List<SalesReturnVo> list = returnManagementMapper.listPageAccountSalesReturn(new Page(1,-1),salesReturnDto).getRecords();
ExcelUtil<SalesReturnVo> util = new ExcelUtil<>(SalesReturnVo.class);
util.exportExcel(response, list , "閿�鍞��璐�");
}
--
Gitblit v1.9.3