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/ContractServiceImpl.java | 1204 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 1,068 insertions(+), 136 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index c14554a..4019a40 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -5,7 +5,6 @@
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -29,14 +28,15 @@
 import com.by4cloud.platformx.business.entity.*;
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
-import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
 import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
 import com.by4cloud.platformx.business.utils.BatchInsertListener;
 import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
 import com.by4cloud.platformx.business.utils.NetworkFileToBase64;
 import com.by4cloud.platformx.business.vo.*;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.datascope.DataScope;
+import com.by4cloud.platformx.common.excel.vo.ErrorMessage;
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
 import com.deepoove.poi.XWPFTemplate;
@@ -49,6 +49,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -94,12 +95,20 @@
 	private final ContractPaymentScheduleProcessService processService;
 	private final ContractSubjectMatterChangeMapper changeMapper;
 	private final ContractApprovalMapper contractApprovalMapper;
+	private final TaxCodeMapper taxCodeMapper;
+	private final ContractSubjectMatterService contractSubjectMatterService;
 
 	@Value("${erp.ymj}")
 	private String ymjErp;
 
 	@Value("${erp.smj}")
 	private String smjErp;
+
+	@Value("${erp.smjsc}")
+	private String smjscErp;
+
+	@Value("${erp.smjzt}")
+	private String smjztErp;
 
 	@Value("${erp.sgb}")
 	private String sgbErp;
@@ -118,6 +127,9 @@
 
 	@Value("${dept.smjzt}")
 	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
 
 	@Value("${dept.sgb}")
 	private String sgb;
@@ -149,8 +161,10 @@
 	@Override
 	public R add(ContractAddDTO addDTO) {
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
-		contract.setPartyBId(SecurityUtils.getUser().getCompId());
-		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (!StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")&&!StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")) {
+			contract.setPartyBId(SecurityUtils.getUser().getCompId());
+			contract.setPartyB(SecurityUtils.getUser().getCompName());
+		}
 		if (StrUtil.isEmpty(addDTO.getPartyA())) {
 			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
 			if (ObjUtil.isNotNull(bc)) {
@@ -196,7 +210,8 @@
 		}
 
 		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)) {
 			contract.setContractNo(generateSMJContractNo());
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -320,7 +335,8 @@
 		contract.setBillingAmout(new BigDecimal("0"));
 		contract.setNickName(SecurityUtils.getUser().getNickname());
 		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)) {
 			contract.setContractNo(generateSMJContractNo());
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -515,12 +531,13 @@
 		requestApply.put("fd_settlementType", "00");
 		requestApply.put("fd_applyType", "澶栭攢");
 		if (CollUtil.isNotEmpty(subjectMatterList)) {
-			requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+			requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
 		}
 		requestApply.put("fd_docNumber", contract.getContractNo());
 //		requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
 		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)) {
 			requestApply.put("fd_templateId", tempSMJ);
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -538,16 +555,18 @@
 		requestApply.put("fd_name", contract.getContractName());
 		requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
 		requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
-		requestApply.put("fd_contractCreater", contract.getNickName());
+		requestApply.put("fd_contractCreater", SecurityUtils.getUser().getNickname());
 		requestApply.put("fd_currency", "浜烘皯甯�");
 		requestApply.put("fd_ContractAmount", contract.getAmount());
 		requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
 				.multiply(new BigDecimal("87")));
-		requestApply.put("fd_docStatus", "20");
+		requestApply.put("fd_docStatus", "10");
 		requestApply.put("fd_taxRates", 13);
 		requestApply.put("fd_customerName", contract.getPartyA());
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
+		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		requestApply.put("fd_summary",contract.getSummary());
 		JSONArray signList = new JSONArray();
 		JSONObject j = new JSONObject();
 		j.put("fd_standing","鐢�");
@@ -555,19 +574,48 @@
 		j.put("fd_signMain","2");
 		signList.add(j);
 		JSONObject y = new JSONObject();
-		y.put("fd_standing","鐢�");
+		y.put("fd_standing","涔�");
 		y.put("fd_Iden",comp.getOrgCode());
 		y.put("fd_signMain","1");
 		signList.add(y);
 		requestApply.put("fd_signList", signList);
-		JSONArray attList = new JSONArray();
-		JSONObject att = new JSONObject();
-		att.put("fd_attNum","1");
-		att.put("fd_attName",contract.getAttachmentName());
-		att.put("fd_attQuality","00");
-		att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
-		attList.add(att);
-		requestApply.put("attList", att);
+		if (StrUtil.isNotBlank(contract.getAttachmentUrl())) {
+			JSONArray attList = new JSONArray();
+			JSONObject att = new JSONObject();
+			att.put("fd_attNum", "1");
+			att.put("fd_attName", contract.getAttachmentName());
+			att.put("fd_attType", contract.getAttachmentName().substring(contract.getAttachmentName().lastIndexOf('.')+1));
+			att.put("fd_attQuality", "00");
+			att.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+			attList.add(att);
+			requestApply.put("attList", attList);
+		}
+		if (CollUtil.isNotEmpty(subjectMatterList)){
+			JSONArray materialList = new JSONArray();
+			subjectMatterList.stream().forEach(subjectMatter->{
+				JSONObject material = new JSONObject();
+				material.put("fd_materiaCode", subjectMatter.getMaterialCode());
+				material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
+				material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
+				material.put("fd_figureNumber", "");
+				material.put("fd_measureUnit", subjectMatter.getUnit());
+				material.put("fd_number", subjectMatter.getQuantity());
+				material.put("fd_price", subjectMatter.getUnitPrice());
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
+				if (ObjUtil.isNotNull(product)){
+					material.put("fd_rate", product.getTaxRate().toString());
+				}
+				material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+				material.put("fd_requirements", "");
+				material.put("fd_standard", "");
+				material.put("fd_factory", "");
+				material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
+				material.put("fd_delivery", "");
+				material.put("fd_des", "");
+				materialList.add(material);
+			});
+			requestApply.put("materialList", materialList);
+		}
 		log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
 		String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
 		log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
