|
@@ -92,6 +92,8 @@ public class WorkerController {
|
|
|
vo.setTime(DateUtils.betweenTime(locationVO.getDate(), LocalDateTime.now()));
|
|
vo.setTime(DateUtils.betweenTime(locationVO.getDate(), LocalDateTime.now()));
|
|
|
vo.setLatitude(locationVO.getLatitude());
|
|
vo.setLatitude(locationVO.getLatitude());
|
|
|
vo.setLongitude(locationVO.getLongitude());
|
|
vo.setLongitude(locationVO.getLongitude());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ vo.setTime(DateUtils.betweenTime(workOrder.getExecuteTime(), LocalDateTime.now()));
|
|
|
}
|
|
}
|
|
|
List<String> routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getGotoSpotTime(), LocalDateTime.now());
|
|
List<String> routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getGotoSpotTime(), LocalDateTime.now());
|
|
|
vo.setRouteGps(routeGps);
|
|
vo.setRouteGps(routeGps);
|
|
@@ -317,6 +319,8 @@ public class WorkerController {
|
|
|
if (truckCheckInfo == null || truckCheckInfo.getOrderId() == null || truckCheckInfo.getType() == null) {
|
|
if (truckCheckInfo == null || truckCheckInfo.getOrderId() == null || truckCheckInfo.getType() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
|
|
+ //1.车辆进入作业中状态,2.订单进入前往装车点状态,3.并记行车日志
|
|
|
|
|
+
|
|
|
//出车检查
|
|
//出车检查
|
|
|
if (truckCheckInfo.getType() == 1) {
|
|
if (truckCheckInfo.getType() == 1) {
|
|
|
if (StringUtils.isBlank(truckCheckInfo.getCheckUrl())) {
|
|
if (StringUtils.isBlank(truckCheckInfo.getCheckUrl())) {
|
|
@@ -334,7 +338,7 @@ public class WorkerController {
|
|
|
utf8Name = URLDecoder.decode(userName, "UTF-8");
|
|
utf8Name = URLDecoder.decode(userName, "UTF-8");
|
|
|
} catch (UnsupportedEncodingException ignored) {
|
|
} catch (UnsupportedEncodingException ignored) {
|
|
|
}
|
|
}
|
|
|
- //1.车辆进入作业中状态,2.订单进入前往装车点状态,3.并记行车日志
|
|
|
|
|
|
|
+
|
|
|
Boolean flag = workerService.starWork(userId, utf8Name, truckCheckInfo);
|
|
Boolean flag = workerService.starWork(userId, utf8Name, truckCheckInfo);
|
|
|
return new Result<>(flag);
|
|
return new Result<>(flag);
|
|
|
}
|
|
}
|