From 28ec15c4257040b274d44ed66b2182a84c74e9fa Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 30 Jun 2022 11:35:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E5=88=86=E4=BB=93=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/LoginController.java | 2 ++ .../inventory/InvSubWarehouseService.java | 9 +++++++++ .../inventory/InvWarehouseService.java | 7 +++++++ .../impl/InvSubWarehouseServiceImpl.java | 9 +++++++++ .../impl/InvWarehouseServiceImpl.java | 19 ++++++++++++++----- .../admin/thread/IoTransInoutService.java | 2 -- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index a7fedc1..3074734 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java index 38048db..1947f03 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java +++ b/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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java index 4dab5d7..d7ed1ec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java @@ -62,4 +62,11 @@ public interface InvWarehouseService { */ List getThirdSysDetail(FilterBasicThirdSysRequest request, Integer id); + /** + * 通过仓库编码，查询仓库名称 + * + * @param code + * @return + */ + String getInvName(String code); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 1c7cf47..4e06cb7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/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); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java index 33b21fa..dd77600 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java +++ b/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); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 6dc74a6..e719005 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/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;