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 |  979 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 544 insertions(+), 435 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 39a96c3..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
@@ -97,6 +97,9 @@
 	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;
@@ -161,7 +164,7 @@
 	@Override
 	public R add(ContractAddDTO addDTO) {
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
-		if (!StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")&&!StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")) {
+		if (!StrUtil.equals(smjsc, SecurityUtils.getUser().getCompId() + "") && !StrUtil.equals(smjzt, SecurityUtils.getUser().getCompId() + "")) {
 			contract.setPartyBId(SecurityUtils.getUser().getCompId());
 			contract.setPartyB(SecurityUtils.getUser().getCompName());
 		}
@@ -210,7 +213,7 @@
 		}
 
 		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());
 		}
@@ -314,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("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
 		}
@@ -334,23 +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)||
-				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 (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()));
 		}
@@ -506,12 +516,12 @@
 		Contract contract = baseMapper.selectById(id);
 
 		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
-		if (ObjUtil.isNull(customer)){
+		if (ObjUtil.isNull(customer)) {
 			return R.failed("瀹㈡埛鏌ヨ寮傚父");
 		}
 
 		R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
-		if (!r.isOk()){
+		if (!r.isOk()) {
 			return R.failed("淇℃伅鏌ヨ寮傚父");
 		}
 		SysDept comp = r.getData();
@@ -520,7 +530,7 @@
 			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", contract.getSelectionMethod());
@@ -536,21 +546,37 @@
 		requestApply.put("fd_docNumber", contract.getContractNo());
 //		requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
-				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt) ||
 				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
-			requestApply.put("fd_templateId", tempSMJ);
+			if (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()));
@@ -565,26 +591,29 @@
 		requestApply.put("fd_customerName", contract.getPartyA());
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
-		String bzr =  comp.getBaozhangren();
+		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)) {
+		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);
+			bzr = bzr.concat(syr);
 		}
 		requestApply.put("fd_baozhangren", bzr);
-		requestApply.put("fd_summary",contract.getSummary());
+		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");
+		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");
+		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())) {
@@ -592,32 +621,32 @@
 			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_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)){
+		if (CollUtil.isNotEmpty(subjectMatterList)) {
 			JSONArray materialList = new JSONArray();
-			subjectMatterList.stream().forEach(subjectMatter->{
+			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_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)){
+				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_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) ? subjectMatter.getPlannedDeliveryDate() : "");
 				material.put("fd_delivery", "");
 				material.put("fd_des", "");
 				materialList.add(material);
@@ -628,8 +657,8 @@
 		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();
@@ -661,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();
@@ -740,261 +771,268 @@
 		}).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);
-					}
-					String token = "";
-					if (redisTemplate.hasKey("YMJ_ERP_TOKEN")) {
-						token = (String) redisTemplate.opsForValue().get("YMJ_ERP_TOKEN");
-					} else {
-						token = getYmjErpToken();
-					}
-					if (StrUtil.isEmpty(token)){
-						log.error("涓�鐓ゆ満鐧诲綍鑾峰彇token澶辫触");
-						return;
-					}
-					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
-					HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
-							.header("token", token)       // 娣诲姞璁よ瘉澶�
-							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
-							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
-							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
-					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
-					//淇濆瓨璇锋眰璁板綍
-					saveErpRequestRecord("ymj", request.toJSONString(), response.body());
-					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-					contract.setErpPushFlag("1");
-					baseMapper.updateById(contract);
 
-				}
-				if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
-						StrUtil.equals(contract.getPartyBId() + "", smjzt) ||
-						StrUtil.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);
+		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")));
 					}
