From 96118de3ac74f5468cf5d4ac73d6ea3bec1da010 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 20 十一月 2026 14:36:25 +0800
Subject: [PATCH] feat:新增销售指标 产品板块 重点工作 专项业务 产品收入和合同统计修改功能 feat:承兑新增承兑编号字段 feat:客商主数据更新名称 专项业务去年同月字段 机动车销售发票地址字段及判断 feat:银行流水更新客户id feat:机动车销售发票新增税务及代码字段 feat:流水更新按钮参数 feat:检索新增标的物运维按钮

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 1646 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 1,383 insertions(+), 263 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 de4258f..a77069b 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,23 @@
 	private final ContractPaymentScheduleProcessService processService;
 	private final ContractSubjectMatterChangeMapper changeMapper;
 	private final ContractApprovalMapper contractApprovalMapper;
+	private final TaxCodeMapper taxCodeMapper;
+	private final ContractSubjectMatterService contractSubjectMatterService;
+	private final HistoryOverdueMapper historyOverdueMapper;
+	private final DropLossMapper dropLossMapper;
+	private final PaymentOffsetMapper paymentOffsetMapper;
 
 	@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 +130,9 @@
 
 	@Value("${dept.smjzt}")
 	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
 
 	@Value("${dept.sgb}")
 	private String sgb;
@@ -149,8 +164,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 +213,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)) {
@@ -299,6 +317,13 @@
 	@Override
 	public R edit(ContractUpdateDTO updateDTO) {
 		Contract entity = baseMapper.selectById(updateDTO.getId());
+
+		if (StrUtil.equals(updateDTO.getContractCategory(),"paid-edit")){
+			entity.setPaidAmount(updateDTO.getPaidAmount());
+			entity.setBillingAmout(updateDTO.getBillingAmout());
+			baseMapper.updateById(entity);
+			return R.ok();
+		}
 		if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
 			return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
 		}
@@ -319,22 +344,23 @@
 		contract.setPaidAmount(new BigDecimal("0"));
 		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)) {
-			contract.setContractNo(generateSMJContractNo());
-		}
-		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
-			contract.setContractNo(generateGYBContractNo());
-		}
-		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
-			contract.setContractNo(generateYMJContractNo());
-		}
-		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
-			contract.setContractNo(generateTFContractNo());
-		}
-		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
-			contract.setContractNo(generateJXCContractNo());
-		}
+//		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)) {
+//			contract.setContractNo(generateSMJContractNo());
+//		}
+//		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+//			contract.setContractNo(generateGYBContractNo());
+//		}
+//		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+//			contract.setContractNo(generateYMJContractNo());
+//		}
+//		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+//			contract.setContractNo(generateTFContractNo());
+//		}
+//		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+//			contract.setContractNo(generateJXCContractNo());
+//		}
 		if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
 			contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
 		}
@@ -489,62 +515,150 @@
 
 		Contract contract = baseMapper.selectById(id);
 
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		if (ObjUtil.isNull(customer)) {
+			return R.failed("瀹㈡埛鏌ヨ寮傚父");
+		}
 
+		R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+		if (!r.isOk()) {
+			return R.failed("淇℃伅鏌ヨ寮傚父");
+		}
+		SysDept comp = r.getData();
 		//绠�鏄撳悎鍚屾棤娉曠户缁悗缁搷浣�
 		if (StrUtil.equals(contract.getContractCategory(), "simple")) {
 			return R.failed("璇疯ˉ鍏呮爣鐨勭墿鍜屾敹娆鹃樁娈靛悗鍐嶈繘琛屾搷浣滐紒");
 		}
 		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().
-				eq(ContractSubjectMatter::getContractId,contract.getId()));
+				eq(ContractSubjectMatter::getContractId, contract.getId()));
 		//鍚堝悓涓績瀹℃牳
 		JSONObject requestApply = new JSONObject();
