feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位

shiyunteng

昨天 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java

@@ -5,7 +5,6 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
@@ -29,7 +28,6 @@
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
@@ -49,6 +47,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

@@ -101,6 +100,12 @@
   @Value("${erp.smj}")
   private String smjErp;

   @Value("${erp.smjsc}")
   private String smjscErp;

   @Value("${erp.smjzt}")
   private String smjztErp;

   @Value("${erp.sgb}")
   private String sgbErp;

@@ -118,6 +123,9 @@

   @Value("${dept.smjzt}")
   private String smjzt;

   @Value("${dept.smjhw}")
   private String smjhw;

   @Value("${dept.sgb}")
   private String sgb;
@@ -196,7 +204,8 @@
      }

      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         contract.setContractNo(generateSMJContractNo());
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -320,7 +329,8 @@
      contract.setBillingAmout(new BigDecimal("0"));
      contract.setNickName(SecurityUtils.getUser().getNickname());
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         contract.setContractNo(generateSMJContractNo());
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -515,12 +525,13 @@
      requestApply.put("fd_settlementType", "00");
      requestApply.put("fd_applyType", "外销");
      if (CollUtil.isNotEmpty(subjectMatterList)) {
         requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
         requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
      }
      requestApply.put("fd_docNumber", contract.getContractNo());
//      requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         requestApply.put("fd_templateId", tempSMJ);
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -538,16 +549,18 @@
      requestApply.put("fd_name", contract.getContractName());
      requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
      requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
      requestApply.put("fd_contractCreater", contract.getNickName());
      requestApply.put("fd_contractCreater", SecurityUtils.getUser().getNickname());
      requestApply.put("fd_currency", "人民币");
      requestApply.put("fd_ContractAmount", contract.getAmount());
      requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
            .multiply(new BigDecimal("87")));
      requestApply.put("fd_docStatus", "20");
      requestApply.put("fd_docStatus", "10");
      requestApply.put("fd_taxRates", 13);
      requestApply.put("fd_customerName", contract.getPartyA());
      requestApply.put("fd_systemSource", "非煤销售系统");
      requestApply.put("fd_type", "00");
      requestApply.put("fd_baozhangren", comp.getBaozhangren());
      requestApply.put("fd_summary",contract.getSummary());
      JSONArray signList = new JSONArray();
      JSONObject j = new JSONObject();
      j.put("fd_standing","甲");
@@ -555,19 +568,48 @@
      j.put("fd_signMain","2");
      signList.add(j);
      JSONObject y = new JSONObject();
      y.put("fd_standing","甲");
      y.put("fd_standing","乙");
      y.put("fd_Iden",comp.getOrgCode());
      y.put("fd_signMain","1");
      signList.add(y);
      requestApply.put("fd_signList", signList);
      if (StrUtil.isNotBlank(contract.getAttachmentUrl())) {
      JSONArray attList = new JSONArray();
      JSONObject att = new JSONObject();
      att.put("fd_attNum","1");
      att.put("fd_attName",contract.getAttachmentName());
         att.put("fd_attType", contract.getAttachmentName().substring(contract.getAttachmentName().lastIndexOf('.')+1));
      att.put("fd_attQuality","00");
      att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
      attList.add(att);
      requestApply.put("attList", att);
         requestApply.put("attList", attList);
      }
      if (CollUtil.isNotEmpty(subjectMatterList)){
         JSONArray materialList = new JSONArray();
         subjectMatterList.stream().forEach(subjectMatter->{
            JSONObject material = new JSONObject();
            material.put("fd_materiaCode", subjectMatter.getMaterialCode());
            material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
            material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
            material.put("fd_figureNumber", "");
            material.put("fd_measureUnit", subjectMatter.getUnit());
            material.put("fd_number", subjectMatter.getQuantity());
            material.put("fd_price", subjectMatter.getUnitPrice());
            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
            if (ObjUtil.isNotNull(product)){
               material.put("fd_rate", product.getTaxRate().toString());
            }
            material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
            material.put("fd_requirements", "");
            material.put("fd_standard", "");
            material.put("fd_factory", "");
            material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
            material.put("fd_delivery", "");
            material.put("fd_des", "");
            materialList.add(material);
         });
         requestApply.put("materialList", materialList);
      }
      log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString());
      String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
      log.info("合同中心合同起草接口回参：{}", respApply);
@@ -632,7 +674,7 @@
            requestApply.put("fd_MainContent", "");
            requestApply.put("fd_settlementType", "00");
            requestApply.put("fd_applyType", "外销");
            requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
            requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
            requestApply.put("fd_docNumber", contract.getContractNo());
            requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
            requestApply.put("fd_name", contract.getContractName());