@@ -632,7 +680,7 @@
 				requestApply.put("fd_MainContent", "");
 				requestApply.put("fd_settlementType", "00");
 				requestApply.put("fd_applyType", "澶栭攢");
-				requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+				requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
 				requestApply.put("fd_docNumber", contract.getContractNo());
 				requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
 				requestApply.put("fd_name", contract.getContractName());
@@ -664,7 +712,7 @@
 					request.put("fd_receivedNum", 1);
 					request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
 					request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
-					request.put("fd_reviewerNo", contract.getNickName());
+					request.put("fd_reviewerNo", SecurityUtils.getUser().getNickname());
 					request.put("fd_docStatus", "20");
 					request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
 					request.put("fd_attName", contract.getAttachmentName());
@@ -722,33 +770,32 @@
 						});
 						request.put("details", subjectMatter);
 					}
-
-					JSONObject loginJson = new JSONObject();
-					loginJson.put("username", "admin");
-					loginJson.put("password", "admin123");
-					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
-					String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
-					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
-					JSONObject respJson = JSONObject.parseObject(loginResp);
-					if (respJson.getInteger("code") == 0) {
-						JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
-						log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
-						HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
-								.header("token", dataJson.getString("token"))       // 娣诲姞璁よ瘉澶�
-								.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
-								.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
-								.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
-						log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
-						//淇濆瓨璇锋眰璁板綍
-						saveErpRequestRecord("ymj", request.toJSONString(), response.body());
-						//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-						contract.setErpPushFlag("1");
-						baseMapper.updateById(contract);
+					String token = "";
+					if (redisTemplate.hasKey("YMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("YMJ_ERP_TOKEN");
+					} else {
+						token = getYmjErpToken();
 					}
+					if (StrUtil.isEmpty(token)){
+						log.error("涓�鐓ゆ満鐧诲綍鑾峰彇token澶辫触");
+						return;
+					}
+					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("ymj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
 
 				}
-				if ((StrUtil.equals(contract.getPartyBId() + "", smj) || StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
-						StrUtil.equals(contract.getPartyBId() + "", smjzt)) && StrUtil.isNotEmpty(smjErp)) {
+				if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
+						StrUtil.equals(contract.getPartyBId() + "", smjhw)) && StrUtil.isNotEmpty(smjErp)) {
 					request.put("customerCode", customer.getErpCompanyCode());
 					request.put("currencyId", "RMB");
 					request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
@@ -756,6 +803,7 @@
 					request.put("moneySum", contract.getAmount());
 					request.put("signManner", "闈㈢");
 					request.put("salesman", "");
+					request.put("tenantId", "tenant1");
 					if (CollUtil.isNotEmpty(subjectMatterList)) {
 						JSONArray subjectMatter = new JSONArray();
 						subjectMatterList.stream().forEach(contractSubjectMatter -> {
@@ -777,30 +825,139 @@
 						request.put("details", subjectMatter);
 					}
 
-					JSONObject loginJson = new JSONObject();
-					loginJson.put("username", "admin");
-					loginJson.put("password", "Zimafold@2026");
-					log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
-					String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
-					log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
-					JSONObject respJson = JSONObject.parseObject(loginResp);
-					if (respJson.getInteger("code") == 0) {
-						JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
-						log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
-						HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails")
-								.header("token", dataJson.getString("token"))       // 娣诲姞璁よ瘉澶�
-								.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
-								.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
-								.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
-						log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
-						//淇濆瓨璇锋眰璁板綍
-						saveErpRequestRecord("smj", request.toJSONString(), response.body());
-						//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-						contract.setErpPushFlag("1");
-						baseMapper.updateById(contract);
-					}
-				}
 
+					String token = "";
+					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+					} else {
+						token = getErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+						return;
+					}
+
+					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant1")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("smj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+				if (StrUtil.equals(contract.getPartyBId() + "", smjsc) && StrUtil.isNotEmpty(smjscErp)) {
+					request.put("customerCode", customer.getErpCompanyCode());
+					request.put("currencyId", "RMB");
+					request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+					request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+					request.put("moneySum", contract.getAmount());
+					request.put("signManner", "闈㈢");
+					request.put("salesman", "");
+					request.put("tenantId", "tenant2");
+					if (CollUtil.isNotEmpty(subjectMatterList)) {
+						JSONArray subjectMatter = new JSONArray();
+						subjectMatterList.stream().forEach(contractSubjectMatter -> {
+							JSONObject subjectMatterItem = new JSONObject();
+							subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+							subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+							subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+							subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+							Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+									.eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+							if (ObjUtil.isNotNull(product)) {
+								subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+							}
+							subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+									DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+									DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+							subjectMatter.add(subjectMatterItem);
+						});
+						request.put("details", subjectMatter);
+					}
+
+					String token = "";
+					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+					} else {
+						token = getErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+						return;
+					}
+
+					log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant2")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("smj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+				if (StrUtil.equals(contract.getPartyBId() + "", smjzt) && StrUtil.isNotEmpty(smjztErp)) {
+					request.put("customerCode", customer.getErpCompanyCode());
+					request.put("currencyId", "RMB");
+					request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+					request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+					request.put("moneySum", contract.getAmount());
+					request.put("signManner", "闈㈢");
+					request.put("salesman", "");
+					request.put("tenantId", "tenant3");
+					if (CollUtil.isNotEmpty(subjectMatterList)) {
+						JSONArray subjectMatter = new JSONArray();
+						subjectMatterList.stream().forEach(contractSubjectMatter -> {
+							JSONObject subjectMatterItem = new JSONObject();
+							subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+							subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+							subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+							subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+							Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+									.eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+							if (ObjUtil.isNotNull(product)) {
+								subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+							}
+							subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+									DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+									DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+							subjectMatter.add(subjectMatterItem);
+						});
+						request.put("details", subjectMatter);
+					}
+
+					String token = "";
+					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+					} else {
+						token = getErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+						return;
+					}
+
+					log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(smjztErp + "/api/contract/v1/createWithDetails?tenantId=tenant3")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("smj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
 				if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
 					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
 					String result = HttpUtil.post(jxcErp, request.toJSONString());
@@ -822,6 +979,40 @@
 
 	}
 
+	private String getErpToken() {
+		JSONObject loginJson = new JSONObject();
+		loginJson.put("username", "admin");
+		loginJson.put("password", "Zimafold@2026");
+		log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+		String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
+		log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+		JSONObject respJson = JSONObject.parseObject(loginResp);
+		if (respJson.getInteger("code") == 0) {
+			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+			redisTemplate.opsForValue().set("SMJ_ERP_TOKEN",dataJson.getString("token"));
+			log.info("鐭崇叅鏈篹rp token涓猴細{}",dataJson.getString("token"));
+			return dataJson.getString("token");
+		}
+		return "";
+	}
+
+	private String getYmjErpToken(){
+		JSONObject loginJson = new JSONObject();
+		loginJson.put("username", "admin");
+		loginJson.put("password", "admin123");
+		log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+		String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
+		log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+		JSONObject respJson = JSONObject.parseObject(loginResp);
+		if (respJson.getInteger("code") == 0) {
+			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+			redisTemplate.opsForValue().set("YMJ_ERP_TOKEN",dataJson.getString("token"));
+			log.info("涓�鐓ゆ満erp token涓猴細{}",dataJson.getString("token"));
+			return dataJson.getString("token");
+		}
+		return "";
+	}
+
 	private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
 		//鏂板鍚堝悓灞ョ害璁板綍
 		ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
@@ -830,7 +1021,12 @@
 		process.setScheduleId(schedule.getId());
 		process.setScheduleName(schedule.getStageName());
 		process.setProcessDate(contract.getSignDate());
-		contractPaymentScheduleProcessMapper.insert(process);
+		ContractPaymentScheduleProcess lastProcess = contractPaymentScheduleProcessMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery()
+				.eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
+				.eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
+		if (ObjUtil.isNull(lastProcess)) {
+			contractPaymentScheduleProcessMapper.insert(process);
+		}
 	}
 
 	private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
@@ -984,6 +1180,7 @@
 				return;
 			}
 			currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+			currentConfim.setCompId(contract.getCompId());
 			paymentConfirmMapper.insert(currentConfim);
 			processService.handleBeforeRemain(currentConfim,contract);
 		}
