Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.thrsys;
 
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -146,7 +147,10 @@ public class ThrDeptController {
         if (StrUtil.isBlank(thirdSysFk)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        return thrDeptService.downloadThirdWarehouse(thirdSysFk);
+        ThreadUtil.execAsync(() -> {
+            thrDeptService.downloadThirdWarehouse(thirdSysFk);;
+        });
+        return ResultVOUtils.success("后台已开始下载，请稍后刷新查看！");
     }
 
 

src/main/java/com/glxp/api/http/ErpBasicClient.java

@@ -131,6 +131,7 @@ public class ErpBasicClient {
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getWarehouse";
         try {
             String response = httpOkClient.uCloudPost(url, udiwmsWarehouseRequest);
+            log.error("获取当前部门数据" + response);
             BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> listBaseResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>>>() {
                     });
@@ -310,6 +311,7 @@ public class ErpBasicClient {
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/basic/getProject";
         try {
             String response = httpOkClient.uCloudPost(url, dlThirdDestinyRequest);
+            log.error("获取收费项目：：：：：：" + response);
             BaseResponse<PageSimpleResponse<BasicSkProjectResponse>> listBaseResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<BasicSkProjectResponse>>>() {
                     });