From da70e7d9e017fda5a48eb8df412dbd7c33769ab6 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期三, 10 十二月 2025 19:40:24 +0800
Subject: [PATCH] 盘点功能优化

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java |   25 +++++++++++--------------
 1 files changed, 11 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 f88c4d2..19bd532 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
@@ -81,7 +81,8 @@
                     result.setData(dto);
                     return result;
                 } else {
-                    throw new CoolException("鏌ヨ澶辫触锛侊紒");
+                    return result;
+//                    throw new CoolException("鏌ヨ澶辫触锛侊紒");
                 }
             } catch (JsonProcessingException e) {
                 throw new CoolException(e.getMessage());
@@ -259,7 +260,7 @@
      * @version 1.0
      */
     @Override
-    public CommonResponse reportCheck(Map<String, Object> params) {
+    public CommonResponse reportCheck(ReportParams params) {
         if (Objects.isNull(params)) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
@@ -272,21 +273,17 @@
 
         HttpEntity httpEntity = new HttpEntity(params, headers);
         ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
-        log.info("淇敼缁撴灉锛� {}", exchange);
+        log.info("淇敼缁撴灉锛� {}", exchange.getBody());
         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());
+            CommonResponse commonResponse = new CommonResponse();
+            ErpCommonResponse result = JSONObject.parseObject(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