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

erp修改

Browse Source
This commit is contained in:
qianshijiang
2026-01-09 17:22:25 +08:00
parent 10d0dd1dc2
commit 57d07bc1da
33 changed files with 209 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java
View File

@@ -17,12 +17,12 @@ public class ErpInvoiceRecheckApiImpl implements ErpInvoiceRecheckApi{
private ErpInvoiceRecheckService erpInvoiceRecheckService;
@Override
public HashMap<String, String> submit082(Map<String, Object> param) {
public Map<String, String> submit082(Map<String, Object> param) {
return erpInvoiceRecheckService.submit082(param);
}
@Override
public HashMap<String, String> submit085(Map<String, Object> param) {
public Map<String, String> submit085(Map<String, Object> param) {
return erpInvoiceRecheckService.submit085(param);
}
}

6
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InvoiceticketImpl.java
View File

@@ -29,17 +29,17 @@ public class InvoiceticketImpl implements InvoiceticketApi {
}
@Override
public CommonResult<HashMap<String, String>> submitDataToErp098(Map<String, Object> reqDTO) {
public CommonResult<Map<String, String>> submitDataToErp098(Map<String, Object> reqDTO) {
return success(erpInvoiceticketService.sbumitToErp098(reqDTO));
}
@Override
public CommonResult<HashMap<String, String>> submitDataToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO) {
public CommonResult<Map<String, String>> submitDataToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO) {
return success(erpInvoiceticketService.sbumitToErp096(reqDTO));
}
@Override
public CommonResult<HashMap<String, String>> submitDataToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
public CommonResult<Map<String, String>> submitDataToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
return success(erpInvoiceticketService.sbumitToErp097(reqDTO));
}
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpAssetServiceImpl.java
View File

@@ -127,7 +127,7 @@ public class ErpAssetServiceImpl implements ErpAssetService {
for (String number : redisCache.keySet()) {
req.put("BUKRS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null) {
continue;

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java
View File

@@ -133,7 +133,7 @@ public class ErpBomServiceImpl implements ErpBomService {
for (String factoryNumber : redisCache.keySet()) {
req.put("WERKS", factoryNumber);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;
@@ -313,7 +313,7 @@ public class ErpBomServiceImpl implements ErpBomService {
items.add(item);
req.put("item", items);
reqDTO.setReq(req);
HashMap<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
Map<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
if (response.get("result").isEmpty()) {
log.info("ERP数据提交成功");
}

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java
View File

@@ -131,7 +131,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
initializeMap(key);
}
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, null);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, null);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (CollUtil.isEmpty(dataArray)) {
throw exception(ERP_COMPANY_NOT_EXISTS);
@@ -251,7 +251,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
String key = "erpMap" + funcnrEnum.getFuncnr();
myRedisConfig.getRedisCacheMap(key);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, null);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, null);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (CollUtil.isEmpty(dataArray)) {
throw exception(ERP_COMPANY_NOT_EXISTS);

3
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java
View File

@@ -9,6 +9,7 @@ import jakarta.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* ERP合同映射 Service 接口
@@ -78,5 +79,5 @@ public interface ErpContractService {
* @param erpContractVO ERP合同映射数据
* @return ERP合同映射
*/
HashMap<String, String> submitErp(ErpContractSaveReqVO erpContractVO);
Map<String, String> submitErp(ErpContractSaveReqVO erpContractVO);
}

8
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java
View File

@@ -122,7 +122,7 @@ public class ErpContractServiceImpl implements ErpContractService {
req.put("ZHTMC", pageReqVO.getContractName());
// 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
// 返回空结果而不是抛出异常
@@ -206,7 +206,7 @@ public class ErpContractServiceImpl implements ErpContractService {
req.put("PARTNER", partner);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, null);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, null);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray != null) {
dataArrayALL.addAll(dataArray);
@@ -226,7 +226,7 @@ public class ErpContractServiceImpl implements ErpContractService {
}
@Override
public HashMap<String, String> submitErp(ErpContractSaveReqVO erpContractVO) {
public Map<String, String> submitErp(ErpContractSaveReqVO erpContractVO) {
// 转换为DO
ErpContractDO erpContract = BeanUtils.toBean(erpContractVO, ErpContractDO.class);
@@ -334,7 +334,7 @@ public class ErpContractServiceImpl implements ErpContractService {
req.put("header", head);
erpSubmitReqDTO.setReq(req);
HashMap<String, String> response = erpExternalApi.submitDataToErp(erpSubmitReqDTO);
Map<String, String> response = erpExternalApi.submitDataToErp(erpSubmitReqDTO);
return response;
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCostcenterServiceImpl.java
View File

@@ -128,7 +128,7 @@ public class ErpCostcenterServiceImpl implements ErpCostcenterService {
for (String number : redisCache.keySet()) {
req.put("BUKRS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class ErpCustomerServiceImpl implements ErpCustomerService {
req.put(funcnrEnum.getDatekey(), datumList);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
// if (dataArray == null || dataArray.isEmpty()) {
// continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java
View File

@@ -202,7 +202,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService {
for (String companyNumber : redisCache.keySet()) {
req.put("BUKRS", companyNumber);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java
View File

@@ -127,7 +127,7 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService {
for (String number : redisCache.keySet()) {
req.put("BUKRS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java
View File

@@ -4,6 +4,6 @@ import java.util.HashMap;
import java.util.Map;
public interface ErpInvoiceRecheckService {
HashMap<String, String> submit082(Map<String, Object> param);
HashMap<String, String> submit085(Map<String, Object> param);
Map<String, String> submit082(Map<String, Object> param);
Map<String, String> submit085(Map<String, Object> param);
}

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java
View File

@@ -16,7 +16,7 @@ public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService {
@Resource
public ErpExternalApi erpExternalApi;
@Override
public HashMap<String, String> submit082(Map<String, Object> param) {
public Map<String, String> submit082(Map<String, Object> param) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr("082");
reqDTO.setBskey(param.get("id").toString());
@@ -28,7 +28,7 @@ public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService {
}
@Override
public HashMap<String, String> submit085(Map<String, Object> param) {
public Map<String, String> submit085(Map<String, Object> param) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr("085");
reqDTO.setBskey(param.get("id").toString());

6
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketService.java
View File

@@ -10,7 +10,7 @@ import java.util.Map;
public interface ErpInvoiceticketService {
ErpInvoiceticketSubmitRespDTO sbumitToErp020(ErpInvoiceticketSubmitReqDTO reqDTO);
HashMap<String, String> sbumitToErp098(Map<String, Object> reqDTO);
HashMap<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO);
HashMap<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO);
Map<String, String> sbumitToErp098(Map<String, Object> reqDTO);
Map<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO);
Map<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO);
}

8
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketServiceImpl.java
View File

@@ -36,7 +36,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
reqDTO.setReq(req);
// 1. 调用ERP接口获取HashMap结果
HashMap<String, String> result = erpExternalApi.submitDataToErp(reqDTO);
Map<String, String> result = erpExternalApi.submitDataToErp(reqDTO);
// 2. 初始化响应实体
ErpInvoiceticketSubmitRespDTO respDTO = new ErpInvoiceticketSubmitRespDTO();
@@ -124,7 +124,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
}
@Override
public HashMap<String, String> sbumitToErp098(Map<String, Object> param) {
public Map<String, String> sbumitToErp098(Map<String, Object> param) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr("098");
reqDTO.setBskey(param.get("id").toString());
@@ -136,7 +136,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
}
@Override
public HashMap<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO erpElectronicInvoiceSubmitReqDTO) {
public Map<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO erpElectronicInvoiceSubmitReqDTO) {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setFuncnr("096");
reqDTO.setBskey(erpElectronicInvoiceSubmitReqDTO.getId());
@@ -159,7 +159,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
}
@Override
public HashMap<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
public Map<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
ErpSubmitReqDTO submitReqDTO = new ErpSubmitReqDTO();
submitReqDTO.setFuncnr("097");
submitReqDTO.setBskey(reqDTO.getId());

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java
View File

@@ -352,7 +352,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
req.put(funcnrEnum.getDatekey(), datumList);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
return;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class ErpOrderServiceImpl implements ErpOrderService {
private String submitToErp(ErpSubmitReqDTO reqDTO) {
HashMap<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
Map<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
return response.get("resStr");
}

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProcessServiceImpl.java
View File

@@ -131,7 +131,7 @@ public class ErpProcessServiceImpl implements ErpProcessService {
for (String factoryNumber : redisCache.keySet()) {
req.put("WERKS", factoryNumber);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveOrderServiceImpl.java
View File

@@ -130,7 +130,7 @@ public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService
}
// 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
// 返回空结果而不是抛出异常
@@ -248,7 +248,7 @@ public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService
req.put("BUKRS", numberC);
req.put("WERKS", numberF);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveVersionServiceImpl.java
View File

@@ -144,7 +144,7 @@ public class ErpProductiveVersionServiceImpl implements ErpProductiveVersionServ
for (String number : redisCache.keySet()) {
req.put("WERKS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpPurchaseOrganizationServiceImpl.java
View File

@@ -128,7 +128,7 @@ public class ErpPurchaseOrganizationServiceImpl implements ErpPurchaseOrganizati
for (String number : redisCache.keySet()) {
req.put("BUKRS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpSalesOrganizationServiceImpl.java
View File

@@ -127,7 +127,7 @@ public class ErpSalesOrganizationServiceImpl implements ErpSalesOrganizationServ
for (String number : redisCache.keySet()) {
req.put("BUKRS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java
View File

@@ -210,7 +210,7 @@ public class ErpWarehouseServiceImpl implements ErpWarehouseService {
for (String number : redisCache.keySet()) {
req.put("WERKS", number);
// 1. 调用ERP接口获取数据
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
if (dataArray == null || dataArray.isEmpty()) {
continue;