@@ -664,7 +706,7 @@
               request.put("fd_receivedNum", 1);
               request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
               request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
               request.put("fd_reviewerNo", contract.getNickName());
               request.put("fd_reviewerNo", SecurityUtils.getUser().getNickname());
               request.put("fd_docStatus", "20");
               request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
               request.put("fd_attName", contract.getAttachmentName());
@@ -722,19 +764,19 @@
                  });
                  request.put("details", subjectMatter);
               }

               JSONObject loginJson = new JSONObject();
               loginJson.put("username", "admin");
               loginJson.put("password", "admin123");
               log.info("一煤机合同推送获取token入参：{}", loginJson.toJSONString());
               String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
               log.info("一煤机合同推送获取token回参：{}", loginResp);
               JSONObject respJson = JSONObject.parseObject(loginResp);
               if (respJson.getInteger("code") == 0) {
                  JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
               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("一煤机合同推送erp入参：{}", request.toJSONString());
                  HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
                        .header("token", dataJson.getString("token"))       // 添加认证头
                     .header("token", token)       // 添加认证头
                        .header("Content-Type", "application/json")         // 设置内容类型
                        .body(request.toJSONString())                        // 设置请求体
                        .execute();                                         // 执行请求.post(ymjErp,request.toJSONString());
@@ -744,11 +786,10 @@
                  //更新合同erp推送标识
                  contract.setErpPushFlag("1");
                  baseMapper.updateById(contract);
               }

            }
            if ((StrUtil.equals(contract.getPartyBId() + "", smj) || StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
                  StrUtil.equals(contract.getPartyBId() + "", smjzt)) && StrUtil.isNotEmpty(smjErp)) {
            if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
                  StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) && StrUtil.isNotEmpty(smjErp)) {
               request.put("customerCode", customer.getErpCompanyCode());
               request.put("currencyId", "RMB");
               request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
@@ -756,6 +797,7 @@
               request.put("moneySum", contract.getAmount());
               request.put("signManner", "面签");
               request.put("salesman", "");
               request.put("tenantId", "tenant1");
               if (CollUtil.isNotEmpty(subjectMatterList)) {
                  JSONArray subjectMatter = new JSONArray();
                  subjectMatterList.stream().forEach(contractSubjectMatter -> {
@@ -777,18 +819,21 @@
                  request.put("details", subjectMatter);
               }

               JSONObject loginJson = new JSONObject();
               loginJson.put("username", "admin");
               loginJson.put("password", "Zimafold@2026");
               log.info("石煤机合同推送获取token入参：{}", loginJson.toJSONString());
               String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
               log.info("石煤机合同推送获取token回参：{}", loginResp);
               JSONObject respJson = JSONObject.parseObject(loginResp);
               if (respJson.getInteger("code") == 0) {
                  JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));

               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("石煤机登录获取token失败");
                  return;
               }

                  log.info("石煤机合同推送erp入参：{}", request.toJSONString());
                  HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails")
                        .header("token", dataJson.getString("token"))       // 添加认证头
               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());
