From ef60bc12149272702f6044842b8e0f9c82f0551b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 27 十月 2025 18:27:04 +0800
Subject: [PATCH] 添加盘点上报接口
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 2 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java | 2 +-
3 files changed, 36 insertions(+), 5 deletions(-)
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 af2cf37..1ef929f 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
@@ -107,7 +107,7 @@
@ApiOperation("鐩樼偣宸紓淇敼")
@PostMapping("/report/check")
- public CommonResponse reportCheck(@RequestBody ErpOpParams params) {
+ public CommonResponse reportCheck(@RequestBody Map<String, Object> params) {
return wmsErpService.reportCheck(params);
}
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 ed29924..fc3653a 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
@@ -18,5 +18,5 @@
CommonResponse reportOrders(Map<String, Object> params);
- CommonResponse reportCheck(ErpOpParams params);
+ CommonResponse reportCheck(Map<String, Object> 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 5bcff05..01f8aef 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
@@ -131,6 +131,7 @@
/**
* 鍒犻櫎鍗曟嵁
+ *
* @param params
* @return
*/
@@ -168,12 +169,13 @@
/**
* 鐗╂枡淇℃伅淇敼
+ *
* @param params
* @return
*/
@Override
public CommonResponse syncMatnrs(ErpMatnrParms params) {
- if (Objects.isNull(params.getMatnr()) ) {
+ if (Objects.isNull(params.getMatnr())) {
throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getMaktx())) {
@@ -252,8 +254,37 @@
* @version 1.0
*/
@Override
- public CommonResponse reportCheck(ErpOpParams params) {
- return null;
+ public CommonResponse reportCheck(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");
+
+ params.put("", "");
+ 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());
+ }
+ }
}
}
--
Gitblit v1.9.1