Bladeren bron

运单详情

guoyong 4 jaren geleden
bovenliggende
commit
809e6fba31

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

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

+ 5 - 1
src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -55,6 +55,7 @@ public class WorkerServiceImpl implements WorkerService {
                 if (workOrder.getType() == 1) {
                     //3.订单进入前往装车点状态,
                     workOrder.setOrderStatus(WorkOrderEnum.GOTO_ZHUANGCHE_SPOT.orderStatus());
+                    workOrder.setExecuteTime(LocalDateTime.now());
                 }
                 workOrder.setCycleId(workCycle.getId());
                 workOrderService.updateById(workOrder);
@@ -88,7 +89,10 @@ public class WorkerServiceImpl implements WorkerService {
                 truckCheckInfo.setCreaterName(userName);
                 truckCheckInfo.setCreateDate(LocalDateTime.now());
                 truckCheckInfoService.save(truckCheckInfo);
-                //3 记录日志
+                //3.更新订单,更新前往装车点时间
+                workOrder.setGotoSpotTime(LocalDateTime.now());
+                workOrderService.updateById(workOrder);
+                //4 记录日志
                 //TODO
             }
         } catch (Exception e) {