库区管理-防重复添加修改 导出修改

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java

@@ -72,7 +72,11 @@ public class BasWarehouseController extends BaseController
     public AjaxResult add(@RequestBody BasWarehouse basWarehouse)
     {
 //        basWarehouse.setWarehouseId("A01");
-        return toAjax(basWarehouseService.insertBasWarehouse(basWarehouse));
+        if (basWarehouseService.insertBasWarehouse(basWarehouse) > 0){
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error("仓库编码已存在");
+        }
     }
 
     /**
@@ -83,7 +87,11 @@ public class BasWarehouseController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BasWarehouse basWarehouse)
     {
-        return toAjax(basWarehouseService.updateBasWarehouse(basWarehouse));
+        if (basWarehouseService.updateBasWarehouse(basWarehouse) > 0){
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error("仓库编码已存在");
+        }
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java

@@ -18,151 +18,177 @@ public class BasWarehouse extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id（主键不允许为空）主键 */
-    @Excel(name = "${bas.Warehouse.warehouseId}")
+    @Excel(name = "id")
     private String warehouseId;
 
     /** 仓库id（不允许为空） */
-    @Excel(name = "${bas.Warehouse.warehouseNo}")
     private String warehouseNo;
 
     /** 项目编号 */
-    @Excel(name = "${bas.Warehouse.projectNo}")
     private String projectNo;
 
     /** 仓库名称（不允许为空） */
-    @Excel(name = "${bas.Warehouse.warehouseName}")
+    @Excel(name = "仓库名称")
     private String warehouseName;
 
     /** 仓库地址（允许为空） */
-    @Excel(name = "${bas.Warehouse.address}")
+    @Excel(name = "仓库地址")
     private String address;
 
     /** 仓库描述（允许为空） */
-    @Excel(name = "${bas.Warehouse.cDesc}")
     private String cDesc;
 
     /** 仓库级别（允许为空）1、2 */
-    @Excel(name = "${bas.Warehouse.warehouseKind}")
     private String warehouseKind;
 
     /** 仓库类型 */
-    @Excel(name = "${bas.Warehouse.warehouseType}",dictType = "warehouse_type")
+    @Excel(name = "仓库类型",dictType = "warehouse_type")
     private String warehouseType;
 
     /** 是否可用（不允许为空）Y、N */
-    @Excel(name = "${bas.Warehouse.isCurrent}",dictType = "sys_yes_no")
+    @Excel(name = "是否可用",dictType = "sys_yes_no")
     private String isCurrent;
 
+    @Excel(name = "备注")
+    private String remark;
+
     /*仓库数据权限*/
     private List<String> dataScope;
     private List<String> typeData;
 
