erp修改
This commit is contained in:
@@ -13,7 +13,7 @@ import java.util.Map;
|
|||||||
public interface ErpInvoiceRecheckApi {
|
public interface ErpInvoiceRecheckApi {
|
||||||
String PREFIX = ApiConstants.PREFIX + "/erp-invoice-recheck";
|
String PREFIX = ApiConstants.PREFIX + "/erp-invoice-recheck";
|
||||||
@PostMapping(PREFIX + "/submit082")
|
@PostMapping(PREFIX + "/submit082")
|
||||||
HashMap<String, String> submit082(@RequestBody Map<String, Object> param);
|
Map<String, String> submit082(@RequestBody Map<String, Object> param);
|
||||||
@PostMapping(PREFIX + "/submit085")
|
@PostMapping(PREFIX + "/submit085")
|
||||||
HashMap<String, String> submit085(@RequestBody Map<String, Object> param);
|
Map<String, String> submit085(@RequestBody Map<String, Object> param);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,11 +24,11 @@ public interface InvoiceticketApi {
|
|||||||
CommonResult<ErpInvoiceticketSubmitRespDTO> submitDataToErp(@Valid @RequestBody ErpInvoiceticketSubmitReqDTO reqDTO);
|
CommonResult<ErpInvoiceticketSubmitRespDTO> submitDataToErp(@Valid @RequestBody ErpInvoiceticketSubmitReqDTO reqDTO);
|
||||||
@PostMapping(PREFIX + "/submit098")
|
@PostMapping(PREFIX + "/submit098")
|
||||||
@Operation(summary = "erp数据提交,参数需要billdoc和action,id")
|
@Operation(summary = "erp数据提交,参数需要billdoc和action,id")
|
||||||
CommonResult<HashMap<String, String>> submitDataToErp098(@Valid @RequestBody Map<String,Object> reqDTO);
|
CommonResult<Map<String, String>> submitDataToErp098(@Valid @RequestBody Map<String,Object> reqDTO);
|
||||||
@PostMapping(PREFIX + "/submit096")
|
@PostMapping(PREFIX + "/submit096")
|
||||||
@Operation(summary = "erp数据提交,参数需要billdoc和action,id")
|
@Operation(summary = "erp数据提交,参数需要billdoc和action,id")
|
||||||
CommonResult<HashMap<String, String>> submitDataToErp096(@Valid @RequestBody ErpElectronicInvoiceSubmitReqDTO reqDTO);
|
CommonResult<Map<String, String>> submitDataToErp096(@Valid @RequestBody ErpElectronicInvoiceSubmitReqDTO reqDTO);
|
||||||
@PostMapping(PREFIX + "/submit097")
|
@PostMapping(PREFIX + "/submit097")
|
||||||
@Operation(summary = "erp数据提交")
|
@Operation(summary = "erp数据提交")
|
||||||
CommonResult<HashMap<String, String>> submitDataToErp097(@Valid @RequestBody ErpElectronicInvoiceReversalReqDTO reqDTO);
|
CommonResult<Map<String, String>> submitDataToErp097(@Valid @RequestBody ErpElectronicInvoiceReversalReqDTO reqDTO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto071;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Schema(description = "RPC 服务 - 提交 ERP 071 接口请求参数DTO对象")
|
||||||
|
@Data
|
||||||
|
public class ErpSubmit071ReqDTO implements Serializable {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@Schema(description = "071 接口请求参数Head对象")
|
||||||
|
private Header071 head;
|
||||||
|
|
||||||
|
@Schema(description = "071 接口请求参数列表对象")
|
||||||
|
private List<ItemList071> item;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto071;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
|
||||||
|
@Schema(description = "071 接口请求参数Head对象")
|
||||||
|
@Data
|
||||||
|
public class Header071 implements Serializable {
|
||||||
|
@Schema(description = "过账日期(格式yyyyMMdd)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String pstng_date;
|
||||||
|
|
||||||
|
@Schema(description = "凭证日期(格式yyyyMMdd)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private LocalDate doc_date;
|
||||||
|
|
||||||
|
@Schema(description = "抬头文本")
|
||||||
|
private String header_txt;
|
||||||
|
|
||||||
|
@Schema(description = "送货单号(入库时填入送货单号,退货输入售后服务单号(绿星商城))", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String bill_of_lading;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto071;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
@Schema(description = "071 接口请求参数列表对象")
|
||||||
|
@Data
|
||||||
|
public class ItemList071 implements Serializable {
|
||||||
|
@Schema(description = "物料号(服务采购订单收货时为空)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String material;
|
||||||
|
|
||||||
|
@Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String plant;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto079;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Schema(description = "RPC 服务 - 提交 ERP 079 接口请求参数DTO对象")
|
||||||
|
@Data
|
||||||
|
public class ErpSubmit079ReqDTO implements Serializable {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@Schema(description = "079 接口请求参数Head对象")
|
||||||
|
private Header079 head;
|
||||||
|
|
||||||
|
@Schema(description = "079 接口请求参数列表对象")
|
||||||
|
private List<ItemList079> item;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto079;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
|
||||||
|
@Schema(description = "079 接口请求参数Head对象")
|
||||||
|
@Data
|
||||||
|
public class Header079 implements Serializable {
|
||||||
|
@Schema(description = "要冲销的物料凭证号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String mat_doc;
|
||||||
|
|
||||||
|
@Schema(description = "要冲销的物料凭证年度", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private Integer doc_year;
|
||||||
|
|
||||||
|
@Schema(description = "过账日期(格式yyyyMMdd)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String pstng_date;
|
||||||
|
|
||||||
|
@Schema(description = "备注")
|
||||||
|
private String header_txt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto079;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
@Schema(description = "079 接口请求参数列表对象")
|
||||||
|
@Data
|
||||||
|
public class ItemList079 implements Serializable {
|
||||||
|
@Schema(description = "行号(与行ID二选一,与SAP前端显示行号一致)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private Integer matdoc_item;
|
||||||
|
|
||||||
|
@Schema(description = "行ID(与行号二选一,与单据创建时提交顺序一致,)", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private Integer line_id;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto095;
|
||||||
|
|
||||||
|
import com.zt.plat.module.erp.api.dto.dto079.Header079;
|
||||||
|
import com.zt.plat.module.erp.api.dto.dto079.ItemList079;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Schema(description = "RPC 服务 - 提交 ERP 095 接口请求参数DTO对象")
|
||||||
|
@Data
|
||||||
|
public class ErpSubmit095ReqDTO implements Serializable {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@Schema(description = "095 接口请求参数Head对象")
|
||||||
|
private Header095 head;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package com.zt.plat.module.erp.api.dto.dto095;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
|
||||||
|
@Schema(description = "095 接口请求参数Head对象")
|
||||||
|
@Data
|
||||||
|
public class Header095 implements Serializable {
|
||||||
|
@Schema(description = "交货单号",requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String delivery;
|
||||||
|
|
||||||
|
@Schema(description = "过账日期(格式yyyyMMdd)")
|
||||||
|
private String pstng_date;
|
||||||
|
|
||||||
|
@Schema(description = "操作标识(P-过账,C-冲销,D-删除)",requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
@Schema(description = "凭证抬头文本(写入到对应会计凭证的抬头文本,过账时必须)",requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private String bill_text;
|
||||||
|
}
|
||||||
@@ -17,12 +17,12 @@ public class ErpInvoiceRecheckApiImpl implements ErpInvoiceRecheckApi{
|
|||||||
private ErpInvoiceRecheckService erpInvoiceRecheckService;
|
private ErpInvoiceRecheckService erpInvoiceRecheckService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> submit082(Map<String, Object> param) {
|
public Map<String, String> submit082(Map<String, Object> param) {
|
||||||
return erpInvoiceRecheckService.submit082(param);
|
return erpInvoiceRecheckService.submit082(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> submit085(Map<String, Object> param) {
|
public Map<String, String> submit085(Map<String, Object> param) {
|
||||||
return erpInvoiceRecheckService.submit085(param);
|
return erpInvoiceRecheckService.submit085(param);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,17 +29,17 @@ public class InvoiceticketImpl implements InvoiceticketApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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));
|
return success(erpInvoiceticketService.sbumitToErp098(reqDTO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CommonResult<HashMap<String, String>> submitDataToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO) {
|
public CommonResult<Map<String, String>> submitDataToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO) {
|
||||||
return success(erpInvoiceticketService.sbumitToErp096(reqDTO));
|
return success(erpInvoiceticketService.sbumitToErp096(reqDTO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CommonResult<HashMap<String, String>> submitDataToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
|
public CommonResult<Map<String, String>> submitDataToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
|
||||||
return success(erpInvoiceticketService.sbumitToErp097(reqDTO));
|
return success(erpInvoiceticketService.sbumitToErp097(reqDTO));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ public class ErpAssetServiceImpl implements ErpAssetService {
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("BUKRS", number);
|
req.put("BUKRS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null) {
|
if (dataArray == null) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ public class ErpBomServiceImpl implements ErpBomService {
|
|||||||
for (String factoryNumber : redisCache.keySet()) {
|
for (String factoryNumber : redisCache.keySet()) {
|
||||||
req.put("WERKS", factoryNumber);
|
req.put("WERKS", factoryNumber);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
@@ -313,7 +313,7 @@ public class ErpBomServiceImpl implements ErpBomService {
|
|||||||
items.add(item);
|
items.add(item);
|
||||||
req.put("item", items);
|
req.put("item", items);
|
||||||
reqDTO.setReq(req);
|
reqDTO.setReq(req);
|
||||||
HashMap<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
|
Map<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
|
||||||
if (response.get("result").isEmpty()) {
|
if (response.get("result").isEmpty()) {
|
||||||
log.info("ERP数据提交成功");
|
log.info("ERP数据提交成功");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
|
|||||||
initializeMap(key);
|
initializeMap(key);
|
||||||
}
|
}
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (CollUtil.isEmpty(dataArray)) {
|
if (CollUtil.isEmpty(dataArray)) {
|
||||||
throw exception(ERP_COMPANY_NOT_EXISTS);
|
throw exception(ERP_COMPANY_NOT_EXISTS);
|
||||||
@@ -251,7 +251,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
|
|||||||
String key = "erpMap" + funcnrEnum.getFuncnr();
|
String key = "erpMap" + funcnrEnum.getFuncnr();
|
||||||
myRedisConfig.getRedisCacheMap(key);
|
myRedisConfig.getRedisCacheMap(key);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (CollUtil.isEmpty(dataArray)) {
|
if (CollUtil.isEmpty(dataArray)) {
|
||||||
throw exception(ERP_COMPANY_NOT_EXISTS);
|
throw exception(ERP_COMPANY_NOT_EXISTS);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import jakarta.validation.Valid;
|
|||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ERP合同映射 Service 接口
|
* ERP合同映射 Service 接口
|
||||||
@@ -78,5 +79,5 @@ public interface ErpContractService {
|
|||||||
* @param erpContractVO ERP合同映射数据
|
* @param erpContractVO ERP合同映射数据
|
||||||
* @return ERP合同映射
|
* @return ERP合同映射
|
||||||
*/
|
*/
|
||||||
HashMap<String, String> submitErp(ErpContractSaveReqVO erpContractVO);
|
Map<String, String> submitErp(ErpContractSaveReqVO erpContractVO);
|
||||||
}
|
}
|
||||||
@@ -122,7 +122,7 @@ public class ErpContractServiceImpl implements ErpContractService {
|
|||||||
req.put("ZHTMC", pageReqVO.getContractName());
|
req.put("ZHTMC", pageReqVO.getContractName());
|
||||||
|
|
||||||
// 调用ERP接口获取数据
|
// 调用ERP接口获取数据
|
||||||
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
|
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
|
||||||
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
// 返回空结果而不是抛出异常
|
// 返回空结果而不是抛出异常
|
||||||
@@ -206,7 +206,7 @@ public class ErpContractServiceImpl implements ErpContractService {
|
|||||||
req.put("PARTNER", partner);
|
req.put("PARTNER", partner);
|
||||||
|
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray != null) {
|
if (dataArray != null) {
|
||||||
dataArrayALL.addAll(dataArray);
|
dataArrayALL.addAll(dataArray);
|
||||||
@@ -226,7 +226,7 @@ public class ErpContractServiceImpl implements ErpContractService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> submitErp(ErpContractSaveReqVO erpContractVO) {
|
public Map<String, String> submitErp(ErpContractSaveReqVO erpContractVO) {
|
||||||
|
|
||||||
// 转换为DO
|
// 转换为DO
|
||||||
ErpContractDO erpContract = BeanUtils.toBean(erpContractVO, ErpContractDO.class);
|
ErpContractDO erpContract = BeanUtils.toBean(erpContractVO, ErpContractDO.class);
|
||||||
@@ -334,7 +334,7 @@ public class ErpContractServiceImpl implements ErpContractService {
|
|||||||
req.put("header", head);
|
req.put("header", head);
|
||||||
erpSubmitReqDTO.setReq(req);
|
erpSubmitReqDTO.setReq(req);
|
||||||
|
|
||||||
HashMap<String, String> response = erpExternalApi.submitDataToErp(erpSubmitReqDTO);
|
Map<String, String> response = erpExternalApi.submitDataToErp(erpSubmitReqDTO);
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ public class ErpCostcenterServiceImpl implements ErpCostcenterService {
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("BUKRS", number);
|
req.put("BUKRS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ public class ErpCustomerServiceImpl implements ErpCustomerService {
|
|||||||
req.put(funcnrEnum.getDatekey(), datumList);
|
req.put(funcnrEnum.getDatekey(), datumList);
|
||||||
|
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
// if (dataArray == null || dataArray.isEmpty()) {
|
// if (dataArray == null || dataArray.isEmpty()) {
|
||||||
// continue;
|
// continue;
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService {
|
|||||||
for (String companyNumber : redisCache.keySet()) {
|
for (String companyNumber : redisCache.keySet()) {
|
||||||
req.put("BUKRS", companyNumber);
|
req.put("BUKRS", companyNumber);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService {
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("BUKRS", number);
|
req.put("BUKRS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -4,6 +4,6 @@ import java.util.HashMap;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public interface ErpInvoiceRecheckService {
|
public interface ErpInvoiceRecheckService {
|
||||||
HashMap<String, String> submit082(Map<String, Object> param);
|
Map<String, String> submit082(Map<String, Object> param);
|
||||||
HashMap<String, String> submit085(Map<String, Object> param);
|
Map<String, String> submit085(Map<String, Object> param);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService {
|
|||||||
@Resource
|
@Resource
|
||||||
public ErpExternalApi erpExternalApi;
|
public ErpExternalApi erpExternalApi;
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> submit082(Map<String, Object> param) {
|
public Map<String, String> submit082(Map<String, Object> param) {
|
||||||
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
||||||
reqDTO.setFuncnr("082");
|
reqDTO.setFuncnr("082");
|
||||||
reqDTO.setBskey(param.get("id").toString());
|
reqDTO.setBskey(param.get("id").toString());
|
||||||
@@ -28,7 +28,7 @@ public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> submit085(Map<String, Object> param) {
|
public Map<String, String> submit085(Map<String, Object> param) {
|
||||||
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
||||||
reqDTO.setFuncnr("085");
|
reqDTO.setFuncnr("085");
|
||||||
reqDTO.setBskey(param.get("id").toString());
|
reqDTO.setBskey(param.get("id").toString());
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import java.util.Map;
|
|||||||
|
|
||||||
public interface ErpInvoiceticketService {
|
public interface ErpInvoiceticketService {
|
||||||
ErpInvoiceticketSubmitRespDTO sbumitToErp020(ErpInvoiceticketSubmitReqDTO reqDTO);
|
ErpInvoiceticketSubmitRespDTO sbumitToErp020(ErpInvoiceticketSubmitReqDTO reqDTO);
|
||||||
HashMap<String, String> sbumitToErp098(Map<String, Object> reqDTO);
|
Map<String, String> sbumitToErp098(Map<String, Object> reqDTO);
|
||||||
HashMap<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO);
|
Map<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO);
|
||||||
HashMap<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO);
|
Map<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
|
|||||||
reqDTO.setReq(req);
|
reqDTO.setReq(req);
|
||||||
// 1. 调用ERP接口获取HashMap结果
|
// 1. 调用ERP接口获取HashMap结果
|
||||||
|
|
||||||
HashMap<String, String> result = erpExternalApi.submitDataToErp(reqDTO);
|
Map<String, String> result = erpExternalApi.submitDataToErp(reqDTO);
|
||||||
|
|
||||||
// 2. 初始化响应实体
|
// 2. 初始化响应实体
|
||||||
ErpInvoiceticketSubmitRespDTO respDTO = new ErpInvoiceticketSubmitRespDTO();
|
ErpInvoiceticketSubmitRespDTO respDTO = new ErpInvoiceticketSubmitRespDTO();
|
||||||
@@ -124,7 +124,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> sbumitToErp098(Map<String, Object> param) {
|
public Map<String, String> sbumitToErp098(Map<String, Object> param) {
|
||||||
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
||||||
reqDTO.setFuncnr("098");
|
reqDTO.setFuncnr("098");
|
||||||
reqDTO.setBskey(param.get("id").toString());
|
reqDTO.setBskey(param.get("id").toString());
|
||||||
@@ -136,7 +136,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO erpElectronicInvoiceSubmitReqDTO) {
|
public Map<String, String> sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO erpElectronicInvoiceSubmitReqDTO) {
|
||||||
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
|
||||||
reqDTO.setFuncnr("096");
|
reqDTO.setFuncnr("096");
|
||||||
reqDTO.setBskey(erpElectronicInvoiceSubmitReqDTO.getId());
|
reqDTO.setBskey(erpElectronicInvoiceSubmitReqDTO.getId());
|
||||||
@@ -159,7 +159,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HashMap<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
|
public Map<String, String> sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) {
|
||||||
ErpSubmitReqDTO submitReqDTO = new ErpSubmitReqDTO();
|
ErpSubmitReqDTO submitReqDTO = new ErpSubmitReqDTO();
|
||||||
submitReqDTO.setFuncnr("097");
|
submitReqDTO.setFuncnr("097");
|
||||||
submitReqDTO.setBskey(reqDTO.getId());
|
submitReqDTO.setBskey(reqDTO.getId());
|
||||||
|
|||||||
@@ -352,7 +352,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
|
|||||||
req.put(funcnrEnum.getDatekey(), datumList);
|
req.put(funcnrEnum.getDatekey(), datumList);
|
||||||
|
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public class ErpOrderServiceImpl implements ErpOrderService {
|
|||||||
|
|
||||||
|
|
||||||
private String submitToErp(ErpSubmitReqDTO reqDTO) {
|
private String submitToErp(ErpSubmitReqDTO reqDTO) {
|
||||||
HashMap<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
|
Map<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
|
||||||
return response.get("resStr");
|
return response.get("resStr");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ public class ErpProcessServiceImpl implements ErpProcessService {
|
|||||||
for (String factoryNumber : redisCache.keySet()) {
|
for (String factoryNumber : redisCache.keySet()) {
|
||||||
req.put("WERKS", factoryNumber);
|
req.put("WERKS", factoryNumber);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 调用ERP接口获取数据
|
// 调用ERP接口获取数据
|
||||||
HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
|
Map<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
|
||||||
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
// 返回空结果而不是抛出异常
|
// 返回空结果而不是抛出异常
|
||||||
@@ -248,7 +248,7 @@ public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService
|
|||||||
req.put("BUKRS", numberC);
|
req.put("BUKRS", numberC);
|
||||||
req.put("WERKS", numberF);
|
req.put("WERKS", numberF);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ public class ErpProductiveVersionServiceImpl implements ErpProductiveVersionServ
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("WERKS", number);
|
req.put("WERKS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ public class ErpPurchaseOrganizationServiceImpl implements ErpPurchaseOrganizati
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("BUKRS", number);
|
req.put("BUKRS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ public class ErpSalesOrganizationServiceImpl implements ErpSalesOrganizationServ
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("BUKRS", number);
|
req.put("BUKRS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ public class ErpWarehouseServiceImpl implements ErpWarehouseService {
|
|||||||
for (String number : redisCache.keySet()) {
|
for (String number : redisCache.keySet()) {
|
||||||
req.put("WERKS", number);
|
req.put("WERKS", number);
|
||||||
// 1. 调用ERP接口获取数据
|
// 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");
|
JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
|
||||||
if (dataArray == null || dataArray.isEmpty()) {
|
if (dataArray == null || dataArray.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
Reference in New Issue
Block a user