@@ -1076,7 +1273,8 @@
 		newContract.setContractStatus(0);
 		newContract.setBillingAmout(new BigDecimal("0"));
 		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)) {
 			newContract.setContractNo(generateSMJContractNo());
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -1716,8 +1914,16 @@
 
 	@Override
 	public R addContractSgb(ContractAddDTO addDTO) {
+		Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, addDTO.getDataId()).last("limit 1"));
+		if (ObjUtil.isNotNull(contractOld)) {
+			return R.failed("鍚堝悓鏁版嵁ID锛歿}宸插瓨鍦紝涓嶈兘鏂板閲嶅鏁版嵁", addDTO.getDataId());
+		}
 		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
 		}
 		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
 			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
@@ -1773,7 +1979,19 @@
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+						.last("limit 1"));
+				if (ObjUtil.isNull(product)){
+					product = new Product();
+					product.setParentId(2101559148831944705L);
+					product.setProductName(subjectMatter.getMaterialInternalName());
+					product.setErpCode(subjectMatter.getMaterialCode());
+					product.setProductType(subjectMatter.getSpecification());
+					product.setTaxCode("1090117040000000000");
+					product.setTaxClass("娉�");
+					productMapper.insert(product);
+					subjectMatter.setMaterialInternalName(product.getId()+"");
+				}
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
 				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
@@ -1838,7 +2056,7 @@
 		}
 
 		//鎺ㄩ�佸悎鍚屼腑蹇�
-		pushCenter(contract.getId());
+//		pushCenter(contract.getId());
 		return R.ok(contract.getContractNo());
 	}
 
@@ -1846,6 +2064,10 @@
 	public R updateContractSgb(ContractUpdateDTO updateDTO) {
 		if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (updateDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
 		}
 		if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
 			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
@@ -1864,6 +2086,7 @@
 		}
 		Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
 		contract.setId(contractOld.getId());
+		contract.setContractNo(contractOld.getContractNo());
 		if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
 			contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
 		}
@@ -2069,6 +2292,15 @@
 
 		// 5. 鎷兼帴杩斿洖
 		return "ZB-GYB-" + dateStr + seqStr;
+	}
+
+	public String generateBranchContractNo(String mainNo) {
+		String key = mainNo;
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+		// 5. 鎷兼帴杩斿洖
+		return mainNo +"-"+ seqStr;
 	}
 
 	@Override
@@ -2351,7 +2583,8 @@
 		contract.setNickName(SecurityUtils.getUser().getNickname());
 
 		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)) {
 			contract.setContractNo(generateSMJContractNo());
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -2371,8 +2604,17 @@
 	}
 
 	@Override
