Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -844,9 +844,6 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> amsScheduleDispatchNoPage(@RequestBody HashMap<String,Object> parmas){
         return amsFeign.amsScheduleDispatchNoPage(parmas);
     }
-    @ApiOperation("多拼派车")
-    @PostMapping("/saleDispatchDuoPin")
-    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return amsFeign.saleDispatchDuoPin(map);}
 
     @ApiOperation("查询司磅地点")
     @PostMapping("/getMaterialOperation")

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

@@ -70,6 +70,16 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 resMap.put("code","500");
                 return resMap;
             }
+            //查询车牌及排班司机id
+            Map<String,Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
+            if(capacityMap != null){
+                dataMap.putAll(capacityMap);
+            }
+            //查询登录账号人员id
+            Map<String,Object> personnelMap = backgroundProcessingMapper.getPersonnelMap(loginName);
+            if(personnelMap != null){
+                dataMap.putAll(personnelMap);
+            }
             System.out.println(dataMap);
         }
         return resMap;

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

@@ -114,6 +114,17 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialTypeList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
     }
 
+    @PostMapping("/getMaterialTypeListByCompany")
+    @ApiOperation(value = "查询物资种类列表")
+    public Map<String, Object> getMaterialTypeListByCompany(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con) {
+
+        return rmsFeign.getMaterialTypeListByCompany(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
+    }
+
     @ApiOperation("新增物资类型")
     @PostMapping("/insertMaterialType")
     @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "新增物资类型")
@@ -546,6 +557,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCompanyList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "展示公司信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCompanyListNoPage")
+    public Map<String, Object> getCompanyListNoPage(@RequestBody(required = false) Map<String, Object> mapValue
+    ) {
+        return rmsFeign.getCompanyListNoPage(mapValue == null ? new HashMap<>() : mapValue);
+    }
+
     @ApiOperation(value = "新增公司信息", notes = "根据rmsCompany对象创建")
     @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
     @PostMapping(value = "/insertCompany")
@@ -691,15 +716,15 @@ public class RMScontroller extends BaseRESTfulController {
         for (Map<String, Object> item : list) {
             //校验行
             if(
-                    item.get("车号")==null || item.get("车号").equals("")
+                    item.get("车牌号")==null || item.get("车牌号").equals("")
             ){
                 throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
-            item.put("车号",item.get("车号").toString().toUpperCase());
+            item.put("车牌号",item.get("车牌号").toString().toUpperCase());
             //隔开用于查询是否数据库存在
-            set.add(item.get("车号").toString());
+            set.add(item.get("车牌号").toString());
             //key-value结构方便数据库去重后获取值
-            map.put(item.get("车号").toString(),item);
+            map.put(item.get("车牌号").toString(),item);
         }
         //去重
         String[] setList = set.toArray(new String[0]);
@@ -762,6 +787,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCapacityDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "展示司机排班信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getCapacityDriverListWithCarNo")
+    public Map<String, Object> getCapacityDriverListWithCarNo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId) {
+        return rmsFeign.getCapacityDriverListWithCarNo(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
     @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
     @PostMapping(value = "/insertCapacityDriver")
@@ -770,6 +809,14 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertCapacityDriver(map);
     }
 
+    @ApiOperation(value = "修改", notes = "根据RmsDriverCapacity对象创建")
+    @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @PostMapping(value = "/updateCapacityDriver")
+    @LogAround(foreignKeys = {"capacityDriverId"},foreignKeyTypes = {"司机排班"})
+    public Map<String, Object> updateCapacityDriver(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateCapacityDriver(map);
+    }
+
     @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
     @PostMapping(value = "/deleteCapacityDriver")
@@ -1055,6 +1102,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertCapacityType(map);
     }
 
+    @ApiOperation(value = "新增运力类型")
+    @PostMapping(value = "/updateCapacityType")
+    @LogAround(foreignKeys = {"capacityTypeId"}, foreignKeyTypes = {"运力类型"})
+    public Map<String, Object> updateCapacityType(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateCapacityType(map);
+    }
+
     @ApiOperation(value = "删除运力类型")
     @PostMapping(value = "/deleteCapacityType")
     @LogAround(foreignKeys = {"capacityTypeId"}, foreignKeyTypes = {"运力类型"})
