修改

src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java

@@ -48,8 +48,11 @@ public class RmsWarehouseController extends BaseRESTfulController {
     @ApiOperation(value="创建", notes="根据RmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "RmsWarehouse")
     @PostMapping(value = "/insertWarehouse")
-    public RESTfulResult insertWarehouse(@RequestBody(required = false) RmsWarehouse rmsWarehouse){
+    public RESTfulResult insertWarehouse(@RequestBody(required = false) Map<String,Object> rmsWarehouse){
         int result = rmsWarehouseService.insertWarehouse(rmsWarehouse);
+        if (result==-1){
+            return  failed("该仓库已经存在于系统中，请搜索查找");
+        }
         return success(result);
     }
 

src/main/java/com/steerinfo/dil/mapper/RmsWarehouseMapper.java

@@ -22,6 +22,10 @@ public interface RmsWarehouseMapper extends IBaseMapper<RmsWarehouse, BigDecimal
     @Select("select seq_RMS_WAREHOUSE.nextval from dual")
     BigDecimal selectWarehouseId();
 
+    //根据卸货点查找是否存在该卸货地点
+    BigDecimal searchWarehouseName(String warehouseName,BigDecimal shipperId);
+
+
     //仓库下拉框
     List<Map<String, Object>> getWarehouseTypeId();
 

src/main/java/com/steerinfo/dil/service/IRmsWarehouseService.java

@@ -23,7 +23,7 @@ public interface IRmsWarehouseService {
 
     List<Map<String, Object>> getWarehouseList(Map<String, Object> mapVal);
 
-    int insertWarehouse(RmsWarehouse rmsWarehouse);
+    int insertWarehouse(Map<String,Object> rmsWarehouse);
 
     int updateWarehouse(RmsWarehouse rmsWarehouse);
 

src/main/java/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.RmsWarehouseMapper;
 import com.steerinfo.dil.model.RmsShipper;
 import com.steerinfo.dil.model.RmsWarehouse;
 import com.steerinfo.dil.service.IRmsWarehouseService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,12 +44,24 @@ public class RmsWarehouseServiceImpl  implements IRmsWarehouseService {
     * 增加原料工厂
     * */
     @Override
-    public int insertWarehouse(RmsWarehouse rmsWarehouse) {
-            rmsWarehouse.setDeleted(new BigDecimal(0));
-            rmsWarehouse.setInsertUsername("admin");
-            rmsWarehouse.setInsertTime(new Date());
-            rmsWarehouse.setWarehouseId(rmsWarehouseMapper.selectWarehouseId());
-        return rmsWarehouseMapper.insertSelective(rmsWarehouse);
+    public int insertWarehouse(Map<String,Object> rmsWarehouse) {
+        RmsWarehouse rmsWarehouse1=new RmsWarehouse();
+        String warehouseName =(String) rmsWarehouse.get("warehouseName");
+        BigDecimal shipperId = DataChange.dataToBigDecimal(rmsWarehouse.get("shipperId"));
+        String userId=(String) rmsWarehouse.get("userId");
+        //根据仓库名称查找装货点是否存在于数据库中
+        BigDecimal searchNum = rmsWarehouseMapper.searchWarehouseName(warehouseName,shipperId);
+        if (searchNum==null) {
+            rmsWarehouse1.setDeleted(new BigDecimal(0));
+            if (userId!=null) {
+                rmsWarehouse1.setInsertUsername(userId);
+            }
+            rmsWarehouse1.setInsertTime(new Date());
+            rmsWarehouse1.setWarehouseId(rmsWarehouseMapper.selectWarehouseId());
+            return rmsWarehouseMapper.insertSelective(rmsWarehouse1);
+        }else {
+            return -1;
+        }
     }
     /*
     * 更改原料工厂

src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml

@@ -542,5 +542,11 @@
     </where>
 
   </select>
+<!-- 根据仓库名称和托运人查找仓库 -->
+    <select id="searchWarehouseName" resultType="java.math.BigDecimal" parameterType="java.util.Map">
+      select count(RW.WAREHOUSE_ID)
+      from RMS_WAREHOUSE RW
+      WHERE  RW.WAREHOUSE_NAME=#{warehouseName} and RW.SHIPPER_ID = #{shipperId} and RW.deleted=0
+    </select>
 
 </mapper>