From cc9dcfec975f6a10121be67eac6d029d159b9460 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 20 十月 2026 14:19:42 +0800
Subject: [PATCH] feat:长期协议,不定期新增单位,标的物 历史导入标的物,根据接口查询 石煤机乙方总公司选总公司 和 分公司 银行流水加 时间拉取 流水数据 产品加拉取按钮 盖章件关闭控制

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 7579123..29eaa91 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -510,7 +510,8 @@
 		for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
 			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 					.eq(ContractSubjectMatter::getContractId, contract.getId())
-					.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
 					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
 					.last("limit 1"));
 			outAmount = outAmount.add(outSubjectMatterAddDTO.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
@@ -552,7 +553,8 @@
 		addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
 			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 					.eq(ContractSubjectMatter::getContractId, contract.getId())
-					.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
 					.ne(ContractSubjectMatter::getDeliveryStatus, 2)
 					.eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
 					.last("limit 1"));
@@ -626,6 +628,10 @@
 		if (CollUtil.isEmpty(addDTO.getSubjectMatterList())) {
 			return R.failed("鍑哄簱鏍囩殑鐗╀笉鑳戒负绌�");
 		}
+		if (addDTO.getSubjectMatterList().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getSubjectMatterCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
+		}
 		// 1. 纭畾鏌ヨ鐢ㄧ殑鍚堝悓缂栧彿瀛楁鍊�
 		String targetContractNo = addDTO.getContractNo();
 		boolean isSgbAndEmptyOutbound = StrUtil.isEmpty(addDTO.getOutBoundType())
@@ -657,7 +663,8 @@
 		for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
 			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 					.eq(ContractSubjectMatter::getContractId, contract.getId())
-					.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
 					.eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
 					.last("limit 1"));
 			if (ObjUtil.isNull(subjectMatter)) {
@@ -833,4 +840,25 @@
 		baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
 		return R.ok();
 	}
+
+	@Override
+	public R addContractOutSgb(OutBoundAddDTO addDTO) {
+		//鏍¢獙鍙傛暟
+		R<Contract> r = vailParam(addDTO);
+		if (!r.isOk()) {
+			return r;
+		}
+		Contract contract = r.getData();
+		String batchNumber = genBatchNumber();
+		//鍑哄簱
+		handleOutBound(batchNumber,contract, addDTO);
+
+		//淇濆瓨璧勯噾鏄庣粏
+		BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
+		//鏇存柊鍚堝悓鐘舵�佸強闃舵
+		contract.setOutBoundAmout(outBoundAmount);
+		updateContractSchedule(contract);
+
+		return R.ok(batchNumber);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1