Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-RMS-API

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

@@ -7,6 +7,7 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.service.impl.RmsCapacityServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -161,11 +162,10 @@ public class RmsCapacityController extends BaseRESTfulController {
                 mapValue.put("index", con);
             }
         }
-        List<Map<String, Object>> listTotal = rmsCapacityService.getCapacityList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCapacityService.getCapacityList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -179,7 +179,7 @@ public class RmsCapacityController extends BaseRESTfulController {
     @PostMapping("/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody() Map<String,Object> map){
         if(map.containsKey("capacityId")&&map.get("capacityId")!=null&&map.containsKey("carrierSSOId")&&map.get("carrierSSOId")!=null){
-            int i =rmsCapacityService.deleteCapacityCarrier(map.get("capacityId").toString(),map.get("carrierSSOId").toString());
+            int i =rmsCapacityService.deleteCapacityCarrier(DataChange.dataToBigDecimal(map.get("capacityCarrierId")),map.get("carrierSSOId").toString());
            return success(i);
         }
         return failed();

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

@@ -130,12 +130,13 @@ public class RmsWarehouseController extends BaseRESTfulController {
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 String con) {
-
-        List<Map<String,Object>>   listTotal = rmsWarehouseService.getWarehouseList(mapValue);
+        if(con != null && !"null".equals(con) && !"".equals(con)){
+            mapValue.put("con","%" + con + "%");
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsWarehouseService.getWarehouseList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -38,7 +38,7 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     String ssoIdBycapacityId(BigDecimal id);
 
  //逻辑删除
- int updateCapacityCarrier(@Param("capacityId") String capacityId,@Param("carrierSSOId")  String carrierSSOId);
+ int updateCapacityCarrier(@Param("capacityCarrierId") BigDecimal capacityCarrierId,@Param("carrierSSOId") String carrierSSOId);
 
  List<Map<String, Object>> getCapacityByCapacityId(Integer id);
 }

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/IRmsCapacityService.java

@@ -38,7 +38,7 @@ public interface IRmsCapacityService{
 
     Map<String,Object> getCarrierNameBySSOId(String carrierSSOId);
 
-    int deleteCapacityCarrier(String capacityId, String carrierId);
+    int deleteCapacityCarrier(BigDecimal capacityCarrierId,String carrierSSOId);
 
     List<Map<String, Object>> getCapacityByCapacityId(Integer id);
 }

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

@@ -58,7 +58,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
             map.put("capacityId",capacityId);
             map.put("carrierId",carrierIds);
             List<RmsCapacityCarrier> rmsCapacityCarriers = rmsCapacityCarrierMapper.selectByParameters(map);
-            if (rmsCapacityCarriers != null && rmsCapacityCarriers.size() != 0) {
+            if (rmsCapacityCarriers != null && rmsCapacityCarriers.size() != 0 && rmsCapacityCarriers.get(0).getDeleted().intValue() == 0) {
                 return -1;
             }
             else {
@@ -161,13 +161,13 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
 
     /**
      * 通过承运商车辆ID删除绑定关系
-     * @param capacityId
-     * @param carrierSSOId
+     * @param capacityCarrierId
+     * @param
      * @return
      */
     @Override
-    public int deleteCapacityCarrier(String capacityId, String carrierSSOId) {
-        return rmsCapacityMapper.updateCapacityCarrier(capacityId,carrierSSOId);
+    public int deleteCapacityCarrier(BigDecimal capacityCarrierId,String carrierSSOId) {
+        return rmsCapacityMapper.updateCapacityCarrier(capacityCarrierId,carrierSSOId);
     }
 
 

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/RmsCapacityMapper.xml

@@ -900,9 +900,6 @@
       WHERE  RCC.CAPACITY_CARRIER_ID=#{id}
     </select>
     <update id="updateCapacityCarrier">
-    update RMS_CAPACITY_CARRIER set DELETED=1 ,UPDATE_TIME=sysDate  where CAPACITY_ID=#{capacityId} and CARRIER_ID in(
-        select RC.CARRIER_ID from RMS_CARRIER RC
-        where RC.CARRIER_SSO_ID = #{carrierSSOId}
-    )
+    update RMS_CAPACITY_CARRIER RCC set DELETED=1 ,UPDATE_TIME=sysDate ,UPDATE_USERNAME = #{carrierSSOId} where RCC.CAPACITY_CARRIER_ID = #{capacityCarrierId}
   </update>
 </mapper>

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

@@ -454,7 +454,11 @@
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
     WHERE RW.DELETED!=1
+    <if test="con != null">
+      and RW.WAREHOUSE_NAME LIKE #{con}
+    </if>
     ORDER BY RW.INSERT_TIME DESC
+
     )
     <where>
       <if test="warehouseId!= null">
@@ -543,10 +547,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>