From 36dd7ba530d8414b9c384b236b952a6a47cdc9bc Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 20 Jul 2022 09:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=EF=BC=8C=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE=EF=BC=8C=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/InvErpOnhandController.java     | 31 +++++++++++++++++++
 .../thread/DownloadThirdSysDataTask.java      |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java
index beed67f5..e41d67c4 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java
@@ -1,7 +1,10 @@
 package com.glxp.api.admin.controller.inventory;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
+import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.api.admin.entity.basic.UdiEntity;
 import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
 import com.glxp.api.admin.httpclient.ErpInvClient;
@@ -9,15 +12,19 @@ import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.api.admin.req.inventory.ErpOnhandRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.res.basic.ErpProductsResponse;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.res.inventory.ErpInvProductResponse;
 import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
+import com.glxp.api.admin.service.basic.BasicThirdSysService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
 import com.glxp.api.admin.service.thrsys.ThrInvProductsService;
 import com.glxp.api.admin.util.FilterUdiUtils;
+import com.glxp.api.admin.util.HttpOkClient;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 public class InvErpOnhandController {
 
@@ -38,6 +46,11 @@ public class InvErpOnhandController {
     private ThrInvProductsService thrInvProductsService;
     @Resource
     ErpInvClient erpInvClient;
+    @Resource
+    private BasicThirdSysService basicThirdSysService;
+    @Resource
+    HttpOkClient httpOkClient;
+
 
     @GetMapping("/udiwms/inv/getOnHand")
     public BaseResponse getOnhand(ErpOnhandRequest onhandQueryRequest,
@@ -102,6 +115,24 @@ public class InvErpOnhandController {
     }
 
 
+    @GetMapping("/udiwms/inv/getInvProducts")
+    public BaseResponse getInvProducts(ErpOnhandRequest udiwmsOnhandRequest) {
+        BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsOnhandRequest.getThirdSys());
+        String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/inv/getEnvProduct";
+
+        try {
+            String response = httpOkClient.uCloudPost(url, udiwmsOnhandRequest, basicThirdSysEntity);
+            BaseResponse<PageSimpleResponse<ErpInvProductResponse>> udiDlDeviceResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpInvProductResponse>>>() {
+                    });
+            return udiDlDeviceResponse;
+        } catch (Exception e) {
+            log.error("获取库存产品信息异常", e);
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
+        }
+    }
+
+
     public UdiRelevanceResponse findByNamecode(String udi) {
         FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
         filterUdiInfoRequest.setNameCode(udi);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
index e5a48d4f..ffdec211 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
@@ -177,7 +177,7 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
                                 break;
                             }
                         } else {
-                            log.error("第三方系统单据类型数据下载失败");
+                            log.error("第三方系统单据类型数据下载失败(错误信息：" + busResponse.getMessage());
                             break;
                         }
                         log.info("第三方系统往来产品信息数据下载完成");