-
-
-					String token = "";
-					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
-						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
-					} else {
-						token = getErpToken();
-					}
-					if (StrUtil.isEmpty(token)){
-						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
-						return;
-					}
-
-					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
-					HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant1")
-							.header("token", token)       // 娣诲姞璁よ瘉澶�
-							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
-							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
-							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
-					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
-					//淇濆瓨璇锋眰璁板綍
-					saveErpRequestRecord("smj", request.toJSONString(), response.body());
-					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-					contract.setErpPushFlag("1");
-					baseMapper.updateById(contract);
-				}
-				if (StrUtil.equals(contract.getPartyBId() + "", smjsc) && StrUtil.isNotEmpty(smjscErp)) {
-					request.put("customerCode", customer.getErpCompanyCode());
-					request.put("currencyId", "RMB");
-					request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
-					request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
-					request.put("moneySum", contract.getAmount());
-					request.put("signManner", "闈㈢");
-					request.put("salesman", "");
-					request.put("tenantId", "tenant2");
-					if (CollUtil.isNotEmpty(subjectMatterList)) {
-						JSONArray subjectMatter = new JSONArray();
-						subjectMatterList.stream().forEach(contractSubjectMatter -> {
-							JSONObject subjectMatterItem = new JSONObject();
-							subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
-							subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
-							subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
-							subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
-							Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
-									.eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
-							if (ObjUtil.isNotNull(product)) {
-								subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
-							}
-							subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
-									DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
-									DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
-							subjectMatter.add(subjectMatterItem);
-						});
-						request.put("details", subjectMatter);
-					}
-
-					String token = "";
-					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
-						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
-					} else {
-						token = getErpToken();
-					}
-					if (StrUtil.isEmpty(token)){
-						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
-						return;
-					}
-
-					log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
-					HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant2")
-							.header("token", token)       // 娣诲姞璁よ瘉澶�
-							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
-							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
-							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
-					log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
-					//淇濆瓨璇锋眰璁板綍
-					saveErpRequestRecord("smj", request.toJSONString(), response.body());
-					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-					contract.setErpPushFlag("1");
-					baseMapper.updateById(contract);
-				}
-				if (StrUtil.equals(contract.getPartyBId() + "", smjzt) && StrUtil.isNotEmpty(smjztErp)) {
-					request.put("customerCode", customer.getErpCompanyCode());
-					request.put("currencyId", "RMB");
-					request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
-					request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
-					request.put("moneySum", contract.getAmount());
-					request.put("signManner", "闈㈢");
-					request.put("salesman", "");
-					request.put("tenantId", "tenant3");
-					if (CollUtil.isNotEmpty(subjectMatterList)) {
-						JSONArray subjectMatter = new JSONArray();
-						subjectMatterList.stream().forEach(contractSubjectMatter -> {
-							JSONObject subjectMatterItem = new JSONObject();
-							subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
-							subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
-							subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
-							subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
-							Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
-									.eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
-							if (ObjUtil.isNotNull(product)) {
-								subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
-							}
-							subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
-									DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
-									DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
-							subjectMatter.add(subjectMatterItem);
-						});
-						request.put("details", subjectMatter);
-					}
-
-					String token = "";
-					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
-						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
-					} else {
-						token = getErpToken();
-					}
-					if (StrUtil.isEmpty(token)){
-						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
-						return;
-					}
-
-					log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
-					HttpResponse response = HttpRequest.post(smjztErp + "/api/contract/v1/createWithDetails?tenantId=tenant3")
-							.header("token", token)       // 娣诲姞璁よ瘉澶�
-							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
-							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
-							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
-					log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
-					//淇濆瓨璇锋眰璁板綍
-					saveErpRequestRecord("smj", request.toJSONString(), response.body());
-					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
-					contract.setErpPushFlag("1");
-					baseMapper.updateById(contract);
-				}
-				if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
-					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
-					String result = HttpUtil.post(jxcErp, request.toJSONString());
-					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 String getErpToken() {
@@ -1007,14 +1045,14 @@
 		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"));
+			redisTemplate.opsForValue().set("SMJ_ERP_TOKEN", dataJson.getString("token"));
+			log.info("鐭崇叅鏈篹rp token涓猴細{}", dataJson.getString("token"));
 			return dataJson.getString("token");
 		}
 		return "";
 	}
 
