[CODE]: 仓库库区唯一判断

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TWarehouseController.java

@@ -81,16 +81,15 @@ public class TWarehouseController extends BaseController {
             return AjaxResult.error("新增仓库'" + tWarehouses.getfNo() + "'失败，编号已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(tWarehouseService.checkUFNnameUnique(tWarehouses))) {
             return AjaxResult.error("新增仓库'" + tWarehouses.getfName() + "'失败，名称已存在");
-        } else if (UserConstants.NOT_UNIQUE.equals(tWarehouseService.checkUFAaddrUnique(tWarehouses))) {
-            return AjaxResult.error("新增仓库'" + tWarehouses.getfAddr() + "'失败，地址已存在");
         }
         JSONArray jsonArray = JSONArray.parseArray(tWarehouseArea);
         List<TWarehouseArea> tWarehouseAreaList = JSONObject.parseArray(jsonArray.toJSONString(), TWarehouseArea.class);
         for (TWarehouseArea tWarehouseAreas : tWarehouseAreaList) {
+            tWarehouseAreas.setfWarehouseid(tWarehouses.getfId());
             if (UserConstants.NOT_UNIQUE.equals(tWarehouseService.checkUFTWarehouseAreaNoUnique(tWarehouseAreas))) {
                 return AjaxResult.error("新增仓库'" + tWarehouseAreas.getfNo() + "'失败，库区编号已存在");
             } else if (UserConstants.NOT_UNIQUE.equals(tWarehouseService.checkUTWarehouseAreaFNnameUnique(tWarehouseAreas))) {
-                return AjaxResult.error("新增仓库'" + tWarehouseAreas.getfName() + "'失败，库区编号已存在");
+                return AjaxResult.error("新增仓库'" + tWarehouseAreas.getfName() + "'失败，库区名称已存在");
             }
         }
 
@@ -116,7 +115,7 @@ public class TWarehouseController extends BaseController {
     @Log(title = "仓库", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
-        return toAjax(tWarehouseService.deleteTWarehouseByIds(fIds));
+        return tWarehouseService.deleteTWarehouseByIds(fIds);
     }
 
 

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseAreaMapper.xml

@@ -102,12 +102,12 @@
         </foreach>
     </delete>
 
-    <select id="checkFNoUnique" parameterType="String" resultMap="TWarehouseAreaResult">
-	    select f_id,f_no from t_warehouse_area where f_no = #{fNo} limit 1
+    <select id="checkFNoUnique"  resultMap="TWarehouseAreaResult">
+	    select f_id,f_no from t_warehouse_area where f_no = #{fNo}  and f_warehouseid = #{fWarehouseid} limit 1
     </select>
 
-    <select id="checkUFNnameUnique" parameterType="String" resultMap="TWarehouseAreaResult">
-        select f_id,f_name from t_warehouse_area where f_name = #{fAame} limit 1
+    <select id="checkUFNnameUnique"  resultMap="TWarehouseAreaResult">
+        select f_id,f_name from t_warehouse_area where f_name = #{fNname}  and f_warehouseid = #{fWarehouseid} limit 1
     </select>
 
 </mapper>