-		requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
-		requestApply.put("fd_isrelated", "鏄�");
+		requestApply.put("fd_selectionmethod", contract.getSelectionMethod());
+		requestApply.put("fd_isrelated", contract.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", "澶栭攢");
 		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)) {
-			requestApply.put("fd_templateId", tempSMJ);
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			if (contract.getContractCategory().equals("his_no_center")){
+				requestApply.put("fd_templateId", "1a03828a8ff2b476af7805f45a88a2ed");
+			}else {
+				requestApply.put("fd_templateId", tempSMJ);
+			}
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
-			requestApply.put("fd_templateId", tempSGB);
+			requestApply.put("fd_templateId", "1a038430e7f207101ebd992454b8fec5");
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
-			requestApply.put("fd_templateId", tempYMJ);
+			if (contract.getContractCategory().equals("his_no_center")){
+				requestApply.put("fd_templateId", "1a038467e32f6274f051de14080b5cde");
+			}else {
+				requestApply.put("fd_templateId", tempYMJ);
+			}
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
-			requestApply.put("fd_templateId", tempTFGS);
+			if (contract.getContractCategory().equals("his_no_center")){
+				requestApply.put("fd_templateId", "1a03845b5e642092d9272d64dacba76c");
+			}else {
+				requestApply.put("fd_templateId", tempTFGS);
+			}
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
-			requestApply.put("fd_templateId", tempJXC);
+			if (contract.getContractCategory().equals("his_no_center")){
+				requestApply.put("fd_templateId", "1a038450e9ab5d940be954144b2b62b1");
+			}else {
+				requestApply.put("fd_templateId", tempJXC);
+			}
 		}
 		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");
+		if (contract.getAmount().compareTo(new BigDecimal("0"))==0){
+			requestApply.put("fd_agr_property","1");
+		}
+		String bzr = comp.getBaozhangren();
+		String syr = baseMapper.selectYZSH();
+		if (!StrUtil.equals(contract.getCompId() + "", contract.getPartyBId() + "") && (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) && StrUtil.isNotBlank(syr) && StrUtil.isNotBlank(bzr)) {
+			log.info("鐭崇叅鏈哄瓙鍏徃鐢ㄦ�诲叕鍙稿嵃绔�");
+			bzr = bzr.concat(syr);
+		}
+		requestApply.put("fd_baozhangren", bzr);
+		requestApply.put("fd_summary", contract.getSummary());
+		JSONArray signList = new JSONArray();
+		JSONObject j = new JSONObject();
+		j.put("fd_standing", "鐢�");
+		j.put("fd_Iden", customer.getCreditCode());
+		j.put("fd_signMain", "2");
+		signList.add(j);
+		JSONObject y = new JSONObject();
+		y.put("fd_standing", "涔�");
+		y.put("fd_Iden", comp.getOrgCode());
+		y.put("fd_signMain", "1");
+		signList.add(y);
+		requestApply.put("fd_signList", signList);
+		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);
 		JSONObject applyResp = JSONObject.parseObject(respApply);
-		if (!applyResp.getString("code").equals("00")){
-			return R.failed("鍚堝悓涓績鎺ㄩ�佸鏍稿け璐ワ紝鍘熷洜涓�:{}",applyResp.getString("msg"));
+		if (!applyResp.getString("code").equals("00")) {
+			return R.failed("鍚堝悓涓績鎺ㄩ�佸鏍稿け璐ワ紝鍘熷洜涓�:{}", applyResp.getString("msg"));
 		}
 		//鍚姩娴佺▼-绯荤粺鑷甫瀹℃壒娴�
 //		ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
@@ -576,23 +690,25 @@
 		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
 				.eq(ContractSubjectMatter::getContractId, id));
 		if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
-			handleWaterHouseCycle(contract,subjectMatterList);
+			handleWaterHouseCycle(contract, subjectMatterList);
 			return;
 		}
 		//璧勯噾鏄庣粏
 		savePaymentConfirm(contract);
 
+		contract.setNextScheduleName("鍙戣揣鍓�");
+		baseMapper.updateById(contract);
+
 		//鍚堝悓鎺ㄩ�佸瓙鍏徃
-		pushSubCompany(contract,subjectMatterList);
+		pushSubCompany(contract, subjectMatterList);
 
 		//鍚堝悓涓績鎺ㄩ��
 //		pusnContractCenter(contract,subjectMatterList);
 
-		contract.setNextScheduleName("鍙戣揣鍓�");
-		baseMapper.updateById(contract);
+
 	}
 
-	private void pusnContractCenter(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+	private void pusnContractCenter(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
 		new Thread(() -> {
 			try {
 				JSONObject requestApply = new JSONObject();
@@ -603,7 +719,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());
@@ -635,7 +751,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());
@@ -655,145 +771,305 @@
 		}).start();
 	}
 
