Merge branch 'ww'

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

@@ -89,7 +89,7 @@ public class ThrInvWarehouseController {
     @AuthRuleAnnotation("")
     @PostMapping("/thirdSys/sub/inv/warehouse/edit")
     public BaseResponse edit(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity,
-                             BindingResult bindingResult) {
+                             BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest ) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -97,9 +97,18 @@ public class ThrInvWarehouseController {
         if (invSubWarehouseEntity.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        boolean b = thrInvWarehouseService.updateThrInvWarehouse(invSubWarehouseEntity);
+        //先判断该部门下存不存在此仓库
-        if (!b) {
+        filterThrSubInvWarehouseRequest.setCode(invSubWarehouseEntity.getCode());
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        filterThrSubInvWarehouseRequest.setName(invSubWarehouseEntity.getName());
+        filterThrSubInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId());
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+        if(thrInvWarehouseEntities.size()==0){
+            boolean b = thrInvWarehouseService.updateThrInvWarehouse(invSubWarehouseEntity);
+            if (!b) {
+                return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+            }
+        }else{
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
         }
 
         ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getThirdSysFk());

src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.thrsys.ThrInvWarehouseDao">
-    <select id="filterThrInvWarehouse" parameterType="com.glxp.api.req.thrsys.FilterThrDeptRequest"
+    <select id="filterThrInvWarehouse" parameterType="com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest"
             resultType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
         SELECT *
         FROM thr_inv_warehouse