|
|
@@ -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) {
|