diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java index c5ad9e4..8df642d 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java @@ -8,6 +8,14 @@ import lombok.Getter; @Getter public enum DictEnum { + /** 业务类型 */ + BSN_TP_3("物流合同","3",null), + /** ERP合同类型编码 */ + ERP_CTRT_HTLXBH_SAP02NCOZC("SAP铜非施工合同支出类","SAP02NCOZC",null), + /** 交易方式 */ + HS_PYBL_TP_PRE_PAY("先款后货","PRE_PAY",null), + /** ERP合同类别 */ + ERP_CTRT_HTLB_1("购销合同","1",null), /** ERP请求状态 */ ERP_REQ_STS_RLBK("失败","RLBK",null), ERP_REQ_STS_RCVG("执行中","RCVG",null), diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java index d463d8f..5395f2d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java @@ -375,19 +375,19 @@ public class ContractApiImpl implements ContractApi { // 合同主信息表映射 ContractMainDO contractMainDO = new ContractMainDO(); // 系统合同编号 - contractMainDO.setSystemContractNumber(contractService.generateSystemContractNumber("SAP02NCOZC")); + contractMainDO.setSystemContractNumber(contractService.generateSystemContractNumber(DictEnum.ERP_CTRT_HTLXBH_SAP02NCOZC.getCode())); // 合同编号 contractMainDO.setContractPaperNumber(reqVO.getContractCode()); // 合同名称 contractMainDO.setContractName(reqVO.getContractName()); // 施工类型编号 默认值:SAP02NCOZC - contractMainDO.setConstructionTypeNumber("SAP02NCOZC"); + contractMainDO.setConstructionTypeNumber(DictEnum.ERP_CTRT_HTLXBH_SAP02NCOZC.getCode()); // 施工类型名称 默认值:铜非施工合同支出类 - contractMainDO.setConstructionTypeName("SAP铜非施工合同支出类"); + contractMainDO.setConstructionTypeName(DictEnum.ERP_CTRT_HTLXBH_SAP02NCOZC.getLabel()); // 类别 默认值:购销合同(1) - contractMainDO.setCategory("1"); + contractMainDO.setCategory(DictEnum.ERP_CTRT_HTLB_1.getCode()); // 是否虚拟合同 默认值:否(0) - contractMainDO.setContractVirtual("0"); + contractMainDO.setContractVirtual(DictEnum.ERP_CTRT_YN_NO.getCode()); // 代理方 默认值:NULL // 签署日期 -> 签约日期 (40-签约必填, 格式: yyyyMMdd) DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); @@ -409,11 +409,11 @@ public class ContractApiImpl implements ContractApi { // 状态 默认值:正在执行(EF) 执行中 contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode()); // 是否有预付款 默认值:否 - contractMainDO.setHasPrepayment("0"); + contractMainDO.setHasPrepayment(DictEnum.ERP_CTRT_YN_NO.getCode()); // 预付款比例 默认值:NULL // 预付款金额 默认值:NULL // 是否有质保金 默认值:否 - contractMainDO.setHasQualityAmount("0"); + contractMainDO.setHasQualityAmount(DictEnum.ERP_CTRT_YN_NO.getCode()); // 质保金比例 默认值:NULL // 质保金金额 默认值:NULL // 是否内部企业 @@ -425,13 +425,13 @@ public class ContractApiImpl implements ContractApi { // 建筑服务发生地 默认值:NULL // 达到收款条件金额 默认值:NULL // 是否有履约保证金 默认值:否 - contractMainDO.setHasDeposit("0"); + contractMainDO.setHasDeposit(DictEnum.ERP_CTRT_YN_NO.getCode()); // 原币履约保证金 默认值:NULL // 本币履约保证金 默认值:NULL // 交易方式 默认值:先款后货 - contractMainDO.setHasPayable("PRE_PAY"); + contractMainDO.setHasPayable(DictEnum.HS_PYBL_TP_PRE_PAY.getCode()); // 合同类型 默认值:物流合同 - contractMainDO.setContractType("3"); + contractMainDO.setContractType(DictEnum.BSN_TP_3.getCode()); // 签署地 -> 签约地 (40-签约必填) contractMainDO.setSignPlace(reqVO.getSignSite()); // 甲方公司编号(采购方) -> 账套代码