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

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java |  400 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 334 insertions(+), 66 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 b03c778..39a96c3 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
@@ -29,12 +29,14 @@
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
 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;
@@ -93,6 +95,8 @@
 	private final ContractPaymentScheduleProcessService processService;
 	private final ContractSubjectMatterChangeMapper changeMapper;
 	private final ContractApprovalMapper contractApprovalMapper;
+	private final TaxCodeMapper taxCodeMapper;
+	private final ContractSubjectMatterService contractSubjectMatterService;
 
 	@Value("${erp.ymj}")
 	private String ymjErp;
@@ -157,8 +161,10 @@
 	@Override
 	public R add(ContractAddDTO addDTO) {
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
-		contract.setPartyBId(SecurityUtils.getUser().getCompId());
-		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (!StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")&&!StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")) {
+			contract.setPartyBId(SecurityUtils.getUser().getCompId());
+			contract.setPartyB(SecurityUtils.getUser().getCompName());
+		}
 		if (StrUtil.isEmpty(addDTO.getPartyA())) {
 			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
 			if (ObjUtil.isNotNull(bc)) {
@@ -559,7 +565,15 @@
 		requestApply.put("fd_customerName", contract.getPartyA());
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
-		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		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)) {
+			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();
@@ -788,7 +802,8 @@
 					baseMapper.updateById(contract);
 
 				}
-				if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
+				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");
@@ -806,8 +821,17 @@
 							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()));
+							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")));
 							}
@@ -1915,6 +1939,10 @@
 		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("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
 		}
@@ -1969,23 +1997,18 @@
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				if (StrUtil.isNotBlank(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.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);
@@ -2059,6 +2082,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("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
@@ -2283,6 +2310,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
@@ -2778,9 +2814,25 @@
 					errList.add(map);
 					continue;
 				}
-				BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
-						.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
-						.last("limit 1"));
+				BusinessCustomer bc = null;
+				if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)
+						|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)){
+					List<String> smjList = new ArrayList<>();
+					smjList.add(smj);
+					smjList.add(smjsc);
+					smjList.add(smjzt);
+					smjList.add(smjhw);
+					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+							.in(BusinessCustomer::getCompId, smjList)
+							.last("limit 1"));
+				}else {
+					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+							.eq(BusinessCustomer::getCompId,SecurityUtils.getUser().getCompId())
+							.last("limit 1"));
+				}
+
 				if (ObjUtil.isNull(bc)) {
 					Map<String, String> map = new HashMap<String, String>();
 					map.put("lineNum", "绗�" + (i + 1) + "琛�");
@@ -2864,11 +2916,15 @@
 				baseMapper.insert(contract);
 				BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
 				List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
-						StrUtil.isNotBlank(item.getMaterialCode()) &&
 								StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
 				if (CollUtil.isNotEmpty(resultMatter)) {
+					log.info("鍚堝悓缂栧彿锛歿},鏍囩殑鐗╀釜鏁�:{}",contract.getContractNo(),resultMatter.size());
 					for (ContractSubjectMatterExceVO subMatEx : resultMatter
 					) {
+						if (StrUtil.isBlank(subMatEx.getDataId())&&StrUtil.isBlank(subMatEx.getMaterialCode())){
+							log.error("鍚堝悓缂栧彿锛歿},鏍囩殑鐗�:{}鏍囩殑鐗ヾataId鍜宮aterialCode鍚屾椂涓虹┖",contract.getContractNo(),subMatEx.getMaterialName());
+							continue;
+						}
 						ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(subMatEx, ContractSubjectMatter.class);
 						subjectMatter.setContractId(contract.getId());
 						subjectMatter.setDeliveredQuantity(StrUtil.isBlank(subMatEx.getDeliveredQuantity())
@@ -2878,25 +2934,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());
+							}
+						}
 
 					}
 				}
@@ -2957,6 +3001,154 @@
 			return R.failed("鏂囦欢瑙f瀽澶辫触: " + e.getMessage());
 		}
 		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"));
+				}
+			}
+		}
 	}
 
 
@@ -3077,6 +3269,8 @@
 		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);
@@ -3117,9 +3311,6 @@
 		log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
 		JSONObject respJson = JSONObject.parseObject(resp);
 		if (respJson.getString("code").equals("00")) {
-			contract.setLastAttachmentName(attDTO.getLastAttachmentName());
-			contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
-			baseMapper.updateById(contract);
 			return R.ok();
 		}
 		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}",respJson.getString("msg"));
@@ -3612,6 +3803,10 @@
 		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("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
 		}
@@ -3665,23 +3860,21 @@
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				if (StrUtil.isNotBlank(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.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.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);
@@ -3749,4 +3942,79 @@
 		//鎺ㄩ�佸悎鍚屼腑蹇�
 		return R.ok(contract.getContractNo());
 	}
+
+	@Override
+	public R addContractOrder(ContractOrderAddDTO addDTO) {
+		Contract main = baseMapper.selectById(addDTO.getParentId());
+		Contract branch = BeanUtil.copyProperties(main,Contract.class,"id");
+		branch.setPartyAId(addDTO.getPartyAId());
+		branch.setPartyA(addDTO.getPartyA());
+		branch.setAttachmentUrl(addDTO.getAttachmentUrl());
+		branch.setAttachmentName(addDTO.getAttachmentName());
+		branch.setRemark(addDTO.getRemark());
+		branch.setParentId(addDTO.getParentId());
+		branch.setContractNo(generateBranchContractNo(main.getContractNo()));
+
+		baseMapper.insert(branch);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(branch.getId());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+				contractSubjectMatterMapper.insert(subjectMatter);
+			});
+			branch.setAmount(addDTO.getContractSubjectMatter().stream().map(item -> item.getUnitPrice().multiply(item.getQuantity()))
+					// 绱姞鎵�鏈夐噾棰濓紝璁剧疆鍒濆鍊间负0
+					.reduce(BigDecimal.ZERO, BigDecimal::add));
+			baseMapper.updateById(branch);
+		}
+
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(branch.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+				}
+				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+					if (schedule.getEffectiveDate().before(DateUtil.date())) {
+						schedule.setFulfillmentStatus(1);
+					} else {
+						schedule.setFulfillmentStatus(0);
+					}
+				}
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				schedule.setContractId(branch.getId());
+				schedule.setContractName(branch.getContractName());
+				schedule.setPlannedAmount(branch.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					branch.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					branch.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					branch.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+			});
+
+		}
+
+
+		return R.ok();
+	}
 }

--
Gitblit v1.9.1