From 6307e64736b926e46cb9685998ef240afa5808a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 27 十月 2025 15:53:59 +0800
Subject: [PATCH] 添加erp调用地址 添加订单回调接口
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 53 ++++++++++++++++++++++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java | 15 +++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 18 +++++++++
rsf-open-api/src/main/resources/application-prod.yml | 5 ++
rsf-open-api/src/main/resources/application-dev.yml | 7 +++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java | 3 +
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java | 6 +++
7 files changed, 106 insertions(+), 1 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java
index ca0c218..8559823 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java
@@ -51,4 +51,19 @@
}
+ @Data
+ @Configuration
+ @ConfigurationProperties(prefix = "platform.erp")
+ public class ErpApi {
+ /**
+ * rcs璋冪敤璺緞
+ */
+ private String host;
+
+ /**rcs璋冪敤绔彛**/
+ private String port;
+
+ }
+
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
index a8acd14..af2cf37 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.openApi.controller;
+import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
import java.util.Objects;
@RestController
@@ -93,4 +95,20 @@
return wmsErpService.syncMatnrs(parms);
}
+
+ @ApiOperation("鐗╂枡淇℃伅涓婃姤")
+ @PostMapping("/report/order")
+ public CommonResponse reportOrders(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wmsErpService.reportOrders(params);
+ }
+
+ @ApiOperation("鐩樼偣宸紓淇敼")
+ @PostMapping("/report/check")
+ public CommonResponse reportCheck(@RequestBody ErpOpParams params) {
+ return wmsErpService.reportCheck(params);
+ }
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java
index a8e0072..d903d43 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java
@@ -22,6 +22,9 @@
//鐗╂枡淇℃伅鍚屾
public static String UPDATE_MATNR_INFO = "/rsf-server/base/mat/sync/auth/v1";
+ //璁㈠崟瀹屾垚鍥炲啓
+ public static String REPORT_ORDER_CALLBACK = "/C3Api?SysCode=WMS";
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java
index 614a707..ed29924 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java
@@ -4,6 +4,8 @@
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
+import java.util.Map;
+
public interface WmsErpService {
CommonResponse getOrderInfo(ErpOpParams params);
@@ -13,4 +15,8 @@
CommonResponse orderDel(ErpOpParams params);
CommonResponse syncMatnrs(ErpMatnrParms parms);
+
+ CommonResponse reportOrders(Map<String, Object> params);
+
+ CommonResponse reportCheck(ErpOpParams params);
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 8688b10..5bcff05 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -33,6 +33,9 @@
private PlatformProperties.WmsApi wmsApi;
@Autowired
+ private PlatformProperties.ErpApi erpApi;
+
+ @Autowired
private RestTemplate restTemplate;
/**
@@ -203,4 +206,54 @@
}
}
+ /**
+ * @author Ryan
+ * @date 2025/10/27
+ * @description: 涓婃姤鍗曟嵁鐘舵��
+ * @version 1.0
+ */
+ @Override
+ public CommonResponse reportOrders(Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = erpApi.getHost() + ":" + erpApi.getPort() + WmsConstant.REPORT_ORDER_CALLBACK;
+ log.info("鐗╂枡淇敼锛歿}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+
+ HttpEntity httpEntity = new HttpEntity(params, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("淇敼缁撴灉锛� {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ throw new CoolException("淇敼澶辫触锛侊紒");
+ } else {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ if (result.getCode() == 200) {
+ return result;
+ } else {
+ throw new CoolException("淇敼澶辫触锛侊紒");
+ }
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/10/27
+ * @description: 鐩樼偣宸紓鍗曚慨鏀�
+ * @version 1.0
+ */
+ @Override
+ public CommonResponse reportCheck(ErpOpParams params) {
+ return null;
+ }
+
}
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index 646090f..f7df34c 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -65,4 +65,9 @@
#閾炬帴
host: http://127.0.0.1
#绔彛
- port: 8085
\ No newline at end of file
+ port: 8085
+ erp:
+ #閾炬帴
+ host: http://www.itsdg.cn
+ #绔彛
+ port: 3741
diff --git a/rsf-open-api/src/main/resources/application-prod.yml b/rsf-open-api/src/main/resources/application-prod.yml
index dac8347..2fa7e46 100644
--- a/rsf-open-api/src/main/resources/application-prod.yml
+++ b/rsf-open-api/src/main/resources/application-prod.yml
@@ -80,3 +80,8 @@
host: http://127.0.0.1
#绔彛
port: 8085
+ erp:
+ #閾炬帴
+ host: http://www.itsdg.cn
+ #绔彛
+ port: 3741
\ No newline at end of file
--
Gitblit v1.9.1