-	public R pushCenter(Long id) {
-		Contract contract = baseMapper.selectById(id);
+	public R pushCenter(PushCenterDTO dto) {
+		Contract contract = baseMapper.selectById(dto.getId());
+
+		contract.setSelectionMethod(dto.getSelectionMethod());
+		contract.setIsRelated(dto.getIsRelated());
+		contract.setContractCreater(dto.getContractCreater());
+		if(StrUtil.isNotBlank(dto.getAttachmentUrl())) {
+			contract.setAttachmentName(dto.getAttachmentName());
+			contract.setAttachmentUrl(dto.getAttachmentUrl());
+		}
+		baseMapper.updateById(contract);
 
 		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
 		if (ObjUtil.isNull(customer)){
@@ -2386,20 +2628,21 @@
 		SysDept comp = r.getData();
 
 		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
-				.eq(ContractSubjectMatter::getContractId, id));
+				.eq(ContractSubjectMatter::getContractId, dto.getId()));
 		JSONObject requestApply = new JSONObject();
-		requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
-		requestApply.put("fd_isrelated", "鏄�");
+		requestApply.put("fd_selectionmethod", dto.getSelectionMethod());
+		requestApply.put("fd_isrelated", dto.getIsRelated());
 		requestApply.put("fd_bizId", contract.getId());
 		requestApply.put("fd_remark", contract.getRemark());
 		requestApply.put("fd_MainContent", "");
 		requestApply.put("fd_settlementType", "00");
 		requestApply.put("fd_applyType", "澶栭攢");
-		requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+		requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
 		requestApply.put("fd_docNumber", contract.getContractNo());
 
 		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)) {
 			requestApply.put("fd_templateId", tempSMJ);
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -2417,7 +2660,7 @@
 		requestApply.put("fd_name", contract.getContractName());
 		requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
 		requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
-		requestApply.put("fd_contractCreater", contract.getNickName());
+		requestApply.put("fd_contractCreater", StrUtil.isNotEmpty(dto.getContractCreater())?dto.getContractCreater():SecurityUtils.getUser().getNickname());
 		requestApply.put("fd_currency", "浜烘皯甯�");
 		requestApply.put("fd_ContractAmount", contract.getAmount());
 		requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
@@ -2427,6 +2670,8 @@
 		requestApply.put("fd_customerName", contract.getPartyA());
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
+		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		requestApply.put("fd_summary",contract.getSummary());
 		JSONArray signList = new JSONArray();
 		JSONObject j = new JSONObject();
 		j.put("fd_standing","鐢�");
@@ -2434,29 +2679,60 @@
 		j.put("fd_signMain","2");
 		signList.add(j);
 		JSONObject y = new JSONObject();
-		y.put("fd_standing","鐢�");
+		y.put("fd_standing","涔�");
 		y.put("fd_Iden",comp.getOrgCode());
 		y.put("fd_signMain","1");
 		signList.add(y);
 		requestApply.put("fd_signList", signList);
-		JSONArray attList = new JSONArray();
-		JSONObject att = new JSONObject();
-		att.put("fd_attNum","1");
-		att.put("fd_attName",contract.getAttachmentName());
-		att.put("fd_attQuality","00");
-		att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
-		attList.add(att);
-		requestApply.put("attList", att);
-		log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+		if(StrUtil.isNotBlank(contract.getAttachmentUrl())){
+			JSONArray attList = new JSONArray();
+			JSONObject att = new JSONObject();
+			att.put("fd_attNum","1");
+			att.put("fd_attName",contract.getAttachmentName());
+			att.put("fd_attQuality","00");
+			att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+			attList.add(att);
+			requestApply.put("attList", att);
+		}
+		if (CollUtil.isNotEmpty(subjectMatterList)){
+			JSONArray materialList = new JSONArray();
+			subjectMatterList.stream().forEach(subjectMatter->{
+				JSONObject material = new JSONObject();
+				material.put("fd_materiaCode", subjectMatter.getMaterialCode());
+				material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
+				material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
+				material.put("fd_figureNumber", "");
+				material.put("fd_measureUnit", subjectMatter.getUnit());
+				material.put("fd_number", subjectMatter.getQuantity());
+				material.put("fd_price", subjectMatter.getUnitPrice());
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
+				if (ObjUtil.isNotNull(product)){
+					material.put("fd_rate", product.getTaxRate().toString());
+				}
+				material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+				material.put("fd_requirements", "");
+				material.put("fd_standard", "");
+				material.put("fd_factory", "");
+				material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
+				material.put("fd_delivery", "");
+				material.put("fd_des", "");
+				materialList.add(material);
+			});
+			requestApply.put("materialList", materialList);
+		}
+		log.info("宸ヤ笟娉垫帹閫佲�斺�斿悎鍚屼腑蹇冨悎鍚岃捣鑽夋帴鍙e叆鍙傦細{}", requestApply.toJSONString());
 		String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
-		log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
+		log.info("宸ヤ笟娉垫帹閫佲�斺�斿悎鍚屼腑蹇冨悎鍚岃捣鑽夋帴鍙e洖鍙傦細{}", respApply);
 		JSONObject applyResp = JSONObject.parseObject(respApply);
 		if (applyResp.getString("code").equals("00")) {
 			contract.setCenterPushFlag("1");
 			baseMapper.updateById(contract);
+			//搴旀敹
+			takeEffect(contract.getId());
 			return R.ok();
 		}
-		return R.failed("鎺ㄩ�佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
+		log.error("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
+		return R.failed("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
 	}
 
 	@Override
@@ -2520,12 +2796,29 @@
 					errList.add(map);
 					continue;
 				}
-				BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
-						.eq(BusinessCustomer::getErpCompanyCode, contractExceVO.getBcErpCode()));
+				BusinessCustomer bc = null;
+				if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)
+						|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)){
+					List<String> smjList = new ArrayList<>();
+					smjList.add(smj);
+					smjList.add(smjsc);
+					smjList.add(smjzt);
+					smjList.add(smjhw);
+					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+							.in(BusinessCustomer::getCompId, smjList)
+							.last("limit 1"));
+				}else {
+					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+							.eq(BusinessCustomer::getCompId,SecurityUtils.getUser().getCompId())
+							.last("limit 1"));
+				}
+
 				if (ObjUtil.isNull(bc)) {
 					Map<String, String> map = new HashMap<String, String>();
 					map.put("lineNum", "绗�" + (i + 1) + "琛�");
-					map.put("errors", "瀹㈡埛erp缂栫爜涓嶅瓨鍦�");
+					map.put("errors", "瀹㈡埛鍚嶇О涓嶅瓨鍦�");
 					errList.add(map);
 					continue;
 				}
@@ -2605,11 +2898,15 @@
 				baseMapper.insert(contract);
 				BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
 				List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