@@ -799,8 +844,114 @@
                  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("石煤机登录获取token失败");
                  return;
               }

               log.info("石煤机随车分公司合同推送erp入参：{}", 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("石煤机随车分公司合同推送erp回参：{}", 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("石煤机登录获取token失败");
                  return;
               }

               log.info("石煤机钻探分公司合同推送erp入参：{}", 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("石煤机钻探分公司合同推送erp回参：{}", 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("机械厂合同推送erp入参：{}", request.toJSONString());
               String result = HttpUtil.post(jxcErp, request.toJSONString());
@@ -822,6 +973,40 @@

   }

   private String getErpToken() {
      JSONObject loginJson = new JSONObject();
      loginJson.put("username", "admin");
      loginJson.put("password", "Zimafold@2026");
      log.info("石煤机产品获取token入参：{}", loginJson.toJSONString());
      String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
      log.info("石煤机产品获取token回参：{}", loginResp);
      JSONObject respJson = JSONObject.parseObject(loginResp);
      if (respJson.getInteger("code") == 0) {
         JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
         redisTemplate.opsForValue().set("SMJ_ERP_TOKEN",dataJson.getString("token"));
         log.info("石煤机erp token为：{}",dataJson.getString("token"));
         return dataJson.getString("token");
      }
      return "";
   }

   private String getYmjErpToken(){
      JSONObject loginJson = new JSONObject();
      loginJson.put("username", "admin");
      loginJson.put("password", "admin123");
      log.info("一煤机合同推送获取token入参：{}", loginJson.toJSONString());
      String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
      log.info("一煤机合同推送获取token回参：{}", loginResp);
      JSONObject respJson = JSONObject.parseObject(loginResp);
      if (respJson.getInteger("code") == 0) {
         JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
         redisTemplate.opsForValue().set("YMJ_ERP_TOKEN",dataJson.getString("token"));
         log.info("一煤机erp token为：{}",dataJson.getString("token"));
         return dataJson.getString("token");
      }
      return "";
   }

   private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
      //新增合同履约记录
      ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
@@ -830,7 +1015,12 @@
      process.setScheduleId(schedule.getId());
      process.setScheduleName(schedule.getStageName());
      process.setProcessDate(contract.getSignDate());
      ContractPaymentScheduleProcess lastProcess = contractPaymentScheduleProcessMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery()
            .eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
            .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
      if (ObjUtil.isNull(lastProcess)) {
      contractPaymentScheduleProcessMapper.insert(process);
      }
   }

   private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
@@ -1076,7 +1266,8 @@
      newContract.setContractStatus(0);
      newContract.setBillingAmout(new BigDecimal("0"));
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         newContract.setContractNo(generateSMJContractNo());
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -1716,6 +1907,10 @@

   @Override
   public R addContractSgb(ContractAddDTO addDTO) {
      Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, addDTO.getDataId()).last("limit 1"));
      if (ObjUtil.isNotNull(contractOld)) {
         return R.failed("合同数据ID：{}已存在，不能新增重复数据", addDTO.getDataId());
      }
      if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
         return R.failed("请添加标的物");
      }
@@ -1773,7 +1968,24 @@
         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()+"");
               }
            }
            subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
            subjectMatter.setDeliveryStatus(0);
            subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
@@ -1838,7 +2050,7 @@
      }

      //推送合同中心
      pushCenter(contract.getId());
//      pushCenter(contract.getId());
      return R.ok(contract.getContractNo());
   }

