From 3abb818f5ef2905fbd4ce709380e37c7f6271c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 3 Dec 2021 00:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SupplierController.java | 20 +++++++++++++++++-- .../datasource/mappers/SupplierMapperEx.java | 5 +++-- .../erp/service/supplier/SupplierService.java | 15 +++++++++++++- .../resources/mapper_xml/SupplierMapperEx.xml | 4 ++-- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java index 59b312b8..7238afee 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -55,6 +55,22 @@ public class SupplierController { @Resource private UserService userService; + @GetMapping(value = "/checkIsNameAndTypeExist") + @ApiOperation(value = "检查名称和类型是否存在") + public String checkIsNameAndTypeExist(@RequestParam Long id, + @RequestParam(value ="name") String name, + @RequestParam(value ="type") String type, + HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int exist = supplierService.checkIsNameAndTypeExist(id, name, type); + if(exist > 0) { + objectMap.put("status", true); + } else { + objectMap.put("status", false); + } + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } + /** * 查找客户信息-下拉框 * @param request @@ -135,7 +151,7 @@ public class SupplierController { for (Supplier supplier : supplierList) { JSONObject item = new JSONObject(); item.put("id", supplier.getId()); - item.put("supplier", supplier.getSupplier()); //供应商名称 + item.put("supplier", supplier.getSupplier() + "[供应商]"); //供应商名称 dataArray.add(item); } } @@ -151,7 +167,7 @@ public class SupplierController { Boolean flag = ubValue.contains("[" + supplier.getId().toString() + "]"); if (!customerFlag || flag) { item.put("id", supplier.getId()); - item.put("supplier", supplier.getSupplier()); //客户名称 + item.put("supplier", supplier.getSupplier() + "[客户]"); //客户名称 dataArray.add(item); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java index 6d0dbdf7..9f5d4660 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java @@ -31,6 +31,7 @@ public interface SupplierMapperEx { int batchDeleteSupplierByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); - Supplier getSupplierByName( - @Param("supplier") String supplier); + Supplier getSupplierByNameAndType( + @Param("supplier") String supplier, + @Param("type") String type); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index 977ae1a8..466dd2bb 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -153,7 +153,7 @@ public class SupplierService { //新增客户时给当前用户自动授权 if("客户".equals(supplier.getType())) { Long userId = userService.getUserId(request); - Supplier sInfo = supplierMapperEx.getSupplierByName(supplier.getSupplier()); + Supplier sInfo = supplierMapperEx.getSupplierByNameAndType(supplier.getSupplier(), supplier.getType()); String ubKey = "[" + sInfo.getId() + "]"; List ubList = userBusinessService.getBasicData(userId.toString(), "UserCustomer"); if(ubList ==null || ubList.size() == 0) { @@ -271,6 +271,19 @@ public class SupplierService { return list==null?0:list.size(); } + public int checkIsNameAndTypeExist(Long id, String name, String type)throws Exception { + SupplierExample example = new SupplierExample(); + example.createCriteria().andIdNotEqualTo(id).andSupplierEqualTo(name).andTypeEqualTo(type) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + List list=null; + try{ + list= supplierMapper.selectByExample(example); + }catch(Exception e){ + JshException.readFail(logger, e); + } + return list==null?0:list.size(); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int updateAdvanceIn(Long supplierId, BigDecimal advanceIn)throws Exception{ Supplier supplier=null; diff --git a/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml index d7ff7270..78d95ae3 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml @@ -83,9 +83,9 @@ ) - select * from jsh_supplier - where supplier = #{supplier} + where supplier = #{supplier} and type = #{type} \ No newline at end of file