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

提交erp暂时返回成功、方法注释修改

Browse Source
This commit is contained in:
guojunyun
2025-11-05 14:57:53 +08:00
parent 73ae9563c5
commit 48b9209fd1
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,10 +203,32 @@ public interface ContractService {
*/
Boolean complete(List<Long> ids);
/**
* 合同映射数据提交到erp
*
* @param erpContractVO 合同映射数据
* @return 提交结果
*/
JSONObject sendToErp(ErpContractSaveReqVO erpContractVO);
/**
* 生成合同映射数据
*
* @param contractMainDO 合同主信息
* @return 合同映射信息
*/
ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO);
/**
* 生成系统合同编号
*
* 单据号生成规则说明
* 单据名称（拼音）-类型-公司编码-年月日-六位编号
* 如请款单: QKD-ZGQK-3000-20250915-00001
*
* @param category 合同类别
*
* @return 系统合同编号
*/
String generateSystemContractNumber(String category);
}

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

@@ -60,7 +60,6 @@ import java.io.ByteArrayOutputStream;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.stream.Collectors;
@@ -1603,24 +1602,20 @@ public class ContractServiceImpl implements ContractService {
return true;
}
/**
* 合同映射数据提交到erp
*
* @param erpContractVO 合同映射数据
* @return 提交结果
*/
@Override
public JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) {
JSONObject erpResult = new JSONObject();
HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
// TODO 暂时返回成功
erpResult.putOnce("success", true);
/*HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
if ("E".equals(result.get("flag"))) {
erpResult.putOnce("success", false);
erpResult.putOnce("errMsg", result.get("resStr")+":"+result.get("E_RESP"));
} else {
erpResult.putOnce("success", true);
erpResult.putOnce("data", result);
}
}*/
return erpResult;
}
@@ -1671,12 +1666,6 @@ public class ContractServiceImpl implements ContractService {
return operationId;
}
/**
* 生成合同映射数据
*
* @param contractMainDO 合同主信息
* @return 合同映射信息
*/
@Override
public ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO) {
@@ -1985,17 +1974,6 @@ public class ContractServiceImpl implements ContractService {
}
}
/**
* 生成系统合同编号
*
* 单据号生成规则说明
* 单据名称（拼音）-类型-公司编码-年月日-六位编号
* 如请款单: QKD-ZGQK-3000-20250915-00001
*
* @param category 合同类别
*
* @return 系统合同编号
*/
@Override
public String generateSystemContractNumber(String category) {