From b9b55bd345d96ab9b500dd47489393d03f776358 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 31 十月 2025 10:22:36 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
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 01f8aef..8433f0a 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
@@ -13,6 +13,7 @@
import com.vincent.rsf.openApi.entity.dto.OrderDto;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
+import com.vincent.rsf.openApi.entity.params.ReportParams;
import com.vincent.rsf.openApi.service.WmsErpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,7 +69,14 @@
if (result.getCode() == 200) {
JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
OrderDto dto = new OrderDto();
- dto.setOrderNo(object.getString("code")).setAnfme(object.getDouble("anfme")).setType(object.getString("type")).setWkType(object.getString("wkType")).setQty(object.getDouble("qty")).setPoCode(object.getString("poCode")).setExceStatus(object.getShort("exceStatus")).setWorkQty(object.getDouble("workQty"));
+ dto.setOrderNo(object.getString("code"))
+ .setAnfme(object.getDouble("anfme"))
+ .setType(object.getString("type"))
+ .setWkType(object.getString("wkType"))
+ .setQty(object.getDouble("qty"))
+ .setPoCode(object.getString("poCode"))
+ .setExceStatus(object.getShort("exceStatus"))
+ .setWorkQty(object.getDouble("workQty"));
result.setData(dto);
return result;
} else {
@@ -215,22 +223,22 @@
* @version 1.0
*/
@Override
- public CommonResponse reportOrders(Map<String, Object> params) {
+ public CommonResponse reportOrders(ReportParams 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);
+ log.info("宸插畬鎴愯鍗曚笂浼狅細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, httpEntity.getBody());
+
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("淇敼缁撴灉锛� {}", exchange);
+ log.info("宸插畬鎴愯鍗曚笂浼狅紝璇锋眰缁撴灉锛� {}", exchange);
if (Objects.isNull(exchange.getBody())) {
- throw new CoolException("淇敼澶辫触锛侊紒");
+ throw new CoolException("涓婁紶澶辫触锛侊紒");
} else {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
@@ -239,7 +247,7 @@
if (result.getCode() == 200) {
return result;
} else {
- throw new CoolException("淇敼澶辫触锛侊紒");
+ throw new CoolException("涓婁紶澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
--
Gitblit v1.9.1