-	private void pushSubCompany(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+	private R pushSubCompany(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
 		//erp鎺ㄩ��
-		new Thread(() -> {
-			try {
-				Thread.sleep(500);
-				JSONObject request = new JSONObject();
-				BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
-				request.put("contractNo", contract.getContractNo());
-				request.put("partyA", contract.getPartyA());
-				request.put("partyACode", customer.getErpCompanyCode());
-				if (StrUtil.equals(contract.getPartyBId() + "", ymj) && StrUtil.isNotEmpty(ymjErp)) {
-					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", "");
-					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);
+
+		JSONObject request = new JSONObject();
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		request.put("contractNo", contract.getContractNo());
+		request.put("partyA", contract.getPartyA());
+		request.put("partyACode", customer.getErpCompanyCode());
+		if (StrUtil.equals(contract.getPartyBId() + "", ymj) && StrUtil.isNotEmpty(ymjErp)) {
+			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", "");
+			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")));
 					}
-
-					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);
-					}
-
-				}
-				if ((StrUtil.equals(contract.getPartyBId() + "", smj) || StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
-						StrUtil.equals(contract.getPartyBId() + "", smjzt)) && StrUtil.isNotEmpty(smjErp)) {
-					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", "");
-					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);
-					}
-
-					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);
-					}
-				}
-
-				if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
-					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
-					String result = HttpUtil.post(jxcErp, request.toJSONString());
-					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}", result);
-					//淇濆瓨璇锋眰璁板綍
-					saveErpRequestRecord("jxc", request.toJSONString(), result);
-					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-					contract.setErpPushFlag("1");
-					baseMapper.updateById(contract);
-				}
-				if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
-					//閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
-				}
-
-			} catch (Exception e) {
-				e.printStackTrace();
+					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);
 			}
-		}).start();
+			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 R.failed("涓�鐓ゆ満鐧诲綍鑾峰彇token澶辫触");
+			}
+			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());
+			JSONObject res = JSONObject.parseObject(response.body());
+			if (res.getInteger("code")!=0){
+				return R.failed(res.getString("msg"));
+			}
+			//淇濆瓨璇锋眰璁板綍
+			saveErpRequestRecord("ymj", request.toJSONString(), response.body());
+			//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+			contract.setErpPushFlag("1");
+			baseMapper.updateById(contract);
 
+		}
+		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));
+			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", "tenant1");
+			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 = null;
+					List<String> smjList = new ArrayList<>();
+					smjList.add(smj);
+					smjList.add(smjhw);
+					if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+						product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractSubjectMatter.getMaterialCode())
+								.in(Product::getCompId, smjList).last("limit 1"));
+					} else {
+						product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractSubjectMatter.getMaterialCode())
+								.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+					}
+					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 R.failed("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+			}
+
+			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());
+			JSONObject res = JSONObject.parseObject(response.body());
+			if (res.getInteger("code")!=0){
+				return R.failed(res.getString("msg"));
+			}
+			//淇濆瓨璇锋眰璁板綍
+			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 R.failed("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+			}
+
+			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());
+			JSONObject res = JSONObject.parseObject(response.body());
+			if (res.getInteger("code")!=0){
+				return R.failed(res.getString("msg"));
+			}
+			//淇濆瓨璇锋眰璁板綍
+			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 R.failed("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+			}
+
+			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());
+			JSONObject res = JSONObject.parseObject(response.body());
+			if (res.getInteger("code")!=0){
+				return R.failed(res.getString("msg"));
+			}
+			//淇濆瓨璇锋眰璁板綍
+			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());
+			log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}", result);
+			//淇濆瓨璇锋眰璁板綍
+			saveErpRequestRecord("jxc", request.toJSONString(), result);
+			//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+			contract.setErpPushFlag("1");
+			baseMapper.updateById(contract);
+		}
+		if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
+			//閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+		}
+		return R.ok();
 	}
 
-	private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
+	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();
 		process.setContractId(contract.getId());
@@ -801,7 +1077,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) {
@@ -924,14 +1205,14 @@
 	private void savePaymentConfirm(Contract contract) {
 		ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
 				.eq(ContractPaymentSchedule::getContractId, contract.getId())
-				.eq(ContractPaymentSchedule::getStageName,"鍚堝悓绛捐")
+				.eq(ContractPaymentSchedule::getStageName, "鍚堝悓绛捐")
 				.last("limit 1"));
-		fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+		fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), fitstSchedule.getAgreedDays()));
 		contractPaymentScheduleMapper.updateById(fitstSchedule);
 		//鎶ラ敊灞ョ害璁板綍
-		saveScheduleProcess(contract,fitstSchedule);
+		saveScheduleProcess(contract, fitstSchedule);
 		//淇濆瓨璧勯噾鏄庣粏