@@ -2351,7 +2563,8 @@
      contract.setNickName(SecurityUtils.getUser().getNickname());

      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         contract.setContractNo(generateSMJContractNo());
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -2371,8 +2584,17 @@
   }

   @Override
   public R pushCenter(Long id) {
      Contract contract = baseMapper.selectById(id);
   public R pushCenter(PushCenterDTO dto) {
      Contract contract = baseMapper.selectById(dto.getId());

      contract.setSelectionMethod(dto.getSelectionMethod());
      contract.setIsRelated(dto.getIsRelated());
      contract.setContractCreater(dto.getContractCreater());
      if(StrUtil.isNotBlank(dto.getAttachmentUrl())) {
         contract.setAttachmentName(dto.getAttachmentName());
         contract.setAttachmentUrl(dto.getAttachmentUrl());
      }
      baseMapper.updateById(contract);

      BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
      if (ObjUtil.isNull(customer)){
@@ -2386,20 +2608,21 @@
      SysDept comp = r.getData();

      List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
            .eq(ContractSubjectMatter::getContractId, id));
            .eq(ContractSubjectMatter::getContractId, dto.getId()));
      JSONObject requestApply = new JSONObject();
      requestApply.put("fd_selectionmethod", "公开招标");
      requestApply.put("fd_isrelated", "是");
      requestApply.put("fd_selectionmethod", dto.getSelectionMethod());
      requestApply.put("fd_isrelated", dto.getIsRelated());
      requestApply.put("fd_bizId", contract.getId());
      requestApply.put("fd_remark", contract.getRemark());
      requestApply.put("fd_MainContent", "");
      requestApply.put("fd_settlementType", "00");
      requestApply.put("fd_applyType", "外销");
      requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
      requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
      requestApply.put("fd_docNumber", contract.getContractNo());

      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         requestApply.put("fd_templateId", tempSMJ);
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -2417,7 +2640,7 @@
      requestApply.put("fd_name", contract.getContractName());
      requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
      requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
      requestApply.put("fd_contractCreater", contract.getNickName());
      requestApply.put("fd_contractCreater", StrUtil.isNotEmpty(dto.getContractCreater())?dto.getContractCreater():SecurityUtils.getUser().getNickname());
      requestApply.put("fd_currency", "人民币");
      requestApply.put("fd_ContractAmount", contract.getAmount());
      requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
@@ -2427,6 +2650,8 @@
      requestApply.put("fd_customerName", contract.getPartyA());
      requestApply.put("fd_systemSource", "非煤销售系统");
      requestApply.put("fd_type", "00");
      requestApply.put("fd_baozhangren", comp.getBaozhangren());
      requestApply.put("fd_summary",contract.getSummary());
      JSONArray signList = new JSONArray();
      JSONObject j = new JSONObject();
      j.put("fd_standing","甲");
@@ -2434,11 +2659,12 @@
      j.put("fd_signMain","2");
      signList.add(j);
      JSONObject y = new JSONObject();
      y.put("fd_standing","甲");
      y.put("fd_standing","乙");
      y.put("fd_Iden",comp.getOrgCode());
      y.put("fd_signMain","1");
      signList.add(y);
      requestApply.put("fd_signList", signList);
      if(StrUtil.isNotBlank(contract.getAttachmentUrl())){
      JSONArray attList = new JSONArray();
      JSONObject att = new JSONObject();
      att.put("fd_attNum","1");
@@ -2447,16 +2673,44 @@
      att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
      attList.add(att);
      requestApply.put("attList", att);
      log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString());
      }
      if (CollUtil.isNotEmpty(subjectMatterList)){
         JSONArray materialList = new JSONArray();
         subjectMatterList.stream().forEach(subjectMatter->{
            JSONObject material = new JSONObject();
            material.put("fd_materiaCode", subjectMatter.getMaterialCode());
            material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
            material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
            material.put("fd_figureNumber", "");
            material.put("fd_measureUnit", subjectMatter.getUnit());
            material.put("fd_number", subjectMatter.getQuantity());
            material.put("fd_price", subjectMatter.getUnitPrice());
            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
            if (ObjUtil.isNotNull(product)){
               material.put("fd_rate", product.getTaxRate().toString());
            }
            material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
            material.put("fd_requirements", "");
            material.put("fd_standard", "");
            material.put("fd_factory", "");
            material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
            material.put("fd_delivery", "");
            material.put("fd_des", "");
            materialList.add(material);
         });
         requestApply.put("materialList", materialList);
      }
      log.info("工业泵推送——合同中心合同起草接口入参：{}", requestApply.toJSONString());
      String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
      log.info("合同中心合同起草接口回参：{}", respApply);
      log.info("工业泵推送——合同中心合同起草接口回参：{}", respApply);
      JSONObject applyResp = JSONObject.parseObject(respApply);
      if (applyResp.getString("code").equals("00")) {
         contract.setCenterPushFlag("1");
         baseMapper.updateById(contract);
         return R.ok();
      }
      return R.failed("推送合同中心审核失败，原因为：{}",applyResp.getString("msg"));
      log.error("工业泵推送——推送合同中心审核失败，原因为：{}",applyResp.getString("msg"));
      return R.failed("工业泵推送——推送合同中心审核失败，原因为：{}",applyResp.getString("msg"));
   }

   @Override