-						StrUtil.isNotBlank(item.getMaterialCode()) &&
 								StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
 				if (CollUtil.isNotEmpty(resultMatter)) {
+					log.info("鍚堝悓缂栧彿锛歿},鏍囩殑鐗╀釜鏁�:{}",contract.getContractNo(),resultMatter.size());
 					for (ContractSubjectMatterExceVO subMatEx : resultMatter
 					) {
+						if (StrUtil.isBlank(subMatEx.getDataId())&&StrUtil.isBlank(subMatEx.getMaterialCode())){
+							log.error("鍚堝悓缂栧彿锛歿},鏍囩殑鐗�:{}鏍囩殑鐗ヾataId鍜宮aterialCode鍚屾椂涓虹┖",contract.getContractNo(),subMatEx.getMaterialName());
+							continue;
+						}
 						ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(subMatEx, ContractSubjectMatter.class);
 						subjectMatter.setContractId(contract.getId());
 						subjectMatter.setDeliveredQuantity(StrUtil.isBlank(subMatEx.getDeliveredQuantity())
@@ -2619,25 +2916,13 @@
 								: subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
 						subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 						contractSubjectMatterMapper.insert(subjectMatter);
-//						if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
-//							//鍑哄簱鍗�
-//							ContractOutBound outBound = new ContractOutBound();
-//							outBound.setBusGuestId(contract.getPartyAId());
-//							outBound.setBusGuestName(contract.getPartyA());
-//							outBound.setContractId(contract.getId());
-//							outBound.setContractName(contract.getContractName());
-//							outBound.setInvoiceNum(new BigDecimal("0"));
-//							outBound.setInvoiceStatus("0");
-//							outBound.setOutBoundTime(new Date());
-//							outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
-//							outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
-//							outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
-//							contractOutBoundMapper.insert(outBound);
-//							if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
-//								contract.setBillingStatus("2");
-//								baseMapper.updateById(contract);
-//							}
-//						}
+						if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+								StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+								StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+							if (StrUtil.isBlank(subMatEx.getMaterialCode())) {
+								handleProduct(subMatEx.getMaterialCode());
+							}
+						}
 
 					}
 				}
@@ -2700,6 +2985,154 @@
 		return R.ok();
 	}
 
