From 66a37d752e5d97b0be250f7f0c18352e56e28817 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 31 十月 2025 13:58:05 +0800
Subject: [PATCH] 打开上报接口

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 298e948..1b1c596 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
@@ -10,6 +10,7 @@
 import com.vincent.rsf.openApi.config.PlatformProperties;
 import com.vincent.rsf.openApi.entity.constant.WmsConstant;
 import com.vincent.rsf.openApi.entity.dto.CommonResponse;
+import com.vincent.rsf.openApi.entity.dto.ErpCommonResponse;
 import com.vincent.rsf.openApi.entity.dto.OrderDto;
 import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
 import com.vincent.rsf.openApi.entity.params.ErpOpParams;
@@ -69,7 +70,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 {
@@ -236,9 +244,11 @@
             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;
+                CommonResponse commonResponse = new CommonResponse();
+                ErpCommonResponse result = objectMapper.readValue(exchange.getBody(), ErpCommonResponse.class);
+                if (!result.getIsError()) {
+                    commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
+                    return commonResponse;
                 } else {
                     throw new CoolException("涓婁紶澶辫触锛侊紒");
                 }

--
Gitblit v1.9.1