Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhangt
2025-09-25 15:43:05 +08:00
213 changed files with 8170 additions and 603 deletions

View File

@@ -1,16 +1,16 @@
package com.zt.plat.module.erp.api;
import com.alibaba.fastjson.JSONArray;
import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
import com.zt.plat.module.erp.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.HashMap;
@FeignClient(name = ApiConstants.NAME)
@Tag(name = "RPC 服务 - ERP")
public interface ErpExternalApi {
@@ -19,6 +19,6 @@ public interface ErpExternalApi {
@PostMapping(PREFIX + "/submit")
@Operation(summary = "erp数据提交")
ResponseEntity<String> submitDataToErp(@Valid @RequestBody ErpSubmitReqDTO reqDTO);
HashMap<String, String> submitDataToErp(@Valid @RequestBody ErpSubmitReqDTO reqDTO);
}

View File

@@ -1,7 +1,6 @@
package com.zt.plat.module.erp.api.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
import java.util.Map;

View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.erp.enums;
import com.zt.plat.framework.common.exception.ErrorCode;// TODO 待办:请将下面的错误码复制到 zt-module-sply 模块的 ErrorCodeConstants 类中。注意请给“TODO 补充编号”设置一个错误码编号!!!
import com.zt.plat.framework.common.exception.ErrorCode;
// ========== ERP客商主数据 TODO 补充编号 ==========
public interface ErrorCodeConstants {