zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-12-23 17:14:41 +08:00
parent 84b44166ee 398432ddd1
commit 3a682d0b23
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

@@ -238,13 +238,13 @@ public class ContractApiImpl implements ContractApi {
ErpContractSaveReqVO erpContractVO = contractService.getErpContract(contractMainDO); ErpContractSaveReqVO erpContractVO = contractService.getErpContract(contractMainDO);
// 调用ERP模块 // 调用ERP模块
JSONObject erpResult = contractService.sendToErp(erpContractVO); // JSONObject erpResult = contractService.sendToErp(erpContractVO);
log.info("合同提交ERP结果：{}", erpResult); // log.info("合同提交ERP结果：{}", erpResult);
//
// 调用ERP失败 // // 调用ERP失败
if (!erpResult.getBool("success")) { // if (!erpResult.getBool("success")) {
throw exception(CONTRACT_SUBMIT_ERP_FAIL, erpResult.getStr("errMsg")); // throw exception(CONTRACT_SUBMIT_ERP_FAIL, erpResult.getStr("errMsg"));
} // }
} }
// 删除动态条款信息 // 删除动态条款信息
@@ -591,6 +591,8 @@ public class ContractApiImpl implements ContractApi {
contractMainDO.setChangeBasicAmount(reqVO.getEstimateAmountTotal()); contractMainDO.setChangeBasicAmount(reqVO.getEstimateAmountTotal());
// 状态 默认值:正在执行(EF) 执行中 // 状态 默认值:正在执行(EF) 执行中
contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode()); 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()); contractMainDO.setHasPrepayment(DictEnum.ERP_CTRT_YN_NO.getCode());
// 预付款比例 默认值:NULL // 预付款比例 默认值:NULL