diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java index f220b12d..60234892 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java @@ -13,7 +13,7 @@ import java.util.Map; public interface ErpInvoiceRecheckApi { String PREFIX = ApiConstants.PREFIX + "/erp-invoice-recheck"; @PostMapping(PREFIX + "/submit082") - HashMap submit082(@RequestBody Map param); + Map submit082(@RequestBody Map param); @PostMapping(PREFIX + "/submit085") - HashMap submit085(@RequestBody Map param); + Map submit085(@RequestBody Map param); } diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InvoiceticketApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InvoiceticketApi.java index 23a70298..ba17fb0a 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InvoiceticketApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InvoiceticketApi.java @@ -24,11 +24,11 @@ public interface InvoiceticketApi { CommonResult submitDataToErp(@Valid @RequestBody ErpInvoiceticketSubmitReqDTO reqDTO); @PostMapping(PREFIX + "/submit098") @Operation(summary = "erp数据提交,参数需要billdoc和action,id") - CommonResult> submitDataToErp098(@Valid @RequestBody Map reqDTO); + CommonResult> submitDataToErp098(@Valid @RequestBody Map reqDTO); @PostMapping(PREFIX + "/submit096") @Operation(summary = "erp数据提交,参数需要billdoc和action,id") - CommonResult> submitDataToErp096(@Valid @RequestBody ErpElectronicInvoiceSubmitReqDTO reqDTO); + CommonResult> submitDataToErp096(@Valid @RequestBody ErpElectronicInvoiceSubmitReqDTO reqDTO); @PostMapping(PREFIX + "/submit097") @Operation(summary = "erp数据提交") - CommonResult> submitDataToErp097(@Valid @RequestBody ErpElectronicInvoiceReversalReqDTO reqDTO); + CommonResult> submitDataToErp097(@Valid @RequestBody ErpElectronicInvoiceReversalReqDTO reqDTO); } diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/ErpSubmit071ReqDTO.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/ErpSubmit071ReqDTO.java new file mode 100644 index 00000000..cb889888 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/ErpSubmit071ReqDTO.java @@ -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 item; + +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/Header071.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/Header071.java new file mode 100644 index 00000000..dda7afbd --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/Header071.java @@ -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; + + + + +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/ItemList071.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/ItemList071.java new file mode 100644 index 00000000..abc3b6b7 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto071/ItemList071.java @@ -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; +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/ErpSubmit079ReqDTO.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/ErpSubmit079ReqDTO.java new file mode 100644 index 00000000..0180ed0a --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/ErpSubmit079ReqDTO.java @@ -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 item; + +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/Header079.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/Header079.java new file mode 100644 index 00000000..2d5ee4c5 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/Header079.java @@ -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; +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/ItemList079.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/ItemList079.java new file mode 100644 index 00000000..89a94720 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto079/ItemList079.java @@ -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; +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto095/ErpSubmit095ReqDTO.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto095/ErpSubmit095ReqDTO.java new file mode 100644 index 00000000..93ddcc00 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto095/ErpSubmit095ReqDTO.java @@ -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; +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto095/Header095.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto095/Header095.java new file mode 100644 index 00000000..59a88d09 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto095/Header095.java @@ -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; +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java index 18309060..233699b1 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java @@ -17,12 +17,12 @@ public class ErpInvoiceRecheckApiImpl implements ErpInvoiceRecheckApi{ private ErpInvoiceRecheckService erpInvoiceRecheckService; @Override - public HashMap submit082(Map param) { + public Map submit082(Map param) { return erpInvoiceRecheckService.submit082(param); } @Override - public HashMap submit085(Map param) { + public Map submit085(Map param) { return erpInvoiceRecheckService.submit085(param); } } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InvoiceticketImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InvoiceticketImpl.java index d29ed780..74d991f0 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InvoiceticketImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InvoiceticketImpl.java @@ -29,17 +29,17 @@ public class InvoiceticketImpl implements InvoiceticketApi { } @Override - public CommonResult> submitDataToErp098(Map reqDTO) { + public CommonResult> submitDataToErp098(Map reqDTO) { return success(erpInvoiceticketService.sbumitToErp098(reqDTO)); } @Override - public CommonResult> submitDataToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO) { + public CommonResult> submitDataToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO) { return success(erpInvoiceticketService.sbumitToErp096(reqDTO)); } @Override - public CommonResult> submitDataToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) { + public CommonResult> submitDataToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) { return success(erpInvoiceticketService.sbumitToErp097(reqDTO)); } } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpAssetServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpAssetServiceImpl.java index d0e3f47f..7d662f57 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpAssetServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpAssetServiceImpl.java @@ -127,7 +127,7 @@ public class ErpAssetServiceImpl implements ErpAssetService { for (String number : redisCache.keySet()) { req.put("BUKRS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java index fe0433e2..f0f5dd64 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java @@ -133,7 +133,7 @@ public class ErpBomServiceImpl implements ErpBomService { for (String factoryNumber : redisCache.keySet()) { req.put("WERKS", factoryNumber); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map 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 response = erpExternalApi.submitDataToErp(reqDTO); + Map response = erpExternalApi.submitDataToErp(reqDTO); if (response.get("result").isEmpty()) { log.info("ERP数据提交成功"); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java index 17dfba6e..c4b028f5 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java @@ -131,7 +131,7 @@ public class ErpCompanyServiceImpl implements ErpCompanyService { initializeMap(key); } // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); + Map 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 dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (CollUtil.isEmpty(dataArray)) { throw exception(ERP_COMPANY_NOT_EXISTS); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java index 1da12148..1dcc70d6 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java @@ -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 submitErp(ErpContractSaveReqVO erpContractVO); + Map submitErp(ErpContractSaveReqVO erpContractVO); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java index b3f15f8c..58697609 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java @@ -122,7 +122,7 @@ public class ErpContractServiceImpl implements ErpContractService { req.put("ZHTMC", pageReqVO.getContractName()); // 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map 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 dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); + Map 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 submitErp(ErpContractSaveReqVO erpContractVO) { + public Map 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 response = erpExternalApi.submitDataToErp(erpSubmitReqDTO); + Map response = erpExternalApi.submitDataToErp(erpSubmitReqDTO); return response; } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCostcenterServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCostcenterServiceImpl.java index fa5ffe83..7cca9535 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCostcenterServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCostcenterServiceImpl.java @@ -128,7 +128,7 @@ public class ErpCostcenterServiceImpl implements ErpCostcenterService { for (String number : redisCache.keySet()) { req.put("BUKRS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java index f7e6f069..912a52b9 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java @@ -136,7 +136,7 @@ public class ErpCustomerServiceImpl implements ErpCustomerService { req.put(funcnrEnum.getDatekey(), datumList); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); // if (dataArray == null || dataArray.isEmpty()) { // continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java index c436c385..de94d559 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java @@ -202,7 +202,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { for (String companyNumber : redisCache.keySet()) { req.put("BUKRS", companyNumber); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java index c01eb448..3bd62f6d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java @@ -127,7 +127,7 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService { for (String number : redisCache.keySet()) { req.put("BUKRS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java index a00a8414..fad1e776 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java @@ -4,6 +4,6 @@ import java.util.HashMap; import java.util.Map; public interface ErpInvoiceRecheckService { - HashMap submit082(Map param); - HashMap submit085(Map param); + Map submit082(Map param); + Map submit085(Map param); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java index dd8d7ab5..ed819c38 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java @@ -16,7 +16,7 @@ public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService { @Resource public ErpExternalApi erpExternalApi; @Override - public HashMap submit082(Map param) { + public Map submit082(Map 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 submit085(Map param) { + public Map submit085(Map param) { ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO(); reqDTO.setFuncnr("085"); reqDTO.setBskey(param.get("id").toString()); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketService.java index 3290ac20..44be6bc2 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketService.java @@ -10,7 +10,7 @@ import java.util.Map; public interface ErpInvoiceticketService { ErpInvoiceticketSubmitRespDTO sbumitToErp020(ErpInvoiceticketSubmitReqDTO reqDTO); - HashMap sbumitToErp098(Map reqDTO); - HashMap sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO); - HashMap sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO); + Map sbumitToErp098(Map reqDTO); + Map sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO reqDTO); + Map sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketServiceImpl.java index 1fe27f66..2ca904f9 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceticketServiceImpl.java @@ -36,7 +36,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService { reqDTO.setReq(req); // 1. 调用ERP接口获取HashMap结果 - HashMap result = erpExternalApi.submitDataToErp(reqDTO); + Map result = erpExternalApi.submitDataToErp(reqDTO); // 2. 初始化响应实体 ErpInvoiceticketSubmitRespDTO respDTO = new ErpInvoiceticketSubmitRespDTO(); @@ -124,7 +124,7 @@ public class ErpInvoiceticketServiceImpl implements ErpInvoiceticketService { } @Override - public HashMap sbumitToErp098(Map param) { + public Map sbumitToErp098(Map 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 sbumitToErp096(ErpElectronicInvoiceSubmitReqDTO erpElectronicInvoiceSubmitReqDTO) { + public Map 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 sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) { + public Map sbumitToErp097(ErpElectronicInvoiceReversalReqDTO reqDTO) { ErpSubmitReqDTO submitReqDTO = new ErpSubmitReqDTO(); submitReqDTO.setFuncnr("097"); submitReqDTO.setBskey(reqDTO.getId()); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index 482ac7bf..0325980f 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -352,7 +352,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { req.put(funcnrEnum.getDatekey(), datumList); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { return; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java index cd7772e9..a16b02cb 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpOrderServiceImpl.java @@ -48,7 +48,7 @@ public class ErpOrderServiceImpl implements ErpOrderService { private String submitToErp(ErpSubmitReqDTO reqDTO) { - HashMap response = erpExternalApi.submitDataToErp(reqDTO); + Map response = erpExternalApi.submitDataToErp(reqDTO); return response.get("resStr"); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProcessServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProcessServiceImpl.java index ae2a28b4..c0dc9115 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProcessServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProcessServiceImpl.java @@ -131,7 +131,7 @@ public class ErpProcessServiceImpl implements ErpProcessService { for (String factoryNumber : redisCache.keySet()) { req.put("WERKS", factoryNumber); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveOrderServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveOrderServiceImpl.java index db006978..ed7b648b 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveOrderServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveOrderServiceImpl.java @@ -130,7 +130,7 @@ public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService } // 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map 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 dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveVersionServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveVersionServiceImpl.java index 45ba8e40..a825d977 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveVersionServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveVersionServiceImpl.java @@ -144,7 +144,7 @@ public class ErpProductiveVersionServiceImpl implements ErpProductiveVersionServ for (String number : redisCache.keySet()) { req.put("WERKS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpPurchaseOrganizationServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpPurchaseOrganizationServiceImpl.java index c28cacdc..52954ee6 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpPurchaseOrganizationServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpPurchaseOrganizationServiceImpl.java @@ -128,7 +128,7 @@ public class ErpPurchaseOrganizationServiceImpl implements ErpPurchaseOrganizati for (String number : redisCache.keySet()) { req.put("BUKRS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpSalesOrganizationServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpSalesOrganizationServiceImpl.java index 33744881..d3aa9787 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpSalesOrganizationServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpSalesOrganizationServiceImpl.java @@ -127,7 +127,7 @@ public class ErpSalesOrganizationServiceImpl implements ErpSalesOrganizationServ for (String number : redisCache.keySet()) { req.put("BUKRS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java index e8efabda..549cab16 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java @@ -210,7 +210,7 @@ public class ErpWarehouseServiceImpl implements ErpWarehouseService { for (String number : redisCache.keySet()) { req.put("WERKS", number); // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); + Map dataFromERP = erpConfig.fetchDataFromERP(funcnr, req); JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); if (dataArray == null || dataArray.isEmpty()) { continue;