From 145580fd820bb31334f2e71643413e846b7ce904 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 30 十月 2026 15:53:20 +0800
Subject: [PATCH] feat:统计内容1-8页

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java |   80 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 70 insertions(+), 10 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 57f2256..7752fe4 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
@@ -18,6 +18,7 @@
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -35,6 +36,7 @@
  * @author syt
  * @date 2026-04-29 11:32:05
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class OutBoundServiceImpl extends ServiceImpl<OutBoundMapper, OutBound> implements OutBoundService {
@@ -43,7 +45,7 @@
 	private final ContractSubjectMatterMapper contractSubjectMatterMapper;
 	private final PaymentConfirmMapper paymentConfirmMapper;
 	private final ContractMapper contractMapper;
-	private final ContractPaymentScheduleProcessMapper scheduleProcessMapper;
+	private final ProductMapper productMapper;
 	private final ContractOutBoundMapper contractOutBoundMapper;
 	private final DeliveryOverdueMapper deliveryOverdueMapper;
 	private final StringRedisTemplate redisTemplate;
@@ -57,6 +59,9 @@
 
 	@Value("${dept.smjzt}")
 	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
 
 	@Value("${dept.sgb}")
 	private String sgb;
@@ -111,7 +116,8 @@
 		addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
 			OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
 			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
-					StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+					StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+					StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
 				outBound.setBatchNumber(generateSMJContractCKNo());
 			}
 			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -425,6 +431,7 @@
 		contractOutBound.setLineNo(subjectMatter.getLineNo());
 		contractOutBound.setInvoiceStatus("0");
 		contractOutBound.setInvoiceNum(new BigDecimal("0"));
+		contractOutBound.setUnitPrice(subjectMatter.getUnitPrice());
 		contractOutBoundMapper.insert(contractOutBound);
 		if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
 			// 1. 纭畾鐢ㄤ簬姣旇緝鐨勫熀鍑嗘棩鏈燂紙浼樺厛绾э細璁″垝浜よ揣鏃ユ湡 > 鍚堝悓鍒版湡鏃ユ湡锛�
@@ -465,8 +472,9 @@
 			return r;
 		}
 		Contract contract = r.getData();
+		String batchNumber = genBatchNumber();
 		//鍑哄簱
-		handleOutBound(contract, addDTO);
+		handleOutBound(batchNumber,contract, addDTO);
 
 		//淇濆瓨璧勯噾鏄庣粏
 		BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
@@ -474,7 +482,7 @@
 		contract.setOutBoundAmout(outBoundAmount);
 		updateContractSchedule(contract);
 
-		return R.ok();
+		return R.ok(batchNumber);
 	}
 
 	private void updateContractSchedule(Contract contract) {
@@ -505,7 +513,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()));
@@ -543,11 +552,12 @@
 		return outAmount;
 	}
 
-	private void handleOutBound(Contract contract, OutBoundAddDTO addDTO) {
+	private void handleOutBound(String batchNumber,Contract contract, OutBoundAddDTO addDTO) {
 		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"));
@@ -571,7 +581,6 @@
 			subjectMatter.setActualDeliveryDate(addDTO.getOutBoundTime());
 			contractSubjectMatterMapper.updateById(subjectMatter);
 			//淇濆瓨erp鍑哄簱
-			String batchNumber = genBatchNumber();
 			Long outBoundId = saveErpOutBound(contract, addDTO, outSubjectMatterAddDTO, batchNumber);
 			//淇濆瓨鍚堝悓鍑哄簱璁板綍
 			saveContractOutBound(contract, addDTO, subjectMatter, outBoundId);
@@ -580,7 +589,8 @@
 
 	private String genBatchNumber() {
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
-				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
 			return generateSMJContractCKNo();
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -609,6 +619,22 @@
 		outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
 		outBound.setSubjectMatterCode(outSubjectMatterAddDTO.getSubjectMatterCode());
 		outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
+		List<String> smjList = new ArrayList<>();
+		smjList.add(smj);
+		smjList.add(smjhw);
+		if (("" + SecurityUtils.getUser().getCompId()).equals(smj)||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.in(Product::getCompId, smjList).last("limit 1"));
+			if (ObjUtil.isNotNull(product) ) {
+				outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
+			}
+		} else {
+			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+			if (ObjUtil.isNotNull(product) ) {
+				outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
+			}
+		}
 		outBound.setOutBoundType("1");
 		if (StrUtil.isEmpty(addDTO.getOutBoundType())) {
 			outBound.setOutBoundType("0");
@@ -620,6 +646,10 @@
 	private R<Contract> vailParam(OutBoundAddDTO addDTO) {
 		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();
@@ -652,7 +682,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)) {
@@ -828,4 +859,33 @@
 		baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
 		return R.ok();
 	}
+
+	@Override
+	public R addContractOutSgb(OutBoundAddDTO addDTO) {
+		String batchNumber = "";
+
+		if (StrUtil.isNotBlank(addDTO.getOutBoundCode())){
+			batchNumber = addDTO.getOutBoundCode();
+		}else {
+			batchNumber = genBatchNumber();
+		}
+		log.info("鍑哄簱鍗曞彿:{}",batchNumber);
+		//鏍¢獙鍙傛暟
+		R<Contract> r = vailParam(addDTO);
+		if (!r.isOk()) {
+			return r;
+		}
+		Contract contract = r.getData();
+
+		//鍑哄簱
+		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