+	private void handleProduct(String productCode) {
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			List<String> smjList = new ArrayList<>();
+			smjList.add(smj);
+			smjList.add(smjhw);
+			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+					.eq(Product::getErpCode, productCode)
+					.in(Product::getCompId, smjList)
+					.last("limit 1"));
+			if (ObjUtil.isNull(one)) {
+				JSONObject object = contractSubjectMatterService.syncProductBySMJ("tenant1", productCode);
+				if (ObjUtil.isNotNull(object)) {
+					Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+							.eq(Product::getProductName, object.getString("itemClassName"))
+							.eq(Product::getCompId, "2089995177814495234")
+							.last("limit 1")
+					);
+					if (ObjUtil.isNull(productClass)) {
+						log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+						productClass = new Product();
+						productClass.setProductName(object.getString("itemClassName"));
+						productClass.setErpCode(object.getString("itemClassName"));
+						productClass.setParentId(0L);
+						productClass.setCompId(2089995177814495234L);
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productClass);
+						log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+					}
+
+					log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+					Product productNew = new Product();
+					productNew.setProductName(object.getString("note"));
+					productNew.setErpCode(object.getString("itemNo"));
+					productNew.setProductType(object.getString("grade"));
+					productNew.setUnitName(object.getString("unitName"));
+					productNew.setCompId(2089995177814495234L);
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)) {
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+					}
+					productMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+				}
+
+			}
+
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)) {
+			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+					.eq(Product::getErpCode, productCode)
+					.eq(Product::getCompId, smjsc)
+					.last("limit 1"));
+			if (ObjUtil.isNull(one)) {
+				JSONObject object = contractSubjectMatterService.syncProductBySMJ("tenant2", productCode);
+				if (ObjUtil.isNotNull(object)) {
+					Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+							.eq(Product::getProductName, object.getString("itemClassName"))
+							.eq(Product::getCompId, "2089996921978040321")
+							.last("limit 1")
+					);
+					if (ObjUtil.isNull(productClass)) {
+						log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+						productClass = new Product();
+						productClass.setProductName(object.getString("itemClassName"));
+						productClass.setErpCode(object.getString("itemClassName"));
+						productClass.setParentId(0L);
+						productClass.setCompId(2089996921978040321L);
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productClass);
+						log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+					}
+
+					log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+					Product productNew = new Product();
+					productNew.setProductName(object.getString("note"));
+					productNew.setErpCode(object.getString("itemNo"));
+					productNew.setProductType(object.getString("grade"));
+					productNew.setUnitName(object.getString("unitName"));
+					productNew.setCompId(2089996921978040321L);
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)) {
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+					}
+					productMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+				}
+			}
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+					.eq(Product::getErpCode, productCode)
+					.eq(Product::getCompId, smjzt)
+					.last("limit 1"));
+			if (ObjUtil.isNull(one)) {
+				JSONObject object = contractSubjectMatterService.syncProductBySMJ("tenant3", productCode);
+				if (ObjUtil.isNotNull(object)) {
+					Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+							.eq(Product::getProductName, object.getString("itemClassName"))
+							.eq(Product::getCompId, "2089997578009128962")
+							.last("limit 1")
+					);
+					if (ObjUtil.isNull(productClass)) {
+						log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+						productClass = new Product();
+						productClass.setProductName(object.getString("itemClassName"));
+						productClass.setErpCode(object.getString("itemClassName"));
+						productClass.setParentId(0L);
+						productClass.setCompId(2089997578009128962L);
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productClass);
+						log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+					}
+					log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+					Product productNew = new Product();
+					productNew.setProductName(object.getString("note"));
+					productNew.setErpCode(object.getString("itemNo"));
+					productNew.setProductType(object.getString("grade"));
+					productNew.setUnitName(object.getString("unitName"));
+					productNew.setCompId(2089997578009128962L);
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)) {
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+					}
+					productMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+				}
+			}
+		}
+	}
+
 
 	@Override
 	public R subjectChange(ContractSubjectChangeDTO changeDTO) {
@@ -2755,36 +3188,50 @@
 
 	@Override
 	public R syncContractStatus(SyncContractStatusDTO dto) {
-		if (StrUtil.isBlank(dto.getContractNumber())){
-			return R.failed("鍚堝悓缂栧彿涓嶈兘涓虹┖");
+		if (StrUtil.isBlank(dto.getFd_bizId())){
+			return R.failed("鏁版嵁ID涓嶈兘涓虹┖");
 		}
+		log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚屾暟鎹甀D:{}锛屽鎵圭粨鏋滐細{}",dto.getFd_bizId(),dto.getStatus());
 		if (StrUtil.isBlank(dto.getStatus())){
 			return R.failed("瀹℃壒鐘舵�佷笉鑳戒负绌�");
 		}
 		if (StrUtil.isBlank(dto.getReturnPerson())){
 			return R.failed("瀹℃壒浜轰笉鑳戒负绌�");
 		}
-		if (StrUtil.isBlank(dto.getReturnDateTime())){
+		if (StrUtil.isBlank(dto.getReturnDate())){
 			return R.failed("瀹℃壒鏃堕棿涓嶈兘涓虹┖");
 		}
-		Contract contract = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,dto.getContractNumber()).last("limit 1"));
-		if(ObjUtil.isNull(contract)){
-			return R.failed("鍚堝悓缂栧彿涓嶅紓甯�");
+		Contract contract = baseMapper.selectById(dto.getFd_bizId());
+
+		if (ObjUtil.isNull(contract)) {
+			return R.failed("鏁版嵁ID寮傚父");
 		}
-		if (StrUtil.equals(dto.getStatus(),"1")){
-			takeEffect(contract.getId());
+		if (StrUtil.equals(dto.getStatus(), "1")) {
+			new Thread(() -> {
+				takeEffect(contract.getId());
+				saveContractApproval(contract,dto);
+			}).start();
 		}
-		if (!StrUtil.equals(dto.getStatus(),"1")){
-			refuseApproval(contract.getId());
+		if (StrUtil.equals(dto.getStatus(), "2")) {
+			new Thread(() -> {
+				refuseApproval(contract.getId());
+				saveContractApproval(contract,dto);
+			}).start();
 		}
-		saveContractApproval(contract,dto);
+		if (StrUtil.equals(dto.getStatus(), "3") || StrUtil.equals(dto.getStatus(), "4")) {
+			new Thread(() -> {
+				contract.setContractStatus(3);
+				baseMapper.updateById(contract);
+				saveContractApproval(contract,dto);
+			}).start();
+		}
 		return R.ok();
 	}
 
 	private void saveContractApproval(Contract contract, SyncContractStatusDTO dto) {
 		ContractApproval approval = BeanUtil.copyProperties(dto,ContractApproval.class);
 		approval.setContractId(contract.getId());
-		approval.setReturnDateTime(DateUtil.parseDateTime(dto.getReturnDateTime()));
+		approval.setReturnDateTime(DateUtil.parseDateTime(dto.getReturnDate()));
 		approval.setCompId(contract.getCompId());
 		contractApprovalMapper.insert(approval);
 	}
@@ -2798,21 +3245,33 @@
 		if (!StrUtil.equals(contract.getContractStatus()+"","2")){
 			return R.failed("鍚堝悓寮傚父鐘舵��");
 		}
+		contract.setSignDate(attDTO.getSignDate());
+		contract.setExpirationDate(attDTO.getExpirationDate());
+		contract.setSinger(attDTO.getSinger());
+		contract.setReviewerNo(attDTO.getReviewerNo());
+		contract.setLinkPerson(attDTO.getLinkPerson());
+		contract.setLinkPhone(attDTO.getLinkPhone());
+		contract.setLastAttachmentName(attDTO.getLastAttachmentName());
+		contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
+		Long betweenDay = DateUtil.betweenDay(attDTO.getExpirationDate(),attDTO.getSignDate(),true);
+		contract.setDeliveryCycle(betweenDay.intValue());
+		baseMapper.updateById(contract);
 		JSONObject request = new JSONObject();
 		request.put("fd_docNumber", contract.getContractNo());
-		request.put("fd_singer", contract.getNickName());
+		request.put("fd_singer", StrUtil.isNotEmpty(attDTO.getSinger())?attDTO.getSinger():SecurityUtils.getUser().getNickname());
 		request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
-		request.put("fd_linkPerson", "");
-		request.put("fd_linkPhone", "");
+		request.put("fd_linkPerson", StrUtil.isNotEmpty(attDTO.getLinkPerson())?attDTO.getLinkPerson():"");
+		request.put("fd_linkPhone", StrUtil.isNotEmpty(attDTO.getLinkPhone())?attDTO.getLinkPhone():"");
 		request.put("fd_address", contract.getSignPlace());
 		request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
 		request.put("fd_receivedNum", 1);
 		request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
 		request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
-		request.put("fd_reviewerNo", contract.getNickName());
+		request.put("fd_reviewerNo", StrUtil.isNotEmpty(attDTO.getReviewerNo())?attDTO.getReviewerNo():SecurityUtils.getUser().getNickname());
 		request.put("fd_docStatus", "20");
 		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)) {
 			request.put("fd_templateId", tempSMJ);
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -2834,9 +3293,6 @@
 		log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
 		JSONObject respJson = JSONObject.parseObject(resp);
 		if (respJson.getString("code").equals("00")) {
-			contract.setLastAttachmentName(attDTO.getLastAttachmentName());
-			contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
-			baseMapper.updateById(contract);
 			return R.ok();
 		}
 		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}",respJson.getString("msg"));
@@ -2972,6 +3428,11 @@
 
 	@Override
 	public R addContractHis(ContractAddDTO addDTO) {
+		Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo())
+				.last("limit 1"));
+		if (ObjUtil.isNotNull(contract1)){
+			return R.failed("鍚堝悓缂栧彿宸插瓨鍦�");
+		}
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
 		contract.setPartyBId(SecurityUtils.getUser().getCompId());
 		contract.setPartyB(SecurityUtils.getUser().getCompName());
@@ -3067,4 +3528,475 @@
 		}
 		return R.ok();
 	}
