From 398432ddd11d2b489af89889632f745d14c77d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Tue, 23 Dec 2025 16:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E8=B4=B82.0=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8E=E4=B8=8D=E6=8F=90=E4=BA=A4erp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractorder/api/ContractApiImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 e3e3f780..ba432a4a 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 @@ -238,13 +238,13 @@ public class ContractApiImpl implements ContractApi { ErpContractSaveReqVO erpContractVO = contractService.getErpContract(contractMainDO); // 调用ERP模块 - JSONObject erpResult = contractService.sendToErp(erpContractVO); - log.info("合同提交ERP结果：{}", erpResult); - - // 调用ERP失败 - if (!erpResult.getBool("success")) { - throw exception(CONTRACT_SUBMIT_ERP_FAIL, erpResult.getStr("errMsg")); - } +// JSONObject erpResult = contractService.sendToErp(erpContractVO); +// log.info("合同提交ERP结果：{}", erpResult); +// +// // 调用ERP失败 +// if (!erpResult.getBool("success")) { +// throw exception(CONTRACT_SUBMIT_ERP_FAIL, erpResult.getStr("errMsg")); +// } } // 删除动态条款信息 @@ -591,6 +591,8 @@ public class ContractApiImpl implements ContractApi { contractMainDO.setChangeBasicAmount(reqVO.getEstimateAmountTotal()); // 状态 默认值:正在执行(EF) 执行中 contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode()); + //设置erp状态为待上传 + contractMainDO.setErpStatus(DictEnum.ERP_REQ_STS_WAIT.getCode()); // 是否有预付款 默认值:否 contractMainDO.setHasPrepayment(DictEnum.ERP_CTRT_YN_NO.getCode()); // 预付款比例 默认值:NULL