start_trip, start_trip_url, end_trip, end_trip_url,

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -291,7 +291,7 @@ public class WorkerController {
     @PostMapping("/start_order")
     public Result startOrder(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getId() == null) {
+        if (workOrder == null || workOrder.getId() == null || StringUtils.isBlank(workOrder.getStartTrip()) || StringUtils.isBlank(workOrder.getStartTripUrl())) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;
@@ -339,7 +339,7 @@ public class WorkerController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "4.上报成果", notes = "点击上报成果")
+    @ApiOperation(value = "4.结束等待,开始上传磅单", notes = "点击结束等待,开始上传磅单按钮")
     @PostMapping("/submit_result")
     public Result submitResult(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
@@ -351,7 +351,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
+        //1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
         Boolean flag = workerService.submitResult(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -172,13 +172,21 @@ public class WorkOrder implements Serializable {
     @TableField("note")
     private String note;
 
-    @ApiModelProperty(value = "车辆里程数")
-    @TableField("trip")
-    private String trip;
+    @ApiModelProperty(value = "开始执行运单时车辆里程数")
+    @TableField("start_trip")
+    private String startTrip;
 
-    @ApiModelProperty(value = "车辆里程数照片url")
-    @TableField("trip_url")
-    private String tripUrl;
+    @ApiModelProperty(value = "开始执行运单时车辆里程数照片url")
+    @TableField("start_trip_url")
+    private String startTripUrl;
+
+    @ApiModelProperty(value = "装卸车等待时车辆里程数")
+    @TableField("end_trip")
+    private String endTrip;
+
+    @ApiModelProperty(value = "装卸车等待时车辆里程数数照片url")
+    @TableField("end_trip_url")
+    private String endTripUrl;
 
     @ApiModelProperty(value = "装车排队号")
     @TableField("queue_no")