Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -1394,7 +1394,8 @@ public class ContractServiceImpl implements ContractService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 生成ERP合同映射表
|
// 生成ERP合同映射表
|
||||||
ErpContractSaveReqVO erpContractVO = getErpContract(contractMainDO);
|
// ErpContractSaveReqVO erpContractVO = getErpContract(contractMainDO); TODO ERP暂时返回成功
|
||||||
|
ErpContractSaveReqVO erpContractVO = new ErpContractSaveReqVO();
|
||||||
|
|
||||||
// 调用ERP模块
|
// 调用ERP模块
|
||||||
JSONObject erpResult = sendToErp(erpContractVO);
|
JSONObject erpResult = sendToErp(erpContractVO);
|
||||||
|
|||||||
Reference in New Issue
Block a user