From 1ff109bd137b60db59d460994cfb868e46068b19 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 15:43:46 +0800
Subject: [PATCH] fix(accountSales accountPurchase): 财务管理的销售出库和销售退货和采购入库和采购退货
---
src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java | 16 +-
src/main/java/com/ruoyi/account/service/AccountPurchaseService.java | 27 +++
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 29 +++
src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java | 6
src/main/java/com/ruoyi/stock/mapper/StockOutRecordMapper.java | 3
src/main/java/com/ruoyi/account/controller/AccountSalesController.java | 12
src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java | 4
src/main/java/com/ruoyi/account/service/impl/AccountPurchaseServiceImpl.java | 59 +++++++
src/main/java/com/ruoyi/account/service/AccountSalesService.java | 4
src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java | 2
src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java | 48 ++++++
src/main/java/com/ruoyi/account/bean/vo/PurchaseReturnVo.java | 48 ++++++
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 29 ---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 27 +++
src/main/java/com/ruoyi/account/controller/AccounPurchaseController.java | 68 ++++++++
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 25 +++
src/main/java/com/ruoyi/account/bean/dto/PurchaseReturnDto.java | 26 +++
src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java | 26 +++
src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java | 4
src/main/java/com/ruoyi/stock/mapper/StockInRecordMapper.java | 4
20 files changed, 414 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java b/src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java
new file mode 100644
index 0000000..6ca07a4
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java
@@ -0,0 +1,26 @@
+package com.ruoyi.account.bean.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@Schema(name = "PurchaseInboundDto", description = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处(浼犲弬)")
+public class PurchaseInboundDto {
+
+ @Schema(description = "鍏ュ簱鍗曞彿")
+ private String inboundBatches;
+
+ @Schema(description = "渚涘簲鍟�")
+ private String supplierName;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/PurchaseReturnDto.java b/src/main/java/com/ruoyi/account/bean/dto/PurchaseReturnDto.java
new file mode 100644
index 0000000..d521422
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/PurchaseReturnDto.java
@@ -0,0 +1,26 @@
+package com.ruoyi.account.bean.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@Schema(name = "PurchaseReturnDto", description = "璐㈠姟绠＄悊--閲囪喘閫�璐у彴璐�(浼犲弬)")
+public class PurchaseReturnDto {
+
+ @Schema(description = "閫�璐у崟鍙�")
+ private String returnNo;
+
+ @Schema(description = "渚涘簲鍟�")
+ private String supplierName;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java
new file mode 100644
index 0000000..934502a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java
@@ -0,0 +1,48 @@
+package com.ruoyi.account.bean.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Schema(name = "PurchaseInboundVo", description = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class PurchaseInboundVo {
+
+ @Schema(description = "鍏ュ簱鍗昳d")
+ private Long id;
+
+ @Schema(description = "鍏ュ簱鍗曞彿")
+ @Excel(name = "鍏ュ簱鍗曞彿")
+ private String inboundBatches;
+
+ @Schema(description = "渚涘簲鍟�")
+ @Excel(name = "渚涘簲鍟�")
+ private String supplierName;
+
+ @Schema(description = "鍏ュ簱鏃ユ湡")
+ @Excel(name = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date InboundDate;
+
+ @Schema(description = "浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "浜у搧瑙勬牸")
+ @Excel(name = "浜у搧瑙勬牸")
+ private String specificationModel;
+
+ @Schema(description = "閲戦")
+ @Excel(name = "閲戦")
+ private BigDecimal InboundAmount;
+
+ @Schema(description = "閲囪喘璁㈠崟鍙�")
+ @Excel(name = "閲囪喘璁㈠崟鍙�")
+ private String purchaseContractNumber;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/PurchaseReturnVo.java b/src/main/java/com/ruoyi/account/bean/vo/PurchaseReturnVo.java
new file mode 100644
index 0000000..e912993
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/PurchaseReturnVo.java
@@ -0,0 +1,48 @@
+package com.ruoyi.account.bean.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Schema(name = "PurchaseReturnVo", description = "璐㈠姟绠＄悊--閲囪喘閫�璐у彴璐�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class PurchaseReturnVo {
+
+ @Schema(description = "閫�璐у崟id")
+ private Long id;
+
+ @Excel(name = "閫�璐у崟鍙�")
+ @Schema(description = "閫�璐у崟鍙�")
+ private String returnNo;
+
+ @Schema(description = "渚涘簲鍟�")
+ @Excel(name = "渚涘簲鍟�")
+ private String supplierName;
+
+ @Schema(description = "鍏宠仈鍏ュ簱鍗曞彿")
+ @Excel(name = "鍏宠仈鍏ュ簱鍗曞彿")
+ private String inboundBatches;
+
+ @Schema(description = "閫�璐ф棩鏈�")
+ @Excel(name = "閫�璐ф棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime preparedAt;
+
+ @Schema(description = "閫�娆炬�婚")
+ @Excel(name = "閫�娆炬�婚")
+ private BigDecimal totalAmount;
+
+ @Schema(description = "閫�璐ф柟寮�")
+ @Excel(name = "閫�璐ф柟寮�")
+ private String returnType;
+
+ @Schema(description = "閲囪喘璁㈠崟鍙�")
+ @Excel(name = "閲囪喘璁㈠崟鍙�")
+ private String purchaseContractNumber;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java
index cfc0a68..5ccdb5b 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java
@@ -38,9 +38,9 @@
@Excel(name = "浜у搧瑙勬牸")
private String specificationModel;
- @Schema(description = "鍑哄簱鏁伴噺")
- @Excel(name = "鍑哄簱鏁伴噺")
- private BigDecimal stockOutNum;
+ @Schema(description = "閲戦")
+ @Excel(name = "閲戦")
+ private BigDecimal outboundAmount;
@Schema(description = "鍙戣揣缂栧彿")
@Excel(name = "鍙戣揣缂栧彿")
diff --git a/src/main/java/com/ruoyi/account/controller/AccounPurchaseController.java b/src/main/java/com/ruoyi/account/controller/AccounPurchaseController.java
new file mode 100644
index 0000000..d1993ea
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/AccounPurchaseController.java
@@ -0,0 +1,68 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.PurchaseInboundDto;
+import com.ruoyi.account.bean.dto.PurchaseReturnDto;
+import com.ruoyi.account.bean.vo.PurchaseInboundVo;
+import com.ruoyi.account.bean.vo.PurchaseReturnVo;
+import com.ruoyi.account.service.AccountPurchaseService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊鐨勯噰璐儴鍒� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-07 04:45:30
+ */
+@RestController
+@RequestMapping("/accountPurchase")
+@RequiredArgsConstructor
+@Tag(name = "璐㈠姟绠＄悊鐨勯噰璐儴鍒�")
+public class AccounPurchaseController {
+
+ private final AccountPurchaseService accountPurchaseService;
+
+ @GetMapping("/listPageAccountPurchase")
+ @Log(title = "閲囪喘鍏ュ簱鍙拌处", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处")
+ public R<IPage<PurchaseInboundVo>> listPageAccountPurchase(Page page, PurchaseInboundDto purchaseInboundDto) {
+ IPage<PurchaseInboundVo> listPage = accountPurchaseService.listPageAccountPurchase(page,purchaseInboundDto);
+ return R.ok(listPage);
+ }
+
+ @PostMapping("/exportAccountPurchaseInbound")
+ @Operation(summary = "瀵煎嚭閲囪喘鍏ュ簱鏂囦欢")
+ @Log(title = "瀵煎嚭閲囪喘鍏ュ簱鏂囦欢", businessType = BusinessType.EXPORT)
+ public void exportAccountPurchaseInbound(HttpServletResponse response, PurchaseInboundDto purchaseInboundDto) {
+ accountPurchaseService.exportAccountPurchaseInbound(response,purchaseInboundDto);
+ }
+
+ @GetMapping("/listPageAccountPurchaseReturn")
+ @Log(title = "閲囪喘閫�璐у彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--閲囪喘閫�璐у彴璐�")
+ public R<IPage<PurchaseReturnVo>> listPageAccountPurchaseReturn(Page page, PurchaseReturnDto purchaseReturnDto) {
+ IPage<PurchaseReturnVo> listPage = accountPurchaseService.listPageAccountPurchaseReturn(page,purchaseReturnDto);
+ return R.ok(listPage);
+ }
+
+ @PostMapping("/exportAccountPurchaseReturn")
+ @Operation(summary = "瀵煎嚭閲囪喘閫�璐ф枃浠�")
+ @Log(title = "瀵煎嚭閲囪喘閫�璐ф枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountPurchaseReturn(HttpServletResponse response,PurchaseReturnDto purchaseReturnDto) {
+ accountPurchaseService.exportAccountPurchaseReturn(response,purchaseReturnDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountSalesController.java b/src/main/java/com/ruoyi/account/controller/AccountSalesController.java
index 5fb5e4f..bca90db 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountSalesController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountSalesController.java
@@ -35,11 +35,11 @@
private final AccountSalesService accountSalesService;
- @GetMapping("/listPageByOutbound")
+ @GetMapping("/listPageAccountSales")
@Log(title = "閿�鍞嚭搴撳彴璐�", businessType = BusinessType.OTHER)
@Operation(summary = "璐㈠姟绠＄悊--閿�鍞嚭搴撳彴璐�")
- public R<IPage<SalesOutboundVo>> listPageByOutbound(Page page, SalesOutboundDto salesOutboundDto) {
- IPage<SalesOutboundVo> listPage = accountSalesService.listPageByOutbound(page,salesOutboundDto);
+ public R<IPage<SalesOutboundVo>> listPageAccountSales(Page page, SalesOutboundDto salesOutboundDto) {
+ IPage<SalesOutboundVo> listPage = accountSalesService.listPageAccountSales(page,salesOutboundDto);
return R.ok(listPage);
}
@@ -50,11 +50,11 @@
accountSalesService.exportAccountSalesOutbound(response,salesOutboundDto);
}
- @GetMapping("/listPageByReturn")
+ @GetMapping("/listPageAccountSalesReturn")
@Log(title = "閿�鍞��璐у彴璐�", businessType = BusinessType.OTHER)
@Operation(summary = "璐㈠姟绠＄悊--閿�鍞��璐у彴璐�")
- public R<IPage<SalesReturnVo>> listPageBySalesReturn(Page page, SalesReturnDto salesReturnDto) {
- IPage<SalesReturnVo> listPage = accountSalesService.listPageBySalesReturn(page,salesReturnDto);
+ public R<IPage<SalesReturnVo>> listPageAccountSalesReturn(Page page, SalesReturnDto salesReturnDto) {
+ IPage<SalesReturnVo> listPage = accountSalesService.listPageAccountSalesReturn(page,salesReturnDto);
return R.ok(listPage);
}
diff --git a/src/main/java/com/ruoyi/account/service/AccountPurchaseService.java b/src/main/java/com/ruoyi/account/service/AccountPurchaseService.java
new file mode 100644
index 0000000..386f921
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/AccountPurchaseService.java
@@ -0,0 +1,27 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.PurchaseInboundDto;
+import com.ruoyi.account.bean.dto.PurchaseReturnDto;
+import com.ruoyi.account.bean.vo.PurchaseInboundVo;
+import com.ruoyi.account.bean.vo.PurchaseReturnVo;
+import jakarta.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊鐨勯攢鍞儴鍒� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-07 04:45:30
+ */
+public interface AccountPurchaseService {
+ IPage<PurchaseInboundVo> listPageAccountPurchase(Page page, PurchaseInboundDto purchaseInboundDto);
+
+ void exportAccountPurchaseInbound(HttpServletResponse response, PurchaseInboundDto purchaseInboundDto);
+
+ IPage<PurchaseReturnVo> listPageAccountPurchaseReturn(Page page, PurchaseReturnDto purchaseReturnDto);
+
+ void exportAccountPurchaseReturn(HttpServletResponse response, PurchaseReturnDto purchaseReturnDto);
+}
diff --git a/src/main/java/com/ruoyi/account/service/AccountSalesService.java b/src/main/java/com/ruoyi/account/service/AccountSalesService.java
index 930c5dd..7db5416 100644
--- a/src/main/java/com/ruoyi/account/service/AccountSalesService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountSalesService.java
@@ -18,11 +18,11 @@
*/
public interface AccountSalesService {
- IPage<SalesOutboundVo> listPageByOutbound(Page page, SalesOutboundDto salesOutboundDto);
+ IPage<SalesOutboundVo> listPageAccountSales(Page page, SalesOutboundDto salesOutboundDto);
void exportAccountSalesOutbound(HttpServletResponse response, SalesOutboundDto salesOutboundDto);
- IPage<SalesReturnVo> listPageBySalesReturn(Page page, SalesReturnDto salesReturnDto);
+ IPage<SalesReturnVo> listPageAccountSalesReturn(Page page, SalesReturnDto salesReturnDto);
void exportAccountSalesReturn(HttpServletResponse response, SalesReturnDto salesReturnDto);
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountPurchaseServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountPurchaseServiceImpl.java
new file mode 100644
index 0000000..747f6cf
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountPurchaseServiceImpl.java
@@ -0,0 +1,59 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.PurchaseInboundDto;
+import com.ruoyi.account.bean.dto.PurchaseReturnDto;
+import com.ruoyi.account.bean.vo.PurchaseInboundVo;
+import com.ruoyi.account.bean.vo.PurchaseReturnVo;
+import com.ruoyi.account.service.AccountPurchaseService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.stock.mapper.StockInRecordMapper;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊鐨勯攢鍞儴鍒� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-07 04:45:30
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountPurchaseServiceImpl implements AccountPurchaseService {
+
+ private final StockInRecordMapper stockInRecordMapper;
+
+ private final PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+
+
+ @Override
+ public IPage<PurchaseInboundVo> listPageAccountPurchase(Page page, PurchaseInboundDto purchaseInboundDto) {
+ return stockInRecordMapper.listPageAccountPurchase(page,purchaseInboundDto);
+ }
+
+ @Override
+ public void exportAccountPurchaseInbound(HttpServletResponse response, PurchaseInboundDto purchaseInboundDto) {
+ List<PurchaseInboundVo> list = stockInRecordMapper.listPageAccountPurchase(new Page(1,-1),purchaseInboundDto).getRecords();
+ ExcelUtil<PurchaseInboundVo> util = new ExcelUtil<>(PurchaseInboundVo.class);
+ util.exportExcel(response, list , "閲囪喘鍏ュ簱");
+ }
+
+ @Override
+ public IPage<PurchaseReturnVo> listPageAccountPurchaseReturn(Page page, PurchaseReturnDto purchaseReturnDto) {
+ return purchaseReturnOrdersMapper.listPageAccountPurchaseReturn(page,purchaseReturnDto);
+ }
+
+ @Override
+ public void exportAccountPurchaseReturn(HttpServletResponse response, PurchaseReturnDto purchaseReturnDto) {
+ List<PurchaseReturnVo> list = purchaseReturnOrdersMapper.listPageAccountPurchaseReturn(new Page(1,-1),purchaseReturnDto).getRecords();
+ ExcelUtil<PurchaseReturnVo> util = new ExcelUtil<>(PurchaseReturnVo.class);
+ util.exportExcel(response, list , "閲囪喘閫�璐�");
+ }
+}
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 , "閿�鍞��璐�");
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
index ec1693e..5c6504b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
@@ -25,5 +25,5 @@
ReturnManagementDto getReturnManagementDtoById(Long id);
- IPage<SalesReturnVo> listPageBySalesReturn(Page page, @Param("req") SalesReturnDto salesReturnDto);
+ IPage<SalesReturnVo> listPageAccountSalesReturn(Page page, @Param("req") SalesReturnDto salesReturnDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
index c6f55b7..f3a5fdf 100644
--- a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
+++ b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.PurchaseReturnDto;
+import com.ruoyi.account.bean.vo.PurchaseReturnVo;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -23,4 +25,6 @@
IPage<PurchaseReturnOrderHasAllInfoDto> listPage(Page page, @Param("params") PurchaseReturnOrderDto purchaseReturnOrder);
PurchaseReturnOrderHasAllInfoDto getPurchaseReturnOrderHasAllInfoById(@Param("id") @NotNull Long id);
+
+ IPage<PurchaseReturnVo> listPageAccountPurchaseReturn(Page page, @Param("req") PurchaseReturnDto purchaseReturnDto);
}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
index 57b142d..7f3c701 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.bean.dto.SalesOutboundDto;
-import com.ruoyi.account.bean.vo.SalesOutboundVo;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
@@ -24,6 +22,4 @@
List<SalesLedgerProductDto> getReturnManagementDtoById(@Param("shippingId")Long shippingId);
List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
-
- IPage<SalesOutboundVo> listPageByOutbound(Page page, @Param("req") SalesOutboundDto salesOutboundDto);
}
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockInRecordMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockInRecordMapper.java
index afc30ae..4dd64c7 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockInRecordMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockInRecordMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.PurchaseInboundDto;
+import com.ruoyi.account.bean.vo.PurchaseInboundVo;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.execl.StockInRecordExportData;
import com.ruoyi.stock.pojo.StockInRecord;
@@ -14,4 +16,6 @@
IPage<StockInRecordDto> listPage(Page page, @Param("params") StockInRecordDto stockInRecordDto);
List<StockInRecordExportData> listStockInRecordExportData(@Param("params") StockInRecordDto stockInRecordDto);
+
+ IPage<PurchaseInboundVo> listPageAccountPurchase(Page page, @Param("req") PurchaseInboundDto purchaseInboundDto);
}
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockOutRecordMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockOutRecordMapper.java
index d180ef9..eb05e8c 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockOutRecordMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockOutRecordMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.SalesOutboundDto;
+import com.ruoyi.account.bean.vo.SalesOutboundVo;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.execl.StockOutRecordExportData;
import com.ruoyi.stock.pojo.StockOutRecord;
@@ -25,4 +27,5 @@
List<StockOutRecordExportData> listStockOutRecordExportData(@Param("params") StockOutRecordDto stockOutRecordDto);
+ IPage<SalesOutboundVo> listPageAccountSales(Page page, @Param("req") SalesOutboundDto salesOutboundDto);
}
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 77435ad..dca2c47 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -53,4 +53,29 @@
<include refid="getPurchaseReturnOrderHasAllInfoFormAndColumn"/>
where pro.id = #{id}
</select>
+ <select id="listPageAccountPurchaseReturn"
+ resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo">
+ select pro.id,
+ pro.no returnNo,
+ sm.supplier_name,
+
+ pro.prepared_at,
+ pro.total_amount,
+ CASE pro.return_type WHEN 0 THEN '閫�璐ч��娆�' WHEN 1 THEN '鎷掓敹' END AS returnType,
+ pl.purchase_contract_number
+ from purchase_return_orders pro
+ left join supplier_manage sm on pro.supplier_id = sm.id
+ left join purchase_ledger pl on pro.purchase_ledger_id = pl.id
+ where rm.status=1
+ <if test="req.returnNo != null and req.returnNo != ''">
+ and pro.no like concat('%',#{req.returnNo},'%')
+ </if>
+ <if test="req.supplierName != null and req.supplierName != ''">
+ and sm.supplier_name like concat('%',#{req.supplierName},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND DATE_FORMAT(pro.prepared_at, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+ </if>
+ order by pro.id DESC
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index cd7dc3e..048bb23 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -87,33 +87,4 @@
left join sales_ledger sl on si.sales_ledger_id = sl.id
where si.status = '宸插彂璐�' and sl.customer_name = #{customerName}
</select>
- <select id="listPageByOutbound" resultType="com.ruoyi.account.bean.vo.SalesOutboundVo">
- SELECT
- sor.id,
- sor.outbound_batches,
- sl.customer_name,
- s.shipping_date,
- p.product_name,
- slp.specification_model,
- slp.stock_out_num,
- s.shipping_no,
- sl.sales_contract_no
- FROM shipping_info s
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
- left join product_model pm on slp.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- left join stock_out_record sor on sor.record_id = s.id and sor.record_type='13'
- WHERE s.status='宸插彂璐�'
- <if test="req.outboundBatches != null and req.outboundBatches != ''">
- AND sor.outbound_batches LIKE CONCAT('%',#{req.outboundBatches},'%')
- </if>
- <if test="req.customerName != null and req.customerName != ''">
- AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
- </if>
- <if test="req.startDate != null and req.endDate != null">
- AND s.shipping_date BETWEEN #{startDate} AND #{endDate}
- </if>
- order by sor.id DESC
- </select>
</mapper>
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 62f1d19..c0e08af 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -70,4 +70,31 @@
</where>
order by sir.id desc
</select>
+ <select id="listPageAccountPurchase" resultType="com.ruoyi.account.bean.vo.PurchaseInboundVo">
+ SELECT
+ sir.id,
+ sir.inbound_batches,
+ pl.supplier_name,
+ DATE(sir.create_time) AS inboundDate,
+ p.product_name,
+ slp.specification_model,
+ sor.stock_in_num * slp.tax_inclusive_unit_price as InboundAmount,
+ pl.purchase_contract_number
+ FROM stock_in_record sir
+ LEFT JOIN purchase_ledger pl ON sir.record_id = pl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = pl.id and slp.type = 2
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ WHERE sir.approval_status=1 and sir.record_type='7'
+ <if test="req.inboundBatches != null and req.inboundBatches != ''">
+ AND sir.inbound_batches LIKE CONCAT('%',#{req.inboundBatches},'%')
+ </if>
+ <if test="req.supplierName != null and req.supplierName != ''">
+ AND pl.supplier_name LIKE CONCAT('%',#{req.supplierName},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND DATE(sir.create_time) BETWEEN #{startDate} AND #{endDate}
+ </if>
+ order by sir.id DESC
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 8615294..b4619d8 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -86,4 +86,33 @@
order by sor.id desc
</select>
+ <select id="listPageAccountSales" resultType="com.ruoyi.account.bean.vo.SalesOutboundVo">
+ SELECT
+ sor.id,
+ sor.outbound_batches,
+ sl.customer_name,
+ s.shipping_date,
+ p.product_name,
+ slp.specification_model,
+ sor.stock_out_num * slp.tax_inclusive_unit_price as outboundAmount,
+ s.shipping_no,
+ sl.sales_contract_no
+ FROM stock_out_record sor
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ WHERE s.status='宸插彂璐�' and sor.record_type='13'
+ <if test="req.outboundBatches != null and req.outboundBatches != ''">
+ AND sor.outbound_batches LIKE CONCAT('%',#{req.outboundBatches},'%')
+ </if>
+ <if test="req.customerName != null and req.customerName != ''">
+ AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND s.shipping_date BETWEEN #{startDate} AND #{endDate}
+ </if>
+ order by sor.id DESC
+ </select>
</mapper>
--
Gitblit v1.9.3