1.第三方仓库信息接口返回第三方系统名称

api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java

@@ -1,6 +1,8 @@
 package com.glxp.api.admin.controller.thrsys;
 
 import cn.hutool.core.util.StrUtil;
+import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
+import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.api.admin.req.inout.DeleteRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
@@ -33,6 +35,8 @@ public class ThrInvWarehouseController {
 
     @Resource
     ThrInvWarehouseService thrInvWarehouseService;
+    @Resource
+    private BasicThirdSysDao basicThirdSysDao;
 
     @GetMapping("spms/thrsys/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
@@ -49,6 +53,9 @@ public class ThrInvWarehouseController {
         for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
             ThrInvWarehouseResponse thrInvWarehouseResponse = new ThrInvWarehouseResponse();
             BeanUtils.copyProperties(thrInvWarehouseEntity, thrInvWarehouseResponse);
+            //查询第三方系统名称
+            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysDao.selectByThirdId(thrInvWarehouseEntity.getThirdSysFk());
+            thrInvWarehouseResponse.setThirdName(basicThirdSysEntity.getThirdName());
             if (pid.equals(thrInvWarehouseEntity.getPid())) {
                 thrInvWarehouseResponse.setChildren(merge(thrInvWarehouseEntities, thrInvWarehouseEntity.getId()));
                 thrInvWarehouseResponses.add(thrInvWarehouseResponse);

api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrInvWarehouseResponse.java

@@ -24,6 +24,11 @@ public class ThrInvWarehouseResponse {
      */
     private String thirdSysFk;
 
+    /**
+     * 第三方系统名称
+     */
+    private String thirdName;
+
     private List<ThrInvWarehouseResponse> children;
 
 }