@@ -2755,8 +3009,9 @@

   @Override
   public R syncContractStatus(SyncContractStatusDTO dto) {
      if (StrUtil.isBlank(dto.getContractNumber())){
         return R.failed("合同编号不能为空");
      log.info("合同审批结果同步，合同编号:{}，审批结果：{}",dto.getContractNumber(),dto.getStatus());
      if (StrUtil.isBlank(dto.getFd_bizId())){
         return R.failed("数据ID不能为空");
      }
      if (StrUtil.isBlank(dto.getStatus())){
         return R.failed("审批状态不能为空");
@@ -2764,18 +3019,22 @@
      if (StrUtil.isBlank(dto.getReturnPerson())){
         return R.failed("审批人不能为空");
      }
      if (StrUtil.isBlank(dto.getReturnDateTime())){
      if (StrUtil.isBlank(dto.getReturnDate())){
         return R.failed("审批时间不能为空");
      }
      Contract contract = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,dto.getContractNumber()).last("limit 1"));
      Contract contract = baseMapper.selectById(dto.getFd_bizId());
      if(ObjUtil.isNull(contract)){
         return R.failed("合同编号不异常");
         return R.failed("数据ID异常");
      }
      if (StrUtil.equals(dto.getStatus(),"1")){
         takeEffect(contract.getId());
      }
      if (!StrUtil.equals(dto.getStatus(),"1")){
      if (StrUtil.equals(dto.getStatus(),"2")){
         refuseApproval(contract.getId());
      }
      if (StrUtil.equals(dto.getStatus(),"3")||StrUtil.equals(dto.getStatus(),"4")){
         contract.setContractStatus(3);
         baseMapper.updateById(contract);
      }
      saveContractApproval(contract,dto);
      return R.ok();
@@ -2784,7 +3043,7 @@
   private void saveContractApproval(Contract contract, SyncContractStatusDTO dto) {
      ContractApproval approval = BeanUtil.copyProperties(dto,ContractApproval.class);
      approval.setContractId(contract.getId());
      approval.setReturnDateTime(DateUtil.parseDateTime(dto.getReturnDateTime()));
      approval.setReturnDateTime(DateUtil.parseDateTime(dto.getReturnDate()));
      approval.setCompId(contract.getCompId());
      contractApprovalMapper.insert(approval);
   }
@@ -2798,21 +3057,31 @@
      if (!StrUtil.equals(contract.getContractStatus()+"","2")){
         return R.failed("合同异常状态");
      }
      contract.setSignDate(attDTO.getSignDate());
      contract.setExpirationDate(attDTO.getExpirationDate());
      contract.setSinger(attDTO.getSinger());
      contract.setReviewerNo(attDTO.getReviewerNo());
      contract.setLinkPerson(attDTO.getLinkPerson());
      contract.setLinkPhone(attDTO.getLinkPhone());
      Long betweenDay = DateUtil.betweenDay(attDTO.getExpirationDate(),attDTO.getSignDate(),true);
      contract.setDeliveryCycle(betweenDay.intValue());
      baseMapper.updateById(contract);
      JSONObject request = new JSONObject();
      request.put("fd_docNumber", contract.getContractNo());
      request.put("fd_singer", contract.getNickName());
      request.put("fd_singer", StrUtil.isNotEmpty(attDTO.getSinger())?attDTO.getSinger():SecurityUtils.getUser().getNickname());
      request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
      request.put("fd_linkPerson", "");
      request.put("fd_linkPhone", "");
      request.put("fd_linkPerson", StrUtil.isNotEmpty(attDTO.getLinkPerson())?attDTO.getLinkPerson():"");
      request.put("fd_linkPhone", StrUtil.isNotEmpty(attDTO.getLinkPhone())?attDTO.getLinkPhone():"");
      request.put("fd_address", contract.getSignPlace());
      request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
      request.put("fd_receivedNum", 1);
      request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
      request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
      request.put("fd_reviewerNo", contract.getNickName());
      request.put("fd_reviewerNo", StrUtil.isNotEmpty(attDTO.getReviewerNo())?attDTO.getReviewerNo():SecurityUtils.getUser().getNickname());
      request.put("fd_docStatus", "20");
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         request.put("fd_templateId", tempSMJ);
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -3067,4 +3336,51 @@
      }
      return R.ok();
   }

   @Override
   public R getFinallyInfo(Long id) {
      Contract contract = baseMapper.selectById(id);
      return R.ok(BeanUtil.copyProperties(contract,ContractFinallyVo.class));
   }

   @Override
   public R erpPush(Long id) {
      Contract contract = baseMapper.selectById(id);
      List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
            .eq(ContractSubjectMatter::getContractId, id));
      pushSubCompany(contract,subjectMatterList);
      return R.ok();
   }

   @Override
   public R associationPartyC(ContractAssociationPartyCyDTO associationPartyCyDTO) {
      Contract contract = baseMapper.selectById(associationPartyCyDTO.getId());
      contract.setPartyCId(Long.valueOf(associationPartyCyDTO.getPartyCId()));
      baseMapper.updateById(contract);
      return R.ok();
   }

   @Override
   public R getInvoiceObj(Long id) {
      Contract contract = baseMapper.selectById(id);
      ContractInvoiceObjVo objVo = BeanUtil.copyProperties(contract,ContractInvoiceObjVo.class);
      List<BusinessCustomerSelectVo> selectVoList = new ArrayList<>();
      BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
      if (ObjUtil.isNotNull(a)){
         objVo.setPartyA(a.getCompanyName());
         objVo.setPartyAOrgCode(a.getCreditCode());
         objVo.setInvoiceType(StrUtil.isNotBlank(a.getInvoiceType())?a.getInvoiceType():"01");
         BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(a,BusinessCustomerSelectVo.class);
         selectVoList.add(selectVo);
      }
      if (ObjUtil.isNotNull(contract.getPartyCId())){
         BusinessCustomer c = businessCustomerMapper.selectById(contract.getPartyCId());
         if (ObjUtil.isNotNull(c)){
            BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(c,BusinessCustomerSelectVo.class);
            selectVoList.add(selectVo);
         }
      }
      objVo.setLinkPartyC(selectVoList);
      return R.ok(objVo);
   }
}