+
+	@Override
+	public R getFinallyInfo(Long id) {
+		Contract contract = baseMapper.selectById(id);
+		return R.ok(BeanUtil.copyProperties(contract,ContractFinallyVo.class));
+	}
+
+	@Override
+	public R erpPush(Long id) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id));
+		pushSubCompany(contract,subjectMatterList);
+		return R.ok();
+	}
+
+	@Override
+	public R associationPartyC(ContractAssociationPartyCyDTO associationPartyCyDTO) {
+		Contract contract = baseMapper.selectById(associationPartyCyDTO.getId());
+		contract.setPartyCId(Long.valueOf(associationPartyCyDTO.getPartyCId()));
+		baseMapper.updateById(contract);
+		return R.ok();
+	}
+
+	@Override
+	public R getInvoiceObj(Long id) {
+		Contract contract = baseMapper.selectById(id);
+		ContractInvoiceObjVo objVo = BeanUtil.copyProperties(contract,ContractInvoiceObjVo.class);
+		List<BusinessCustomerSelectVo> selectVoList = new ArrayList<>();
+		BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+		if (ObjUtil.isNotNull(a)){
+			objVo.setPartyA(a.getCompanyName());
+			objVo.setPartyAOrgCode(a.getCreditCode());
+			objVo.setInvoiceType(StrUtil.isNotBlank(a.getInvoiceType())?a.getInvoiceType():"01");
+			BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(a,BusinessCustomerSelectVo.class);
+			selectVoList.add(selectVo);
+		}
+		if (ObjUtil.isNotNull(contract.getPartyCId())){
+			BusinessCustomer c = businessCustomerMapper.selectById(contract.getPartyCId());
+			if (ObjUtil.isNotNull(c)){
+				BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(c,BusinessCustomerSelectVo.class);
+				selectVoList.add(selectVo);
+			}
+		}
+		objVo.setLinkPartyC(selectVoList);
+		return R.ok(objVo);
+	}
+
+	@Override
+	public List<ContractExportExceVO> export(ContracQueryDTO queryDTO) {
+		return baseMapper.export(queryDTO, DataScope.of("comp_id"));
+	}
+
+	@Override
+	public R addContractHisNoCenter(ContractAddDTO addDTO) {
+		Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo())
+				.last("limit 1"));
+		if (ObjUtil.isNotNull(contract1)){
+			return R.failed("鍚堝悓缂栧彿宸插瓨鍦�");
+		}
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (StrUtil.isEmpty(addDTO.getPartyA())) {
+			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+			if (ObjUtil.isNotNull(bc)) {
+				contract.setPartyA(bc.getCompanyName());
+			}
+			if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+					&& StrUtil.isEmpty(bc.getCreditCode())) {
+				return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
+			}
+		}
+
+		contract.setBillingStatus("1");
+		contract.setErpPushFlag("1");
+		contract.setCenterPushFlag("0");
+		contract.setContractStatus(0);
+		contract.setNickName(SecurityUtils.getUser().getNickname());
+		contract.setNextScheduleName("鍙戣揣鍓�");
+		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+		}
+
+		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+			return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+		}
+
+		baseMapper.insert(contract);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				subjectMatter.setDeliveredQuantity(ObjUtil.isNull(contractSubjectMatterAddDTO.getDeliveredQuantity())
+						? new BigDecimal("0") : contractSubjectMatterAddDTO.getDeliveredQuantity());
+				subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+				subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
+						: subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+				contractSubjectMatterMapper.insert(subjectMatter);
+			});
+			List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+					.eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
+			if (CollUtil.isEmpty(subjectMatterList)){
+				contract.setNextScheduleName("璐у埌绛炬敹");
+				baseMapper.updateById(contract);
+			}
+		}
+		BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+
+			for (int j = 0; j < addDTO.getContractPaymentSchedule().size(); j++) {
+				ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+				schedule.setStageName(addDTO.getContractPaymentSchedule().get(j).getStageName());
+				schedule.setContractId(contract.getId());
+				schedule.setPaymentRatio(addDTO.getContractPaymentSchedule().get(j).getPaymentRatio());
+				schedule.setAgreedDays(addDTO.getContractPaymentSchedule().get(j).getAgreedDays());
+				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
+						.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
+				schedule.setPaymentStatus(0);
+				schedule.setStageOrder(j + 1);
+				if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
+					remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
+					if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
+						schedule.setPaymentStatus(2);
+						schedule.setActualAmount(schedule.getPlannedAmount());
+					}
+					if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
+						schedule.setPaymentStatus(1);
+						schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
+					}
+				}
+				contractPaymentScheduleMapper.insert(schedule);
+				if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			}
+		}
+
+		if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+			contract.setContractStatus(3);
+			baseMapper.updateById(contract);
+		}
+		return R.ok();
+	}
+
+	@Override
+	public R updContractHisNoCenter(ContractUpdateDTO updateDTO) {
+
+		Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		contract.setBillingStatus("1");
+		contract.setErpPushFlag("1");
+		contract.setCenterPushFlag("0");
+		contract.setContractStatus(0);
+		contract.setNickName(SecurityUtils.getUser().getNickname());
+		contract.setContractCategory("his_no_center");
+		contract.setNextScheduleName("鍙戣揣鍓�");
+		if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
+			contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
+		}
+
+		if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
+			return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+		}
+
+		baseMapper.insert(contract);
+
+		if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+			contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+
+			updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				subjectMatter.setDeliveredQuantity(ObjUtil.isNull(contractSubjectMatterAddDTO.getDeliveredQuantity())
+						? new BigDecimal("0") : contractSubjectMatterAddDTO.getDeliveredQuantity());
+				subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+				subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
+						: subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+				contractSubjectMatterMapper.insert(subjectMatter);
+			});
+			List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+					.eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
+			if (CollUtil.isEmpty(subjectMatterList)){
+				contract.setNextScheduleName("璐у埌绛炬敹");
+				baseMapper.updateById(contract);
+			}
+		}
+		BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+		if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+			contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
+
+			for (int j = 0; j < updateDTO.getContractPaymentSchedule().size(); j++) {
+				ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+				schedule.setStageName(updateDTO.getContractPaymentSchedule().get(j).getStageName());
+				schedule.setContractId(contract.getId());
+				schedule.setPaymentRatio(updateDTO.getContractPaymentSchedule().get(j).getPaymentRatio());
+				schedule.setAgreedDays(updateDTO.getContractPaymentSchedule().get(j).getAgreedDays());
+				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
+						.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
+				schedule.setPaymentStatus(0);
+				schedule.setStageOrder(j + 1);
+				if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
+					remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
+					if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
+						schedule.setPaymentStatus(2);
+						schedule.setActualAmount(schedule.getPlannedAmount());
+					}
+					if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
+						schedule.setPaymentStatus(1);
+						schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
+					}
+				}
+				contractPaymentScheduleMapper.insert(schedule);
+				if (updateDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (updateDTO.getContractPaymentSchedule().get(j).getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (updateDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			}
+		}
+
+		if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+			contract.setContractStatus(3);
+			baseMapper.updateById(contract);
+		}
+		return R.ok();
+	}
+
+	@Override
+	public R addContractNoSgb(ContractAddDTO addDTO) {
+		Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, addDTO.getDataId()).last("limit 1"));
+		if (ObjUtil.isNotNull(contractOld)) {
+			return R.failed("鍚堝悓鏁版嵁ID锛歿}宸插瓨鍦紝涓嶈兘鏂板閲嶅鏁版嵁", addDTO.getDataId());
+		}
+		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
+		}
+		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+		}
+		if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
+			return R.failed("浠樻闃舵淇℃伅寮傚父");
+		}
+		if (addDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
+				.compareTo(new BigDecimal("100.00")) != 0) {
+			return R.failed("浠樻闃舵姣斾緥寮傚父");
+		}
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		contract.setContractStatus(2);
+		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setBillingStatus("1");
+		contract.setErpPushFlag("1");
+		contract.setCenterPushFlag("0");
+		contract.setBillingAmout(new BigDecimal("0"));
+
+		BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
+				addDTO.getPartyACode()).last("limit 1"));
+		if (ObjUtil.isNull(bc)) {
+			return R.failed("erp瀹㈡埛缂栫爜涓嶅瓨鍦�");
+		}
+		contract.setPartyAId(bc.getId());
+		contract.setPartyA(bc.getCompanyName());
+		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+		}
+		if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
+			Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
+			contract.setDeliveryCycle(bd.intValue());
+		}
+		contract.setContractNo(generateGYBContractNo());
+
+		if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+					.max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+			if (maxDateObj.isPresent()) {
+				contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+			}
+		}
+		baseMapper.insert(contract);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+						.last("limit 1"));
+				if (ObjUtil.isNotNull(product)){
+					subjectMatter.setMaterialInternalName(product.getId()+"");
+				}
+				if (ObjUtil.isNull(product)){
+					product = new Product();
+					product.setParentId(2101559148831944705L);
+					product.setProductName(subjectMatter.getMaterialInternalName());
+					product.setErpCode(subjectMatter.getMaterialCode());
+					product.setProductType(subjectMatter.getSpecification());
+					product.setTaxCode("1090117040000000000");
+					product.setTaxClass("娉�");
+					productMapper.insert(product);
+					subjectMatter.setMaterialInternalName(product.getId()+"");
+				}
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+				contractSubjectMatterMapper.insert(subjectMatter);
+				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+				if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+						ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+					MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
+					record.setContractId(contract.getId());
+					record.setMatterId(subjectMatter.getId());
+					record.setContractName(contract.getContractName());
+					record.setBusGuestId(contract.getPartyAId());
+					record.setBusGuestName(contract.getPartyA());
+					record.setMeterReadTime(new Date());
+					meterReadRecordMapper.insert(record);
+				}
+				if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
+						&& ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
+						&& DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
+					contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
+					baseMapper.updateById(contract);
+				}
+			});
+
+		}
+
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+				}
+				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+					if (schedule.getEffectiveDate().before(DateUtil.date())) {
+						schedule.setFulfillmentStatus(1);
+					} else {
+						schedule.setFulfillmentStatus(0);
+					}
+				}
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				schedule.setContractId(contract.getId());
+				schedule.setContractName(contract.getContractName());
+				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			});
+
+		}
+
+		//鎺ㄩ�佸悎鍚屼腑蹇�
+		return R.ok(contract.getContractNo());
+	}
+
+	@Override
+	public R addContractOrder(ContractOrderAddDTO addDTO) {
+		Contract main = baseMapper.selectById(addDTO.getParentId());
+		Contract branch = BeanUtil.copyProperties(main,Contract.class,"id");
+		branch.setPartyAId(addDTO.getPartyAId());
+		branch.setPartyA(addDTO.getPartyA());
+		branch.setAttachmentUrl(addDTO.getAttachmentUrl());
+		branch.setAttachmentName(addDTO.getAttachmentName());
+		branch.setRemark(addDTO.getRemark());
+		branch.setParentId(addDTO.getParentId());
+		branch.setContractNo(generateBranchContractNo(main.getContractNo()));
+
+		baseMapper.insert(branch);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(branch.getId());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+				contractSubjectMatterMapper.insert(subjectMatter);
+			});
+			branch.setAmount(addDTO.getContractSubjectMatter().stream().map(item -> item.getUnitPrice().multiply(item.getQuantity()))
+					// 绱姞鎵�鏈夐噾棰濓紝璁剧疆鍒濆鍊间负0
+					.reduce(BigDecimal.ZERO, BigDecimal::add));
+			baseMapper.updateById(branch);
+		}
+
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(branch.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+				}
+				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+					if (schedule.getEffectiveDate().before(DateUtil.date())) {
+						schedule.setFulfillmentStatus(1);
+					} else {
+						schedule.setFulfillmentStatus(0);
+					}
+				}
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				schedule.setContractId(branch.getId());
+				schedule.setContractName(branch.getContractName());
+				schedule.setPlannedAmount(branch.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					branch.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					branch.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					branch.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+			});
+
+		}
+
+
+		return R.ok();
+	}
 }

--
Gitblit v1.9.1