-		if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+		if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
 			//鏂板搴旀敹
 			PaymentConfirm currentConfim = new PaymentConfirm();
 			currentConfim.setBusinessType(fitstSchedule.getStageName() + "搴旀敹");
@@ -955,8 +1236,9 @@
 				return;
 			}
 			currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+			currentConfim.setCompId(contract.getCompId());
 			paymentConfirmMapper.insert(currentConfim);
-			processService.handleBeforeRemain(currentConfim,contract);
+			processService.handleBeforeRemain(currentConfim, contract);
 		}
 
 	}
@@ -1047,7 +1329,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)) {
@@ -1687,8 +1970,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("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
@@ -1705,11 +1996,11 @@
 		contract.setPartyBId(SecurityUtils.getUser().getCompId());
 		contract.setPartyB(SecurityUtils.getUser().getCompName());
 		contract.setContractStatus(2);
-		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setPaidAmount(ObjUtil.isNotNull(addDTO.getPaidAmount())?addDTO.getPaidAmount():new BigDecimal("0"));
 		contract.setBillingStatus("1");
 		contract.setErpPushFlag("1");
 		contract.setCenterPushFlag("0");
-		contract.setBillingAmout(new BigDecimal("0"));
+		contract.setBillingAmout(ObjUtil.isNotNull(addDTO.getBillingAmout())?addDTO.getBillingAmout():new BigDecimal("0"));
 
 		BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
 				addDTO.getPartyACode()).last("limit 1"));
@@ -1744,9 +2035,30 @@
 			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);
+				if(ObjUtil.isNotNull(subjectMatter.getDeliveredQuantity())&&subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0"))>0){
+					subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+					if (subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0"))==0){
+						subjectMatter.setDeliveryStatus(2);
+					}
+					if (subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0"))>0){
+						subjectMatter.setDeliveryStatus(1);
+					}
+				}
 				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
 				contractSubjectMatterMapper.insert(subjectMatter);
 				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
@@ -1809,7 +2121,7 @@
 		}
 
 		//鎺ㄩ�佸悎鍚屼腑蹇�
-		pushCenter(contract.getId());
+//		pushCenter(contract.getId());
 		return R.ok(contract.getContractNo());
 	}
 
@@ -1817,6 +2129,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("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
@@ -1835,6 +2151,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()));
 		}
@@ -1860,6 +2177,15 @@
 
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
+				if(ObjUtil.isNotNull(subjectMatter.getDeliveredQuantity())&&subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0"))>0){
+					subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+					if (subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0"))==0){
+						subjectMatter.setDeliveryStatus(2);
+					}
+					if (subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0"))>0){
+						subjectMatter.setDeliveryStatus(1);
+					}
+				}
 				contractSubjectMatterMapper.insert(subjectMatter);
 				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
 				if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
@@ -2040,6 +2366,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
@@ -2322,7 +2657,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)) {
@@ -2342,24 +2678,53 @@
 	}
 
 	@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)) {
+			return R.failed("瀹㈡埛鏌ヨ寮傚父");
+		}
+
+		R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+		if (!r.isOk()) {
+			return R.failed("淇℃伅鏌ヨ寮傚父");
+		}
+		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(",")));
+		if (contract.getAmount().compareTo(new BigDecimal("0"))==0){
+			requestApply.put("fd_agr_property","1");
+		}
+		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)) {
-			requestApply.put("fd_templateId", tempSMJ);
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			if (contract.getContractCategory().equals("his_no_center")){
+				requestApply.put("fd_templateId", "1a03828a8ff2b476af7805f45a88a2ed");
+			}else {
+				requestApply.put("fd_templateId", tempSMJ);
+			}
 		}
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
 			requestApply.put("fd_templateId", tempSGB);
@@ -2376,7 +2741,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)
@@ -2386,16 +2751,69 @@
 		requestApply.put("fd_customerName", contract.getPartyA());
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
-		log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		requestApply.put("fd_summary", contract.getSummary());
+		JSONArray signList = new JSONArray();
+		JSONObject j = new JSONObject();
+		j.put("fd_standing", "鐢�");
+		j.put("fd_Iden", customer.getCreditCode());
+		j.put("fd_signMain", "2");
+		signList.add(j);
+		JSONObject y = new JSONObject();
+		y.put("fd_standing", "涔�");
+		y.put("fd_Iden", comp.getOrgCode());
+		y.put("fd_signMain", "1");
+		signList.add(y);
+		requestApply.put("fd_signList", signList);
+		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
@@ -2459,12 +2877,28 @@
 					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() + "", 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;
 				}