-	private String getYmjErpToken(){
+	private String getYmjErpToken() {
 		JSONObject loginJson = new JSONObject();
 		loginJson.put("username", "admin");
 		loginJson.put("password", "admin123");
@@ -1024,14 +1062,14 @@
 		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"));
+			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) {
+	private void saveScheduleProcess(Contract contract, ContractPaymentSchedule schedule) {
 		//鏂板鍚堝悓灞ョ害璁板綍
 		ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
 		process.setContractId(contract.getId());
@@ -1167,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() + "搴旀敹");
@@ -1200,7 +1238,7 @@
 			currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
 			currentConfim.setCompId(contract.getCompId());
 			paymentConfirmMapper.insert(currentConfim);
-			processService.handleBeforeRemain(currentConfim,contract);
+			processService.handleBeforeRemain(currentConfim, contract);
 		}
 
 	}
@@ -1291,7 +1329,7 @@
 		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());
 		}
@@ -1939,8 +1977,8 @@
 		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
 		}
-		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
-				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId()) &&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))) {
 			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
 		}
 		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
@@ -1958,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"));
@@ -1997,21 +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()+"");
-				}
+//				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);
 				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
@@ -2083,8 +2130,8 @@
 		if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
 		}
-		if (updateDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
-				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+		if (updateDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId()) &&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))) {
 			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
 		}
 		if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
@@ -2130,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()) &&
@@ -2318,7 +2374,7 @@
 		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
 		String seqStr = String.format("%04d", sequence);
 		// 5. 鎷兼帴杩斿洖
-		return mainNo +"-"+ seqStr;
+		return mainNo + "-" + seqStr;
 	}
 
 	@Override
@@ -2601,7 +2657,7 @@
 		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());
 		}
@@ -2628,19 +2684,19 @@
 		contract.setSelectionMethod(dto.getSelectionMethod());
 		contract.setIsRelated(dto.getIsRelated());
 		contract.setContractCreater(dto.getContractCreater());
-		if(StrUtil.isNotBlank(dto.getAttachmentUrl())) {
+		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)){
+		if (ObjUtil.isNull(customer)) {
 			return R.failed("瀹㈡埛鏌ヨ寮傚父");
 		}
 
 		R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
-		if (!r.isOk()){
+		if (!r.isOk()) {
 			return R.failed("淇℃伅鏌ヨ寮傚父");
 		}
 		SysDept comp = r.getData();
@@ -2655,13 +2711,20 @@
 		requestApply.put("fd_MainContent", "");
 		requestApply.put("fd_settlementType", "00");
 		requestApply.put("fd_applyType", "澶栭攢");
+		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)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt) ||
 				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
-			requestApply.put("fd_templateId", tempSMJ);
+			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);
@@ -2678,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", StrUtil.isNotEmpty(dto.getContractCreater())?dto.getContractCreater():SecurityUtils.getUser().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)
@@ -2689,49 +2752,49 @@
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
 		requestApply.put("fd_baozhangren", comp.getBaozhangren());
-		requestApply.put("fd_summary",contract.getSummary());
+		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");
+		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");
+		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())){
+		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()));
+			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)){
+		if (CollUtil.isNotEmpty(subjectMatterList)) {
 			JSONArray materialList = new JSONArray();
-			subjectMatterList.stream().forEach(subjectMatter->{
+			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_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)){
+				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_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) ? subjectMatter.getPlannedDeliveryDate() : "");
 				material.put("fd_delivery", "");
 				material.put("fd_des", "");
 				materialList.add(material);
@@ -2749,8 +2812,8 @@
 			takeEffect(contract.getId());
 			return R.ok();
 		}
-		log.error("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
-		return R.failed("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
+		log.error("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}", applyResp.getString("msg"));
+		return R.failed("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}", applyResp.getString("msg"));
 	}
 
 	@Override
@@ -2815,21 +2878,20 @@
 					continue;
 				}
 				BusinessCustomer bc = null;
-				if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)
-						|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)){
+				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(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 {
+				} else {
 					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
 							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
-							.eq(BusinessCustomer::getCompId,SecurityUtils.getUser().getCompId())
+							.eq(BusinessCustomer::getCompId, SecurityUtils.getUser().getCompId())
 							.last("limit 1"));
 				}
 
@@ -2909,20 +2971,20 @@
 				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.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());
