浏览代码

订单表添加前往装车点的时间

guoyong 4 年之前
父节点
当前提交
af5d8dd0da

+ 3 - 1
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -89,6 +89,8 @@ public class WorkerController {
             if (locationVO != null) {
                 vo.setTime(DateUtils.betweenTime(locationVO.getDate(), LocalDateTime.now()));
             }
+            List<String> routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getGotoSpotTime(), LocalDateTime.now());
+            vo.setRouteGps(routeGps);
         }
         BeanUtils.copyProperties(workerInfo1, vo);
 
@@ -106,7 +108,7 @@ public class WorkerController {
         return new Result(flag);
     }
 
-    @ApiOperation(value = "运单列表", notes = "卡车id必传,未完成的(待执行、前往、等待、成果报备中)运单")
+    @ApiOperation(value = "运单列表", notes = "装车运单,只展示当前行车周期未完成的;除非当前已收车,则按排序展示第1个未完成的装车运单;卸车运单,重车时,才展示 ")
     @PostMapping("/find_work_order_list")
     public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                        @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {

+ 4 - 2
src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -14,6 +14,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -39,12 +40,13 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     private String time;
 
     @ApiModelProperty(value = "装卸车点经度")
-    @TableField("longitude")
     private String longitude;
 
     @ApiModelProperty(value = "装卸车点纬度")
-    @TableField("latitude")
     private String latitude;
 
+    @ApiModelProperty(value = "线路GPS数据")
+    private List<String> routeGps;
+
 
 }

+ 5 - 1
src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -220,7 +220,11 @@ public class WorkOrder implements Serializable {
     @TableField("jing_weight")
     private String jingWeight;
 
-    @ApiModelProperty(value = "开始执行时间")
+    @ApiModelProperty(value = "开始前往装卸车点的时间")
+    @TableField("goto_spot_time")
+    private LocalDateTime gotoSpotTime;
+
+    @ApiModelProperty(value = "开始执行运单时间")
     @TableField("execute_time")
     private LocalDateTime executeTime;
 

文件差异内容过多而无法显示
+ 2 - 1
src/main/resources/mapper/WorkOrderMapper.xml