@@ -2537,18 +2971,22 @@
 				contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout()) ?
 						contract.getBillingAmout() : new BigDecimal("0"));
 
-				if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+				if (contract.getPaidAmount().compareTo(contract.getAmount()) == 0 && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
 					contract.setContractStatus(3);
 				}
 				contract.setBillingStatus("1");
 				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());
+						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())
@@ -2558,25 +2996,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());
+							}
+						}
 
 					}
 				}
@@ -2607,7 +3033,12 @@
 								schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
 							}
 						}
-						contractPaymentScheduleMapper.insert(schedule);
+						ContractPaymentSchedule paymentSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+								.eq(ContractPaymentSchedule::getContractId,contract.getId())
+								.eq(ContractPaymentSchedule::getStageName,schedule.getStageName()).last("limit 1"));
+						if (ObjUtil.isNull(paymentSchedule)) {
+							contractPaymentScheduleMapper.insert(schedule);
+						}
 //						if (schedule.getStageName().equals("璐ㄤ繚閲�") && contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
 //								contract.getPaidAmount() : new BigDecimal("0")).compareTo(new BigDecimal("0")) > 0) {
 //							PaymentConfirm confirm = new PaymentConfirm();
@@ -2639,33 +3070,181 @@
 		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) {
 		Contract contract = baseMapper.selectById(changeDTO.getId());
-		if (ObjUtil.isNull(contract)){
+		if (ObjUtil.isNull(contract)) {
 			return R.failed("鍚堝悓鐘舵�佸紓甯�");
 		}
-		if (contract.getBillingAmout().compareTo(new BigDecimal("0"))>0){
+		if (contract.getBillingAmout().compareTo(new BigDecimal("0")) > 0) {
 			return R.failed("鍚堝悓宸插紑绁紝涓嶈兘杩涜鍙樻洿");
 		}
-		if (ObjUtil.isNotNull(contract.getOutBoundAmout())&&contract.getOutBoundAmout().compareTo(new BigDecimal("0"))>0){
+		if (ObjUtil.isNotNull(contract.getOutBoundAmout()) && contract.getOutBoundAmout().compareTo(new BigDecimal("0")) > 0) {
 			return R.failed("鍚堝悓鏍囩殑鐗╁凡鍑哄簱锛屼笉鑳借繘琛屽彉鏇�");
 		}
-		if (CollUtil.isEmpty(changeDTO.getContractSubjectMatter())){
+		if (CollUtil.isEmpty(changeDTO.getContractSubjectMatter())) {
 			return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿涓嶈兘涓虹┖");
 		}
-		BigDecimal changeAmount = changeDTO.getContractSubjectMatter().stream().map(subject->subject.getUnitPrice().multiply(subject.getQuantity())).reduce(BigDecimal.ZERO,BigDecimal::add);
-		if (contract.getAmount().compareTo(changeAmount)!=0){
+		BigDecimal changeAmount = changeDTO.getContractSubjectMatter().stream().map(subject -> subject.getUnitPrice().multiply(subject.getQuantity())).reduce(BigDecimal.ZERO, BigDecimal::add);
+		if (contract.getAmount().compareTo(changeAmount) != 0) {
 			return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿鎬讳环蹇呴』涓庡悎鍚屾�讳环涓�鑷�");
 		}
-		List<ContractSubjectMatter> beforeList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+		List<ContractSubjectMatter> beforeList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, changeDTO.getId()));
 		ContractSubjectMatterChange change = new ContractSubjectMatterChange();
 		change.setContractId(contract.getId());
 		change.setBeforeChange(JSONObject.toJSONString(beforeList));
 		change.setAfterChange(JSONObject.toJSONString(changeDTO.getContractSubjectMatter()));
 		changeMapper.insert(change);
-		contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+		contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, changeDTO.getId()));
 		changeDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 			ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 			subjectMatter.setContractId(contract.getId());
@@ -2680,7 +3259,7 @@
 
 	@Override
 	public Page subjectChangePage(Page page, ContracQueryDTO queryDTO) {
-		return changeMapper.subjectChangePage(page,queryDTO,DataScope.of("comp_id"));
+		return changeMapper.subjectChangePage(page, queryDTO, DataScope.of("comp_id"));
 	}
 
 	@Override
@@ -2694,36 +3273,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涓嶈兘涓虹┖");
 		}
-		if (StrUtil.isBlank(dto.getStatus())){
+		log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚屾暟鎹甀D:{}锛屽鎵圭粨鏋滐細{}", dto.getFd_bizId(), dto.getStatus());
+		if (StrUtil.isBlank(dto.getStatus())) {
 			return R.failed("瀹℃壒鐘舵�佷笉鑳戒负绌�");
 		}
-		if (StrUtil.isBlank(dto.getReturnPerson())){
+		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(4);
+				baseMapper.updateById(contract);
+				saveContractApproval(contract, dto);
+			}).start();
+		}
 		return R.ok();
 	}
 
 	private void saveContractApproval(Contract contract, SyncContractStatusDTO dto) {
-		ContractApproval approval = BeanUtil.copyProperties(dto,ContractApproval.class);
+		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);
 	}
