Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -111,7 +111,9 @@ public class WorkerServiceImpl implements WorkerService {
                 return false;
             }
             workOrder.setCycleId(workCycleOld.getId());
-            //3.订单进入前往卸车点状态，
+            //3.订单进入前往卸车点状态， 更新开始时里程
+            workOrder.setStartTrip(workOrderParam.getStartTrip());
+            workOrder.setStartTripUrl(workOrderParam.getStartTripUrl());
             workOrder.setOrderStatus(WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus());
             workOrder.setExecuteTime(LocalDateTime.now());
             workOrderService.updateById(workOrder);
@@ -323,6 +325,8 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setPiWeight(workOrderParam.getPiWeight());
                 workOrder.setMaoWeight(workOrderParam.getMaoWeight());
                 workOrder.setJingWeight(workOrderParam.getJingWeight());
+                workOrder.setEndTrip(workOrderParam.getEndTrip());
+                workOrder.setEndTripUrl(workOrderParam.getEndTripUrl());
                 workOrderService.updateById(workOrder);
 
                 //3.结束当前行程周期（从收车中到出车检查也结束当前行程周期）