1.用户信息接口增加返回用户仓库和分仓中文名称字段值

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java

@@ -230,6 +230,8 @@ public class LoginController {
         loginUserInfoResponse.setAuthRules(authRules);
         CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId());
         loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName());
+        loginUserInfoResponse.setLocInvName(invWarehouseService.getInvName(loginUserInfoResponse.getLocInvCode()));
+        loginUserInfoResponse.setLocSubInvName(invSubWarehouseService.getSubInvName(loginUserInfoResponse.getLocSubInvCode()));
         return ResultVOUtils.success(loginUserInfoResponse);
     }
 

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java

@@ -36,4 +36,13 @@ public interface InvSubWarehouseService {
      * @return
      */
     boolean checkDuplicateName(String parentId, String name);
+
+
+    /**
+     * 根据分库编码，查询分库名称
+     *
+     * @param subInvCode
+     * @return
+     */
+    String getSubInvName(String subInvCode);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java

@@ -62,4 +62,11 @@ public interface InvWarehouseService {
      */
     List<InvWarehouseThirdSysResponse> getThirdSysDetail(FilterBasicThirdSysRequest request, Integer id);
 
+    /**
+     * 通过仓库编码，查询仓库名称
+     *
+     * @param code
+     * @return
+     */
+    String getInvName(String code);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.service.inventory.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
@@ -109,4 +110,12 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
         }
         return false;
     }
+
+    @Override
+    public String getSubInvName(String subInvCode) {
+        if (StrUtil.isBlank(subInvCode)) {
+            return "";
+        }
+        return invSubWarehouseDao.selectNameByCode(subInvCode);
+    }
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.inventory.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.basic.BasicThirdSysDao;
 import com.glxp.sale.admin.dao.inventory.InvWarehouseDao;
@@ -125,12 +126,12 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
     }
 
     @Override
-    public boolean bindThrWarehouse(Integer id, String  thridWarehouseId, String sysId) {
+    public boolean bindThrWarehouse(Integer id, String thridWarehouseId, String sysId) {
         return invWarehouseDao.updateThridId(id, thridWarehouseId, sysId);
     }
 
     @Override
-    public boolean unbindThrWarehouse(Integer id,String sysId) {
+    public boolean unbindThrWarehouse(Integer id, String sysId) {
         return invWarehouseDao.updateThridId(id, null, sysId);
     }
 
@@ -173,7 +174,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                     response.setThirdName(thrInvWarehouseEntity.getName());
                 }
                 result.add(response);
-            }else if (sys.getThirdId().equals("thirdId2")) {
+            } else if (sys.getThirdId().equals("thirdId2")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
                 response.setSysId(sys.getThirdId());
                 response.setSysName(sys.getThirdName());
@@ -184,7 +185,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                     response.setThirdName(thrInvWarehouseEntity.getName());
                 }
                 result.add(response);
-            }else if (sys.getThirdId().equals("thirdId3")) {
+            } else if (sys.getThirdId().equals("thirdId3")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
                 response.setSysId(sys.getThirdId());
                 response.setSysName(sys.getThirdName());
@@ -195,7 +196,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
                     response.setThirdName(thrInvWarehouseEntity.getName());
                 }
                 result.add(response);
-            }else if (sys.getThirdId().equals("thirdId4")) {
+            } else if (sys.getThirdId().equals("thirdId4")) {
                 InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
                 response.setSysId(sys.getThirdId());
                 response.setSysName(sys.getThirdName());
@@ -210,4 +211,12 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         }
         return result;
     }
+
+    @Override
+    public String getInvName(String code) {
+        if (StrUtil.isBlank(code)) {
+            return "";
+        }
+        return invWarehouseDao.getNameByCode(code);
+    }
 }

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -31,8 +31,6 @@ import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.inout.*;
 import com.glxp.sale.admin.service.inventory.*;
 import com.glxp.sale.admin.util.*;
-import com.glxp.sale.common.res.BaseResponse;
-import com.glxp.sale.common.util.ResultVOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;