@@ -1074,6 +1128,18 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getTransRangeList(map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "查询运输范围")
+    @PostMapping("/getTransRangeListByCompany")
+    public Map<String, Object> getTransRangeListByCompany(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return rmsFeign.getTransRangeListByCompany(map, apiId, pageNum, pageSize);
+    }
+
     @ApiOperation(value = "新增运输范围")
     @PostMapping(value = "/insertTransRange")
     @LogAround(foreignKeys = {"transRangeId"}, foreignKeyTypes = "运输范围")
@@ -1364,6 +1430,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getBusinessType(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "业务类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getBusinessTypeByCompany")
+    public Map<String, Object> getBusinessTypeByCompany(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        return rmsFeign.getBusinessTypeByCompany(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
 
     @ApiOperation(value="新增业务类型")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
@@ -1586,4 +1666,14 @@ public class RMScontroller extends BaseRESTfulController {
     ) {
         return rmsFeign.getBusinessTypeControl(mapValue);
     }
+
+    @PostMapping(value = "/relevance")
+    public Map<String, Object> relevance(@RequestBody HashMap<String,Object> map){
+        return rmsFeign.relevance(map);
+    }
+
+    @PostMapping(value = "/cancelRelevance")
+    public Map<String, Object> cancelRelevance(@RequestBody HashMap<String,Object> map){
+        return rmsFeign.cancelRelevance(map);
+    }
 }

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

@@ -763,4 +763,8 @@ public class TMSController extends BaseRESTfulController {
     public RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map) {
         return tmsFeign.saleDispatchList(map);
     }
+
+    @ApiOperation("多拼派车")
+    @PostMapping("/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return tmsFeign.saleDispatchDuoPin(map);}
 }

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

@@ -289,4 +289,10 @@ public class UniversalController extends BaseRESTfulController {
         Map<String,Object> config = universalMapper.getConfigByName("APP最新版本");
         return success(config.get("valueString"));
     }
+
+    @ApiOperation("查询运单中最近的司机排班")
+    @PostMapping("/getCapacityDriver")
+    public RESTfulResult getCapacityDriver(@RequestBody Map<String,Object> map) {
+        return success(universalMapper.getCapacityDriver(map));
+    }
 }

src/main/java/com/steerinfo/dil/feign/ATWmsFeign.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.HashMap;
 