@@ -2731,27 +3324,39 @@
 	@Override
 	public R finallyPdf(ContractFinallyDTO attDTO) {
 		Contract contract = baseMapper.selectById(attDTO.getId());
-		if (ObjUtil.isNull(contract)){
+		if (ObjUtil.isNull(contract)) {
 			return R.failed("鍚堝悓寮傚父");
 		}
-		if (!StrUtil.equals(contract.getContractStatus()+"","2")){
+		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)) {
@@ -2773,12 +3378,9 @@
 		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"));
+		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}", respJson.getString("msg"));
 	}
 
 
@@ -2911,6 +3513,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());
@@ -2954,8 +3561,8 @@
 				contractSubjectMatterMapper.insert(subjectMatter);
 			});
 			List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
-					.eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
-			if (CollUtil.isEmpty(subjectMatterList)){
+					.eq(ContractSubjectMatter::getContractId, contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus, 2));
+			if (CollUtil.isEmpty(subjectMatterList)) {
 				contract.setNextScheduleName("璐у埌绛炬敹");
 				baseMapper.updateById(contract);
 			}
@@ -3000,10 +3607,523 @@
 			}
 		}
 
-		if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+		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 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));
+		return pushSubCompany(contract, subjectMatterList);
+	}
+
+	@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();
+	}
+
+	@Override
+	public R erpPushBatch() {
+		List<Long> compIds = new ArrayList<>();
+		compIds.add(2089995177814495234L);
+		compIds.add(2089996921978040321L);
+		compIds.add(2089997578009128962L);
+		compIds.add(2101966257365045249L);
+		List<Contract> contractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().in(Contract::getCompId,compIds)
+				.likeRight(Contract::getContractNo,"ZB-SMJ-").eq(Contract::getErpPushFlag,"0"));
+		if (CollUtil.isNotEmpty(contractList)){
+			for (Contract con:contractList
+				 ) {
+				List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().
+						eq(ContractSubjectMatter::getContractId, con.getId()));
+				R r = pushSubCompany(con,subjectMatterList);
+				if (!r.isOk()){
+					return r;
+				}
+			}
+		}
+		return R.failed("鏆傛棤闇�瑕佹帹閫佺殑鍚堝悓");
+	}
+
+	@Override
+	public R delById(Long id) {
+		paymentOffsetMapper.delete(Wrappers.<PaymentOffset>lambdaQuery().eq(PaymentOffset::getContractId,id));
+		contractApprovalMapper.delete(Wrappers.<ContractApproval>lambdaQuery().eq(ContractApproval::getContractId,id));
+		contractDelayOutMapper.delete(Wrappers.<ContractDelayOut>lambdaQuery().eq(ContractDelayOut::getContractId,id));
+		contractExecDateMapper.delete(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,id));
+		dropLossMapper.delete(Wrappers.<DropLoss>lambdaQuery().eq(DropLoss::getContractId,id));
+		meterReadRecordMapper.delete(Wrappers.<MeterReadRecord>lambdaQuery().eq(MeterReadRecord::getContractId,id));
+		contractOutBoundMapper.delete(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId,id));
+		contractInvoiceMapper.delete(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId,id));
+		historyOverdueMapper.delete(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getContractId,id));
+		currentOverdueMapper.delete(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId,id));
+		paymentConfirmMapper.delete(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,id));
+		paymentSlipMapper.delete(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId,id));
+		contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,id));
+		contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,id));
+		baseMapper.deleteById(id);
+		return R.ok();
+	}
 }

--
Gitblit v1.9.1