+					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());
+						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);
@@ -2935,7 +2997,7 @@
 						subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 						contractSubjectMatterMapper.insert(subjectMatter);
 						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)) {
 							if (StrUtil.isBlank(subMatEx.getMaterialCode())) {
 								handleProduct(subMatEx.getMaterialCode());
@@ -2971,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();
@@ -3155,29 +3222,29 @@
 	@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());
@@ -3192,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
@@ -3206,17 +3273,17 @@
 
 	@Override
 	public R syncContractStatus(SyncContractStatusDTO dto) {
-		if (StrUtil.isBlank(dto.getFd_bizId())){
+		if (StrUtil.isBlank(dto.getFd_bizId())) {
 			return R.failed("鏁版嵁ID涓嶈兘涓虹┖");
 		}
-		log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚屾暟鎹甀D:{}锛屽鎵圭粨鏋滐細{}",dto.getFd_bizId(),dto.getStatus());
-		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.getReturnDate())){
+		if (StrUtil.isBlank(dto.getReturnDate())) {
 			return R.failed("瀹℃壒鏃堕棿涓嶈兘涓虹┖");
 		}
 		Contract contract = baseMapper.selectById(dto.getFd_bizId());
@@ -3227,27 +3294,27 @@
 		if (StrUtil.equals(dto.getStatus(), "1")) {
 			new Thread(() -> {
 				takeEffect(contract.getId());
-				saveContractApproval(contract,dto);
+				saveContractApproval(contract, dto);
 			}).start();
 		}
 		if (StrUtil.equals(dto.getStatus(), "2")) {
 			new Thread(() -> {
 				refuseApproval(contract.getId());
-				saveContractApproval(contract,dto);
+				saveContractApproval(contract, dto);
 			}).start();
 		}
 		if (StrUtil.equals(dto.getStatus(), "3") || StrUtil.equals(dto.getStatus(), "4")) {
 			new Thread(() -> {
-				contract.setContractStatus(3);
+				contract.setContractStatus(4);
 				baseMapper.updateById(contract);
-				saveContractApproval(contract,dto);
+				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.getReturnDate()));
 		approval.setCompId(contract.getCompId());
@@ -3257,10 +3324,10 @@
 	@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());
@@ -3271,24 +3338,24 @@
 		contract.setLinkPhone(attDTO.getLinkPhone());
 		contract.setLastAttachmentName(attDTO.getLastAttachmentName());
 		contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
-		Long betweenDay = DateUtil.betweenDay(attDTO.getExpirationDate(),attDTO.getSignDate(),true);
+		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", StrUtil.isNotEmpty(attDTO.getSinger())?attDTO.getSinger():SecurityUtils.getUser().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", StrUtil.isNotEmpty(attDTO.getLinkPerson())?attDTO.getLinkPerson():"");
-		request.put("fd_linkPhone", StrUtil.isNotEmpty(attDTO.getLinkPhone())?attDTO.getLinkPhone():"");
+		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", StrUtil.isNotEmpty(attDTO.getReviewerNo())?attDTO.getReviewerNo():SecurityUtils.getUser().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);
 		}
@@ -3313,7 +3380,7 @@
 		if (respJson.getString("code").equals("00")) {
 			return R.ok();
 		}
-		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}",respJson.getString("msg"));
+		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}", respJson.getString("msg"));
 	}
 
 
@@ -3446,9 +3513,9 @@
 
 	@Override
 	public R addContractHis(ContractAddDTO addDTO) {
-		Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo())
+		Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo())
 				.last("limit 1"));
-		if (ObjUtil.isNotNull(contract1)){
+		if (ObjUtil.isNotNull(contract1)) {
 			return R.failed("鍚堝悓缂栧彿宸插瓨鍦�");
 		}
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
@@ -3494,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);
 			}
@@ -3540,7 +3607,7 @@
 			}
 		}
 
-		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);
 		}
@@ -3550,7 +3617,7 @@
 	@Override
 	public R getFinallyInfo(Long id) {
 		Contract contract = baseMapper.selectById(id);
-		return R.ok(BeanUtil.copyProperties(contract,ContractFinallyVo.class));
+		return R.ok(BeanUtil.copyProperties(contract, ContractFinallyVo.class));
 	}
 
 	@Override
