From 2c3d8de69157644a59be4383f837522c53328fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 29 Nov 2022 10:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5busUser=E4=B8=8A=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/ApiAdminApplication.java | 2 +- .../inventory/InvSubWarehouseController.java | 14 +++-- .../inventory/InvWarehouseController.java | 20 ++++++- .../purchase/SupCertSetController.java | 2 +- .../inventory/InvWarehouseService.java | 2 + .../impl/InvWarehouseServiceImpl.java | 9 +++ .../mapper/basic/BussinessLocalTypeDao.xml | 57 ++++++++++++------- .../mybatis/mapper/business/StockOrderDao.xml | 8 +-- 8 files changed, 77 insertions(+), 37 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java b/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java index 4c8c85c9..f9a1ac90 100644 --- a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java +++ b/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java @@ -12,7 +12,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer @ServletComponentScan public class ApiAdminApplication extends SpringBootServletInitializer { -// + public static void main(String[] args) { SpringApplication application = new SpringApplication(ApiAdminApplication.class); application.addInitializers(new ToolApplicationContextInitializer()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index d1892edd..fe2abc51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -77,13 +77,15 @@ public class InvSubWarehouseController { // } AuthAdmin authAdmin = customerService.getUserBean(); - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - if (authAdmin.getCustomerId().equals("110")) - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); - else{ - filterInvWarehouseRequest.setSpUse(true); + if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { + if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { + if (authAdmin.getCustomerId()==110) { + filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + }else { + filterInvWarehouseRequest.setSpUse(true); + } } - }else{ + } else{ //走这边表示单据选择的是往来单位里面调出调入的库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java index 1ec7425c..c6da9401 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java @@ -220,12 +220,17 @@ public class InvWarehouseController { return ResultVOUtils.error(500, "已存在相同类型的一级仓库，无法继续添加！"); } } - InvWarehouseEntity invWarehouseEntity1 = invWarehouseService.selectByName(invWarehouseEntity.getName()); - if (invWarehouseEntity1 != null) { - return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); + List invWarehouseEntityList = invWarehouseService.selectByNameList(invWarehouseEntity.getName()); + if (invWarehouseEntityList!=null && invWarehouseEntityList.size()>0) { + for (InvWarehouseEntity obj:invWarehouseEntityList){ + if(obj.getName().equals(invWarehouseEntity.getName()) && !obj.getId().equals(invWarehouseEntity.getId())){ + return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); + } + } } + if (invWarehouseEntity.getPid() == null || invWarehouseEntity.getPid() == 0) {//仓库 invWarehouseEntity.setPid(0); // 默认设置 FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); @@ -277,6 +282,15 @@ public class InvWarehouseController { if (invWarehouseEntity.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + List invWarehouseEntityList = invWarehouseService.selectByNameList(invWarehouseEntity.getName()); + if (invWarehouseEntityList!=null && invWarehouseEntityList.size()>0) { + for (InvWarehouseEntity obj:invWarehouseEntityList){ + if(obj.getName().equals(invWarehouseEntity.getName()) && !obj.getId().equals(invWarehouseEntity.getId())){ + return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); + } + } + } invWarehouseEntity.setPid(null); // 不能修改父级 pid invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.updateInvWarehouse(invWarehouseEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java index ffdefa3a..f7225922 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java @@ -36,7 +36,7 @@ public class SupCertSetController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - filterCertSetsRequest.setNeed(0); + List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java index 753d83ef..5e98583b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java @@ -33,6 +33,8 @@ public interface InvWarehouseService { boolean deleteById(String id); + List selectByNameList(String name); + /** * 批量导入仓库信息 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java index f6c6f895..32f68ce2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java @@ -122,6 +122,15 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return invWarehouseEntities.get(0); return null; } + @Override + public List selectByNameList(String name) { + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setName(name); + List invWarehouseEntities = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest); + if (invWarehouseEntities != null && invWarehouseEntities.size() > 0) + return invWarehouseEntities; + return null; + } @Override public boolean deleteById(String id) { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 48677e80..8f0b81cc 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -128,24 +128,39 @@