From 8edd99e0bed2e48d7d9586aefdedaea5ba940065 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Wed, 29 Oct 2025 09:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=88=E5=90=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=97=B6erp=E5=85=AC=E5=8F=B8=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 68 ++++++------------- 1 file changed, 20 insertions(+), 48 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 8d3b1eb..2dfb4f8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -26,11 +26,13 @@ import com.zt.plat.module.contractorder.api.dto.contract.*; import com.zt.plat.module.contractorder.api.vo.contract.*; import com.zt.plat.module.contractorder.dal.dataobject.contract.*; import com.zt.plat.module.contractorder.dal.mysql.contract.*; -import com.zt.plat.module.contractorder.enums.*; +import com.zt.plat.module.contractorder.enums.DateConstants; +import com.zt.plat.module.contractorder.enums.DictTypeConstants; +import com.zt.plat.module.contractorder.enums.ProcessConstants; +import com.zt.plat.module.contractorder.enums.TableFieldConstants; import com.zt.plat.module.contractorder.enums.contract.DictEnum; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpContractPageReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO; -import com.zt.plat.module.erp.dal.dataobject.erp.ErpCompanyDO; import com.zt.plat.module.erp.dal.dataobject.erp.ErpContractDO; import com.zt.plat.module.erp.service.erp.ErpCompanyService; import com.zt.plat.module.erp.service.erp.ErpContractService; @@ -145,30 +147,14 @@ public class ContractServiceImpl implements ContractService { // 合同主信息 ContractMainDO contractMainDO = BeanUtils.toBean(reqVO, ContractMainDO.class); - // 校验ERP的公司 - if (StringUtils.isNotEmpty(reqVO.getPurchaseCompanyNumber()) - || StringUtils.isNotEmpty(reqVO.getSalesCompanyNumber())) { - if (StringUtils.isNotEmpty(reqVO.getPurchaseCompanyNumber())) { - ErpCompanyDO erpCompany = erpCompanyService.getErpCompanyByNumber(reqVO.getPurchaseCompanyNumber()); - if (erpCompany == null) { - throw exception(CONTRACT_ERP_COMPANY_PLEASE_BIND, ApiConstants.PURCHASE); - } else { - contractMainDO.setErpPurchaseCompanyNumber(erpCompany.getNumber()); - contractMainDO.setErpPurchaseCompanyName(erpCompany.getName()); - } - } - if (StringUtils.isNotEmpty(reqVO.getSalesCompanyNumber())) { - ErpCompanyDO erpCompany = erpCompanyService.getErpCompanyByNumber(reqVO.getSalesCompanyNumber()); - if (erpCompany == null) { - throw exception(CONTRACT_ERP_COMPANY_PLEASE_BIND, ApiConstants.SALES); - } else { - contractMainDO.setErpSalesCompanyNumber(erpCompany.getNumber()); - contractMainDO.setErpSalesCompanyName(erpCompany.getName()); - } - } - } - - + // ERP甲方公司编号 + contractMainDO.setErpPurchaseCompanyNumber(reqVO.getPurchaseCompanyNumber()); + // ERP甲方公司名称 + contractMainDO.setErpPurchaseCompanyName(reqVO.getPurchaseCompanyName()); + // ERP乙方公司编码 + contractMainDO.setErpSalesCompanyNumber(reqVO.getSalesCompanyNumber()); + // ERP乙方公司名称 + contractMainDO.setErpSalesCompanyName(reqVO.getSalesCompanyName()); // 合同状态保存为草稿 contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_DRAFT.getCode()); // 生成系统合同编号 @@ -731,28 +717,14 @@ public class ContractServiceImpl implements ContractService { // 请求更新的合同信息 ContractMainDO newContractMainDO = BeanUtils.toBean(reqVO, ContractMainDO.class); - // 校验ERP的公司 - if (StringUtils.isNotEmpty(reqVO.getPurchaseCompanyNumber()) - || StringUtils.isNotEmpty(reqVO.getSalesCompanyNumber())) { - if (StringUtils.isNotEmpty(reqVO.getPurchaseCompanyNumber())) { - ErpCompanyDO erpCompany = erpCompanyService.getErpCompanyByNumber(reqVO.getPurchaseCompanyNumber()); - if (erpCompany == null) { - throw exception(CONTRACT_ERP_COMPANY_PLEASE_BIND, ApiConstants.PURCHASE); - } else { - newContractMainDO.setErpPurchaseCompanyNumber(erpCompany.getNumber()); - newContractMainDO.setErpPurchaseCompanyName(erpCompany.getName()); - } - } - if (StringUtils.isNotEmpty(reqVO.getSalesCompanyNumber())) { - ErpCompanyDO erpCompany = erpCompanyService.getErpCompanyByNumber(reqVO.getSalesCompanyNumber()); - if (erpCompany == null) { - throw exception(CONTRACT_ERP_COMPANY_PLEASE_BIND, ApiConstants.SALES); - } else { - newContractMainDO.setErpSalesCompanyNumber(erpCompany.getNumber()); - newContractMainDO.setErpSalesCompanyName(erpCompany.getName()); - } - } - } + // ERP甲方公司编号 + newContractMainDO.setErpPurchaseCompanyNumber(reqVO.getPurchaseCompanyNumber()); + // ERP甲方公司名称 + newContractMainDO.setErpPurchaseCompanyName(reqVO.getPurchaseCompanyName()); + // ERP乙方公司编码 + newContractMainDO.setErpSalesCompanyNumber(reqVO.getSalesCompanyNumber()); + // ERP乙方公司名称 + newContractMainDO.setErpSalesCompanyName(reqVO.getSalesCompanyName()); // 删除关联信息 // 查询合同明细