From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
index 60b0a37..55b75dd 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
@@ -107,6 +107,15 @@
 	}
 
 	/**
+	 * 鑾峰彇鍚堝苟寮�绁ㄥ悎鍚屽嚭搴撲俊鎭�
+	 * @return
+	 */
+	@PostMapping("/getMergeContractOutBound" )
+	public R getMergeContractOutBound(@RequestBody Long[] ids) {
+		return contractInvoiceService.getMergeContractOutBound(ids);
+	}
+
+	/**
 	 * 鐢熸垚寮�绁ㄩ瑙堜俊鎭�
 	 * @return
 	 */
@@ -116,6 +125,24 @@
 	}
 
 	/**
+	 * 鐢熸垚寮�绁ㄩ瑙堜俊鎭�
+	 * @return
+	 */
+	@PostMapping("/genMergeInvoiceInfo" )
+	public R genMergeInvoiceInfo(@RequestBody GenMergeInvoiceDTO mergeInvoiceDTO) {
+		return contractInvoiceService.genMergeInvoiceInfo(mergeInvoiceDTO);
+	}
+
+	/**
+	 * 寮�鍚堝苟钃濈エ
+	 * @return
+	 */
+	@PostMapping("/toMergeInvoice" )
+	public R toMergeInvoice(@RequestBody ToMergeInvoiceDTO toMergeInvoiceDTO) {
+		return contractInvoiceService.toMergeInvoice(toMergeInvoiceDTO);
+	}
+
+	/**
 	 * 寮�钃濈エ
 	 * @return
 	 */

--
Gitblit v1.9.1