From 1e1c329535e3f3ce253c89ae1847476de9058f27 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 10:05:00 +0800
Subject: [PATCH] ERP单据查询功能优化
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 14 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 5bcff05..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 {
@@ -131,6 +139,7 @@
/**
* 鍒犻櫎鍗曟嵁
+ *
* @param params
* @return
*/
@@ -168,12 +177,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())) {
@@ -213,7 +223,46 @@
* @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;
+ 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);
+ 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(Map<String, Object> params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -224,6 +273,7 @@
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);
@@ -243,17 +293,6 @@
throw new CoolException(e.getMessage());
}
}
- }
-
- /**
- * @author Ryan
- * @date 2025/10/27
- * @description: 鐩樼偣宸紓鍗曚慨鏀�
- * @version 1.0
- */
- @Override
- public CommonResponse reportCheck(ErpOpParams params) {
- return null;
}
}
--
Gitblit v1.9.1