-    public void setWarehouseId(String warehouseId) 
+    private String updateId;
+
+    public String getUpdateId() {
+        return updateId;
+    }
+    public void setUpdateId(String updateId) {
+        this.updateId = updateId;
+    }
+
+    public String getcDesc() {
+        return cDesc;
+    }
+
+    public void setcDesc(String cDesc) {
+        this.cDesc = cDesc;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public void setWarehouseId(String warehouseId)
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId() 
+    public String getWarehouseId()
     {
         return warehouseId;
     }
 
-    public void setWarehouseNo(String warehouseNo) 
+    public void setWarehouseNo(String warehouseNo)
     {
         this.warehouseNo = warehouseNo;
     }
 
-    public String getWarehouseNo() 
+    public String getWarehouseNo()
     {
         return warehouseNo;
     }
 
-    public void setProjectNo(String projectNo) 
+    public void setProjectNo(String projectNo)
     {
         this.projectNo = projectNo;
     }
 
-    public String getProjectNo() 
+    public String getProjectNo()
     {
         return projectNo;
     }
 
-    public void setWarehouseName(String warehouseName) 
+    public void setWarehouseName(String warehouseName)
     {
         this.warehouseName = warehouseName;
     }
 
-    public String getWarehouseName() 
+    public String getWarehouseName()
     {
         return warehouseName;
     }
 
-    public void setAddress(String address) 
+    public void setAddress(String address)
     {
         this.address = address;
     }
 
-    public String getAddress() 
+    public String getAddress()
     {
         return address;
     }
 
-    public void setCDesc(String cDesc) 
+    public void setCDesc(String cDesc)
     {
         this.cDesc = cDesc;
     }
 
-    public String getCDesc() 
+    public String getCDesc()
     {
         return cDesc;
     }
 
-    public void setWarehouseKind(String warehouseKind) 
+    public void setWarehouseKind(String warehouseKind)
     {
         this.warehouseKind = warehouseKind;
     }
 
-    public String getWarehouseKind() 
+    public String getWarehouseKind()
     {
         return warehouseKind;
     }
 
-    public void setWarehouseType(String warehouseType) 
+    public void setWarehouseType(String warehouseType)
     {
         this.warehouseType = warehouseType;
     }
 
-    public String getWarehouseType() 
+    public String getWarehouseType()
     {
         return warehouseType;
     }
 
-    public void setIsCurrent(String isCurrent) 
+    public void setIsCurrent(String isCurrent)
     {
         this.isCurrent = isCurrent;
     }
 
-    public String getIsCurrent() 
+    public String getIsCurrent()
     {
         return isCurrent;
     }
 
-    public void setDataScope(List<String> dataScope) 
+    public void setDataScope(List<String> dataScope)
     {
         this.dataScope = dataScope;
     }
 
-    public List<String> getDataScope() 
+    public List<String> getDataScope()
     {
         return dataScope;
     }
 
-    public void setTypeData(List<String> typeData) 
+    public void setTypeData(List<String> typeData)
     {
         this.typeData = typeData;
     }
 
-    public List<String> getTypeData() 
+    public List<String> getTypeData()
     {
         return typeData;
     }

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.bas.warehouse.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.bas.warehouse.domain.BasWarehouse;
 import com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper;
 import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
@@ -58,6 +59,12 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
     @Override
     public int insertBasWarehouse(BasWarehouse basWarehouse)
     {
+        BasWarehouse basWarehouseParam = new BasWarehouse();
+        basWarehouseParam.setWarehouseId(basWarehouse.getWarehouseId());
+        List<BasWarehouse> basWarehouses = basWarehouseMapper.selectBasWarehouseList(basWarehouseParam);
+        if (CollUtil.isNotEmpty(basWarehouses)){
+            return -1;
+        }
         return basWarehouseMapper.insertBasWarehouse(basWarehouse);
     }
 
@@ -70,6 +77,13 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
     @Override
     public int updateBasWarehouse(BasWarehouse basWarehouse)
     {
+        BasWarehouse basWarehouseParam = new BasWarehouse();
+        basWarehouseParam.setWarehouseId(basWarehouse.getWarehouseId());
+        basWarehouseParam.setUpdateId(basWarehouse.getWarehouseId());
+        List<BasWarehouse> basWarehouses = basWarehouseMapper.selectBasWarehouseList(basWarehouseParam);
+        if (CollUtil.isNotEmpty(basWarehouses)){
+            return -1;
+        }
         return basWarehouseMapper.updateBasWarehouse(basWarehouse);
     }
 

ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml

@@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>
+            <if test="updateId != null and updateId != ''">
+                and warehouse_id != #{updateId}
+            </if>
         </where>
     </select>
 

ruoyi-ui/src/views/bas/warehouse/index.vue

@@ -3,10 +3,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
       <!-- 仓库编号 -->
-      <el-form-item label="仓库编号" prop="warehouseNo">
+      <el-form-item label="仓库ID" prop="warehouseId">
         <el-input
-          v-model="queryParams.warehouseNo"
+          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库编号"
+          placeholder="请输入仓库ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -144,7 +144,7 @@
       <!-- 仓库ID（序号） -->
       <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>
       <!-- 仓库编号 -->
-      <el-table-column label="仓库编号" align="left" prop="warehouseNo" />
+<!--      <el-table-column label="仓库编号" align="left" prop="warehouseNo" />-->
       <!-- 项目编号 -->
 <!--      <el-table-column label="项目编号" align="left" prop="projectNo" />-->
       <!-- 仓库名称 -->
@@ -206,9 +206,9 @@
           <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" :disabled="isDisabledForId"/>
         </el-form-item>
         <!-- 仓库编号 -->
-        <el-form-item label="仓库编号" prop="warehouseNo">
+<!--        <el-form-item label="仓库编号" prop="warehouseNo">-->
-          <el-input v-model="form.warehouseNo" placeholder="请输入仓库编号" />
+<!--          <el-input v-model="form.warehouseNo" placeholder="请输入仓库编号" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <!-- 项目编号 -->
 <!--        <el-form-item label="项目编号" prop="projectNo">-->
 <!--          <el-input v-model="form.projectNo" placeholder="请输入项目编号" />-->