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
This commit is contained in:
潘荣晟
2025-10-28 17:53:16 +08:00
parent 475609b3b2 4106f89107
commit 73ca047ede
23 changed files with 497 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1711
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

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

@@ -207,4 +207,6 @@ public interface ContractService {
JSONObject sendToErp(ErpContractSaveReqVO erpContractVO);
ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO);
String generateSystemContractNumber(String category);
}

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

@@ -1635,7 +1635,7 @@ public class ContractServiceImpl implements ContractService {
operationId = "1";
} else {
// 3、如果009接口返回值中“合同编号”字段不存在值，根据合同主键查询映射表中是否存在没有删除的数据，如果有，值为“1”，如果没有，值为“0”
ErpContractDO erpContract = erpContractService.getErpContractByMainId(contractMainDO.getId());
ErpContractDO erpContract = erpContractService.getErpContractByPaperNumber(contractMainDO.getContractPaperNumber());
if (erpContract != null) {
operationId = "1";
} else {
@@ -1971,7 +1971,8 @@ public class ContractServiceImpl implements ContractService {
*
* @return 系统合同编号
*/
private String generateSystemContractNumber(String category) {
@Override
public String generateSystemContractNumber(String category) {
// 单据名称（拼音）
String documentName = "XTHT";