From df08ca13ad69fd3908bfcd5f39f05f6c4ffb668a Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 14:10:49 +0800
Subject: [PATCH] lsh#
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 10 ++++++++--
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java | 2 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java | 2 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java | 13 ++++++++-----
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java
index ca9040c..b0bc64c 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java
@@ -30,7 +30,7 @@
// 寮�鍚ā鎷熸暟鎹�
@Value("${foreign.api.data.simulated}")
- public static String SIMULATED_DATA_ENABLE = "1";
+ public static String SIMULATED_DATA_ENABLE = "0";
@Resource
private AppAuthService appAuthService;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
index 9b84423..a75afc4 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
@@ -116,10 +116,16 @@
JSONArray params = paramsFormat(objParams);
List<Order> orderList = JSON.parseArray(params.toJSONString(), Order.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
+ StringBuffer errorMsg = new StringBuffer();
for (Order order : orderList) {
- erpReportService.addOrderToServer(order);
+ String i = erpReportService.addOrderToServer(order);
+ if (i.equals("200")){
+ errorMsg.append(order.getOrderNo()+"涓嬪彂鎴愬姛;");
+ } else {
+ errorMsg.append(order.getOrderNo()+"涓嬪彂澶辫触,鍘熷洜锛�"+i+";");
+ }
}
- return CommonResponse.ok();
+ return CommonResponse.ok(errorMsg.toString());
}
@ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗曞彇娑�")
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java
index 41da840..b650375 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java
@@ -9,7 +9,7 @@
public interface ErpReportService {
- int addOrderToServer(Order order);
+ String addOrderToServer(Order order);
JSONObject loginBySign() throws UnsupportedEncodingException, NoSuchAlgorithmException;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
index 7f3cf43..db4405e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
@@ -72,7 +72,7 @@
- public int addOrderToServer(Order order) {
+ public String addOrderToServer(Order order) {
if (Objects.isNull(order.getOrderNo()) || order.getOrderNo().isEmpty()) {
throw new CoolException("璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
}
@@ -98,8 +98,11 @@
maps.add(mapParams);
log.info("淇敼璁㈠崟淇℃伅鍙婄姸鎬侊細 {}锛� 璇锋眰鍙傛暟锛� {}", wmsUrl, JSONArray.toJSONString(maps));
HttpEntity<List<Map<String, Object>>> httpEntity = new HttpEntity<>(maps, headers);
+ ArrayList<Order> orders = new ArrayList<>();
+ orders.add(order);
+ HttpEntity httpEntity2 = new HttpEntity<>(orders, headers);//cs
// asnOrder/items/save
- ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity, String.class);
+ ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity2, String.class);//cs
log.info("璁㈠崟淇敼杩斿洖缁撴灉锛� {}", exchange);
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("鏌ヨ澶辫触锛侊紒");
@@ -110,13 +113,13 @@
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
// JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
- return 1;
+ return "200";
} else {
- return 0;
+ return result.getMsg();
// throw new CoolException("鏌ヨ澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
- return 0;
+ return e.getMessage();
// throw new CoolException(e.getMessage());
}
}
--
Gitblit v1.9.1