@@ -3558,8 +3625,7 @@
 		Contract contract = baseMapper.selectById(id);
 		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
 				.eq(ContractSubjectMatter::getContractId, id));
-		pushSubCompany(contract,subjectMatterList);
-		return R.ok();
+		return pushSubCompany(contract, subjectMatterList);
 	}
 
 	@Override
@@ -3573,20 +3639,20 @@
 	@Override
 	public R getInvoiceObj(Long id) {
 		Contract contract = baseMapper.selectById(id);
-		ContractInvoiceObjVo objVo = BeanUtil.copyProperties(contract,ContractInvoiceObjVo.class);
+		ContractInvoiceObjVo objVo = BeanUtil.copyProperties(contract, ContractInvoiceObjVo.class);
 		List<BusinessCustomerSelectVo> selectVoList = new ArrayList<>();
 		BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
-		if (ObjUtil.isNotNull(a)){
+		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);
+			objVo.setInvoiceType(StrUtil.isNotBlank(a.getInvoiceType()) ? a.getInvoiceType() : "01");
+			BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(a, BusinessCustomerSelectVo.class);
 			selectVoList.add(selectVo);
 		}
-		if (ObjUtil.isNotNull(contract.getPartyCId())){
+		if (ObjUtil.isNotNull(contract.getPartyCId())) {
 			BusinessCustomer c = businessCustomerMapper.selectById(contract.getPartyCId());
-			if (ObjUtil.isNotNull(c)){
-				BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(c,BusinessCustomerSelectVo.class);
+			if (ObjUtil.isNotNull(c)) {
+				BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(c, BusinessCustomerSelectVo.class);
 				selectVoList.add(selectVo);
 			}
 		}
@@ -3601,9 +3667,9 @@
 
 	@Override
 	public R addContractHisNoCenter(ContractAddDTO addDTO) {
-		Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo())
+		Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo())
 				.last("limit 1"));
-		if (ObjUtil.isNotNull(contract1)){
+		if (ObjUtil.isNotNull(contract1)) {
 			return R.failed("鍚堝悓缂栧彿宸插瓨鍦�");
 		}
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
@@ -3649,8 +3715,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);
 			}
@@ -3695,7 +3761,7 @@
 			}
 		}
 
-		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);
 		}
@@ -3740,8 +3806,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);
 			}
@@ -3787,7 +3853,7 @@
 			}
 		}
 
-		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);
 		}
@@ -3803,8 +3869,8 @@
 		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
 		}
-		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
-				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId()) &&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))) {
 			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
 		}
 		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
@@ -3860,12 +3926,12 @@
 			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())
+				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.isNotNull(product)) {
+					subjectMatter.setMaterialInternalName(product.getId() + "");
 				}
-				if (ObjUtil.isNull(product)){
+				if (ObjUtil.isNull(product)) {
 					product = new Product();
 					product.setParentId(2101559148831944705L);
 					product.setProductName(subjectMatter.getMaterialInternalName());
@@ -3874,7 +3940,7 @@
 					product.setTaxCode("1090117040000000000");
 					product.setTaxClass("娉�");
 					productMapper.insert(product);
-					subjectMatter.setMaterialInternalName(product.getId()+"");
+					subjectMatter.setMaterialInternalName(product.getId() + "");
 				}
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
@@ -3946,7 +4012,7 @@
 	@Override
 	public R addContractOrder(ContractOrderAddDTO addDTO) {
 		Contract main = baseMapper.selectById(addDTO.getParentId());
-		Contract branch = BeanUtil.copyProperties(main,Contract.class,"id");
+		Contract branch = BeanUtil.copyProperties(main, Contract.class, "id");
 		branch.setPartyAId(addDTO.getPartyAId());
 		branch.setPartyA(addDTO.getPartyA());
 		branch.setAttachmentUrl(addDTO.getAttachmentUrl());
@@ -4017,4 +4083,47 @@
 
 		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