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

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

Browse Source 
# Conflicts:
#	zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java
This commit is contained in:
潘荣晟
2025-10-27 11:29:25 +08:00
parent 547453f350 fceba54124
commit 7d24cd03d3
14 changed files with 1864 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
View File

@@ -5,6 +5,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
import com.zt.plat.module.contractorder.api.vo.contract.*;
import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO;
import jakarta.validation.Valid;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.http.ResponseEntity;
@@ -203,5 +204,7 @@ public interface ContractService {
Boolean complete(List<Long> ids);
JSONObject sendToErp(ErpContractSaveReqVO erpContractVO);
ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO);
}

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -1584,7 +1584,8 @@ public class ContractServiceImpl implements ContractService {
* @param erpContractVO 合同映射数据
* @return 提交结果
*/
private JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) {
@Override
public JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) {
JSONObject erpResult = new JSONObject();
HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
@@ -1651,7 +1652,8 @@ public class ContractServiceImpl implements ContractService {
* @param contractMainDO 合同主信息
* @return 合同映射信息
*/
private ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO) {
@Override
public ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO) {
ErpContractSaveReqVO erpContractVO = new ErpContractSaveReqVO();
// 合同主信息表主键:BSE_CTRT_MAIN