fsdf'af

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

@@ -23,7 +23,7 @@ public interface RmsWarehouseMapper extends IBaseMapper<RmsWarehouse, BigDecimal
     BigDecimal selectWarehouseId();
 
     //根据卸货点查找是否存在该卸货地点
-    BigDecimal searchWarehouseName(String warehouseName,BigDecimal shipperId);
+    Map<String,Object> searchWarehouseName(String warehouseName,BigDecimal shipperId);
 
 
     //仓库下拉框

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

@@ -50,17 +50,25 @@ public class RmsWarehouseServiceImpl  implements IRmsWarehouseService {
         BigDecimal shipperId = DataChange.dataToBigDecimal(rmsWarehouse.get("shipperId"));
         String userId=(String) rmsWarehouse.get("userId");
         //根据仓库名称查找装货点是否存在于数据库中
-        BigDecimal searchNum = rmsWarehouseMapper.searchWarehouseName(warehouseName,shipperId);
+        Map<String,Object> searchNum = rmsWarehouseMapper.searchWarehouseName(warehouseName,shipperId);
         if (searchNum==null) {
+            rmsWarehouse1.setId(rmsWarehouseMapper.selectWarehouseId());
+            rmsWarehouse1.setShipperId(shipperId);
+            rmsWarehouse1.setWarehouseName(warehouseName);
             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;
+            if(DataChange.dataToBigDecimal(searchNum.get("deleted")).intValue() !=0){
+                rmsWarehouse1.setId(DataChange.dataToBigDecimal(searchNum.get("warehouseId")));
+                rmsWarehouse1.setDeleted(new BigDecimal(0));
+                return rmsWarehouseMapper.updateByPrimaryKeySelective(rmsWarehouse1);
+            }else{
+                return -1;
+            }
         }
     }
     /*

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

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