-@FeignClient(value = "antwms-service", url = "http://192.168.1.16:8802/")  //http://192.168.0.244:8002/
+@FeignClient(value = "antwms-service", url = "http://192.168.0.244:8002/")  //http://192.168.0.244:8002/
 public interface ATWmsFeign {
 
     /**

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -311,8 +311,6 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amsscheduledispatchs/noPage")
     Map<String, Object> amsScheduleDispatchNoPage(@RequestBody Map<String, Object> map);
-    @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchDuoPin")
-    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getMaterialOperation")
     RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map);

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -82,6 +82,12 @@ public interface RmsFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam String con);
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeListByCompany")
+    Map<String, Object> getMaterialTypeListByCompany(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     //新增物资种类
     @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
@@ -218,6 +224,9 @@ public interface RmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize);
 
+    @PostMapping(value = "api/v1/rms/rmscompany/getCompanyListNoPage")
+    Map<String, Object> getCompanyListNoPage(@RequestBody(required = false) Map<String, Object> mapValue);
+
     //新增公司
     @PostMapping(value = "api/v1/rms/rmscompany/insertCompany")
     Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map);
@@ -313,10 +322,20 @@ public interface RmsFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize);
 
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/getCapacityDriverListWithCarNo")
+    Map<String, Object> getCapacityDriverListWithCarNo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
     //新增司机排班信息
     @PostMapping(value = "api/v1/rms/rmscapacitydrivers/insertCapacityDriver")
     Map<String, Object> insertCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
 
+    //新增司机排班信息
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/updateCapacityDriver")
+    Map<String, Object> updateCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
+
     //删除司机排班信息
     @PostMapping(value = "api/v1/rms/rmscapacitydrivers/deleteCapacityDriver")
     Map<String, Object> deleteCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
@@ -572,6 +591,8 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
     Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/updateCapacityType")
+    Map<String, Object> updateCapacityType(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteCapacityType")
     Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map);
@@ -582,6 +603,12 @@ public interface RmsFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
+    //运输范围
+    @PostMapping(value = "/api/v1/rms/rmstransrange/getTransRangeListByCompany")
+    Map<String, Object> getTransRangeListByCompany(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/rms/rmstransrange/insertTransRange")
@@ -698,6 +725,10 @@ public interface RmsFeign {
     Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize);
+    @PostMapping("/api/v1/rms/dilbusinesstypes/getBusinessTypeByCompany")
+    Map<String, Object> getBusinessTypeByCompany(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
     Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
@@ -807,6 +838,10 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/getBusinessTypeControl")
     Map<String, Object> getBusinessTypeControl(@RequestBody(required = false) Map<String, Object> mapValue);
+    @PostMapping(value = "api/v1/rms/rmscompanybmts/relevance")
+    Map<String, Object> relevance(@RequestBody(required = false) Map<String, Object> mapValue);
+    @PostMapping(value = "api/v1/rms/rmscompanybmts/cancelRelevance")
+    Map<String, Object> cancelRelevance(@RequestBody(required = false) Map<String, Object> mapValue);
 }
 
 

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -270,6 +270,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchList")
     RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
 }
 
 

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

@@ -24,4 +24,7 @@ public interface BackgroundProcessingMapper {
 
     Map<String,Object> getCompanyRootMap(String loginName);
 
+    Map<String,Object> getCapacityMap(String loginName);
+
+    Map<String, Object> getPersonnelMap(String loginName);
 }

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

@@ -96,4 +96,6 @@ public interface UniversalMapper {
     List<Map<String, Object>> getDriverByLike(Map<String, Object> map);
 
     Map<String,Object> getConfigByName(String configName);
+
+    Map<String,Object> getCapacityDriver(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/util/util.java

@@ -1,5 +1,8 @@
 package com.steerinfo.dil.util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author zhangnan
  * @Date 2021/5/26 8:59

src/main/resources/application-prod.yml

@@ -26,22 +26,22 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:80}
+    url: ${AMSFEIGN_URL:172.16.90.202:8000}
 #    url: ${RMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:80}
+    url: ${TMSFEIGN_URL:172.16.90.202:8000}
 #    url: ${RMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:80}
+    url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:80}
+    url: ${RMSFEIGN_URL:172.16.90.202:8000}
 #    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
-    url: ${EMSFEIGN_URL:172.16.90.202:80}
+    url: ${EMSFEIGN_URL:172.16.90.202:8000}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 #    url: ${RMSFEIGN_URL:localhost:8055}

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

@@ -69,5 +69,30 @@
         ) CONNECT BY PRIOR rc.PARENT_COMPANY_ID = RC.COMPANY_ID
         ORDER BY LEVEL DESC FETCH NEXT 1 ROW ONLY
     </select>
-
+    <select id="getCapacityMap" resultType="java.util.Map">
+        SELECT DISTINCT
+            RCA.CAPACITY_ID "capacityId",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            RP.PERSONNEL_ID "driverId",
+            RP.PERSONNEL_NAME "driverName"
+        FROM
+            RMS_CAPACITY RCA
+                LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
+                LEFT JOIN RMS_PERSONNEL RP ON RP.PERSONNEL_ID = RCD.PERSONNEL_ID
+                AND RP.DELETED = 0
+        WHERE
+            RCA.DELETED = 0
+          AND (RP.PERSONNEL_JOB_NUMBER = #{loginName} OR RCA .CAPACITY_NUMBER = #{loginName})
+            FETCH NEXT 1 ROWS ONLY
+    </select>
+    <select id="getPersonnelMap" resultType="java.util.Map">
+        SELECT DISTINCT
+            RP.PERSONNEL_ID "personnelId",
+            RP.PERSONNEL_NAME "personnelName",
+            RP.PERSONNEL_POST "personnelPost"
+        FROM RMS_PERSONNEL  RP
+        WHERE RP.DELETED = 0
+          AND RP.PERSONNEL_JOB_NUMBER = #{loginName}
+        FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>

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

@@ -94,6 +94,7 @@
             RC.COMPANY_ID "businessCompanyId",
             RC.COMPANY_ID   "key",
             RC.COMPANY_ID "value",
+            RC.PARENT_COMPANY_ID "parentCompanyId",
             <if test="companyType==null">
                 RC.COMPANY_TYPE || '-' ||
             </if>
@@ -178,6 +179,7 @@
             RC.COMPANY_ID "businessCompanyId",
             RC.COMPANY_ID   "key",
             RC.COMPANY_ID "value",
+            RC.PARENT_COMPANY_ID "parentCompanyId",
             <if test="companyType==null">
                 RC.COMPANY_TYPE || '-' ||
             </if>
@@ -552,6 +554,7 @@
             <if test="!((driverId!=null and driverId!='') or (driverId2!=null and driverId2!=''))">
                 order by RCA.CAPACITY_ID desc
             </if>
+            FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
             UNION
@@ -559,6 +562,11 @@
             RCA .CAPACITY_ID "capacityId",
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
+            RCA .CAPACITY_LICENCE_NUMBER "capacityLicenceNumber",
+            RCA. CAPACITY_OPERATE_NUMBER "capacityOperateNumber",
+            RCA. CAPACITY_AXIS_NUMBER "capacityAxisNumber",
+            RCA.CAPACITY_WEIGHT_MAIN "capacityWeightMain",
+            RCA.CAPACITY_WEIGHT_TRAILER "capacityWeightTrailer",
             CASE WHEN RC.COMPANY_TYPE = '业务单位'
             THEN RC.COMPANY_ID
             else -1
@@ -587,7 +595,10 @@
             then RCA.CAPACITY_NUMBER
             else RCA.REMARK1
             end "remark1",
-            RCA.CAPACITY_NUMBER "capacityNumber",
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end "capacityNumber",
             (case
             when oto.capacity_id is null then '空闲'
             when oto.deleted != '2' and oto.capacity_id is not null then '已派'
@@ -632,7 +643,6 @@
     <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
         ORDER BY "countNumber" DESC
     </if>
-    FETCH NEXT 10 ROWS ONLY
     </select>
 
     <select id="getCapacityByLikeSc" resultType="java.util.Map">
@@ -870,6 +880,9 @@
             <if test="capacityTypeId!=null and capacityTypeId!=''">
                 AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
+            <if test="isPCapacityTypeId!=null and isPCapacityTypeId!=''">
+                AND RCT.P_CAPACITY_TYPE_ID is null
+            </if>
             <if test="capacityTypeNameList != null and capacityTypeNameList.size > 0">
                 and
                 RCT.CAPACITY_TYPE_NAME in
@@ -1571,13 +1584,13 @@
                 AND "personnelPost" = #{personnelPost}
             </if>
             <if test="personnelId!=null and personnelId!=''">
-                AND "personnelId" = #{personnelId})
+                AND "personnelId" = #{personnelId}
             </if>
             <if test="driverId!=null and driverId!=''">
-                AND "personnelId" = #{driverId})
+                AND "personnelId" = #{driverId}
             </if>
             <if test="driverId2!=null and driverId2!=''">
-                AND "personnelId" = #{driverId2})
+                AND "personnelId" = #{driverId2}
             </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
@@ -1668,4 +1681,20 @@
     AND CONFIG_NAME= #{configName}
             FETCH NEXT 1 ROWS ONLY
     </select>
+    <select id="getCapacityDriver" resultType="java.util.Map">
+        SELECT
+            DRIVER_ID "driverId",
+            CAPACITY_ID "capacityId"
+        FROM
+            OMS_TRANS_ORDER
+        WHERE ISSUE_TIME IS NOT NULL
+        <if test="driverId!=null and driverId!=''">
+            AND DRIVER_ID = #{driverId}
+        </if>
+        <if test="capacityId!=null and capacityId!=''">
+            AND CAPACITY_ID = #{capacityId}
+        </if>
+        ORDER BY ISSUE_TIME DESC
+            FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>