From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index 18b4fa6..dbe8971 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
-import org.apache.ibatis.annotations.Param;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -18,7 +19,7 @@
* @param receiptPayment
* @return
*/
- int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment);
+ int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPayment);
/**
* 鍥炴鐧昏淇敼
@@ -77,4 +78,26 @@
* 鏌ヨ鍥炴璁板綍鍒嗛〉
*/
IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 瀹㈡埛寰�鏉ヨ褰曟煡璇�
+ * @param receiptPaymentDto
+ * @return
+ */
+ List<InvoiceLedgerDto> customerInteractions (InvoiceLedgerDto receiptPaymentDto);
+
+ /**
+ * 鏌ヨ鍥炴璁板綍鍒嗛〉
+ */
+ List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 鍏ㄥ鍑哄洖娆惧垪琛�
+ */
+ void exportPaymentList(HttpServletResponse response);
+
+ /**
+ * 閮ㄥ垎瀵煎嚭鍥炴鍒楄〃
+ */
+ void exportPaymentList(HttpServletResponse response, List<Long> ids);
}
--
Gitblit v1.9.3