From ad889cda4a5189ea576297050eb68aa6d2aee06e Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 20 三月 2025 22:07:45 +0800
Subject: [PATCH] Wms仓库相关代码

---
 src/main/java/com/whyc/service/WmsService.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index 63b4b92..c38d8c8 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -1,5 +1,6 @@
 package com.whyc.service;
 
+import com.google.gson.reflect.TypeToken;
 import com.whyc.dto.Response;
 import com.whyc.dto.WmsLocationDto;
 import com.whyc.dto.WmsMaterialDto;
@@ -7,6 +8,8 @@
 import com.whyc.util.HttpUtil;
 import com.whyc.util.JsonUtil;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 public class WmsService {
@@ -21,7 +24,8 @@
         //瀵圭粨鏋滆繘琛屽鐞�
         if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
             String dataStr = (String) response.getData();
-            WmsMaterialDto wmsMaterialDto = JsonUtil.getGson().fromJson(dataStr, WmsMaterialDto.class);
+            //WmsMaterialDto wmsMaterialDto = JsonUtil.getGson().fromJson(dataStr, WmsMaterialDto.class);
+            WmsMaterialDto wmsMaterialDto = JsonUtil.getGson().fromJson(dataStr, new TypeToken<List<WmsMaterialDto>>(){}.getType());
             response.set(1,wmsMaterialDto);
         }
         return response;
@@ -60,7 +64,8 @@
         //瀵圭粨鏋滆繘琛屽鐞�
         if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
             String dataStr = (String) response.getData();
-            WmsLocationDto wmsLocationDto = JsonUtil.getGson().fromJson(dataStr, WmsLocationDto.class);
+            //WmsLocationDto wmsLocationDto = JsonUtil.getGson().fromJson(dataStr, WmsLocationDto.class);
+            WmsLocationDto wmsLocationDto = JsonUtil.getGson().fromJson(dataStr, new TypeToken<List<WmsLocationDto>>(){}.getType());
             response.set(1,wmsLocationDto);
         }
         return response;

--
Gitblit v1.9.1