Sfoglia il codice sorgente

修改车辆轨迹查询

chenxiaofei 2 mesi fa
parent
commit
d7e0caf318

+ 4 - 0
sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/RTruckRouteVo.java

@@ -67,4 +67,8 @@ public class RTruckRouteVo {
      * 点位信息
      */
     private String pointInfo;
+    /**
+     * 车牌号
+     */
+    private String truckNo;
 }

+ 1 - 0
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -228,6 +228,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
         kwfTruckRoute.setEntId(params.getEntId());
         kwfTruckRoute.setStartPoint(params.getStartPoint());
         kwfTruckRoute.setUnloadingPoint(params.getUnloadingPoint());
+        kwfTruckRoute.setTruckNo(params.getTruckNo());
         kwfTruckRoute.setShortestTime(params.getShortestTime());
         kwfTruckRoute.setPointInfo(params.getPointInfo());
 

+ 2 - 0
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckRoute.java

@@ -77,5 +77,7 @@ public class KwfTruckRoute {
      */
     @TableField("point_info")
     private String pointInfo;
+    @TableField("truck_no")
+    private String truckNo;
 
 }

+ 1 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckRouteService.java

@@ -131,7 +131,7 @@ public class KwfTruckRouteService {
     private static QueryTruckRoteVo getQueryTruckRoteVo(KwfTruckRoute r, Map<Long, KwfFleet> fleetIdAndFleetMap, Map<Long, KwfDriver> driverIdAndDriverMap) {
         QueryTruckRoteVo queryTruckRoteVo = new QueryTruckRoteVo();
         queryTruckRoteVo.setId(String.valueOf(r.getId()));
-        queryTruckRoteVo.setTruckNo("");
+        queryTruckRoteVo.setTruckNo(r.getTruckNo());
         queryTruckRoteVo.setStartPoint(r.getStartPoint());
         queryTruckRoteVo.setUnloadingPoint(r.getUnloadingPoint());
         queryTruckRoteVo.setFleetId(String.valueOf(r.getFleetId()));

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -2146,6 +2146,7 @@ public class KwtWaybillOrderV1Service {
                         .collect(Collectors.toMap(KwtWaybillOrderTrack::getWAddressId, Function.identity(), (k1, k2) -> k1));
                 RTruckRouteVo rTruckRouteVo = new RTruckRouteVo();
                 rTruckRouteVo.setTruckId(waybillOrder.getTruckId());
+                rTruckRouteVo.setTruckNo(waybillOrder.getTruckNo());
                 rTruckRouteVo.setDriverId(waybillOrder.getDriverId());
                 rTruckRouteVo.setEntId(waybillOrder.getEntId());
                 KwtWaybillOrderAddress startPoint = keyAndAddressMap.getOrDefault(wOrderId + CommonConstants.UNDERSCORE + AddressTypeEnum.SHIPMENT.getCode(), new KwtWaybillOrderAddress());

+ 1 - 0
sql/2025/10/30/2025_10_30_cxf_create.sql

@@ -11,6 +11,7 @@ create table kwf_truck_route
     unloading_Point   varchar(400)  not null default '' comment '卸货地点',
     shortest_time varchar(10)        not null default  '' comment '最短时间',
     point_info   text            null                 comment '详细点位信息',
+    truck_no     varchar(20)     not null default ''  comment '车辆编号',
     create_time datetime      not null default current_timestamp comment '创建时间',
     update_time datetime      not null default current_timestamp on update current_timestamp comment '更新时间',
     del_flag    tinyint       not null default 0 comment '是否删除(0未删除,1删除)'