feat:增加运单中止行车日志

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

@@ -69,6 +69,7 @@ public class WorkerServiceImpl implements WorkerService {
                 if (truck.getTmsStatus() == 3) {
                     // 完成原行车周期
                     workCycleOld.setStatus(2);
+                    workCycleOld.setEndTrip(workOrder.getStartTrip());
                     workCycleService.updateById(workCycleOld);
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_ORDER_NEW_START, workOrder);
                 }
@@ -227,8 +228,6 @@ public class WorkerServiceImpl implements WorkerService {
             if (workOrder != null) {
                 //1.车辆进入收车中状态
                 Truck truck = truckService.getById(workOrder.getTruckId());
-                truck.setTmsStatus(TmsTruckStatus.RETURNING);
-                truckService.updateById(truck);
 
                 //2.订单完成状态
                 workOrder.setOrderStatus(WorkOrderEnum.COMPLETED.orderStatus());
@@ -250,6 +249,9 @@ public class WorkerServiceImpl implements WorkerService {
                     // 卸车后磅单 装车净重 与 累计 卸车净重 之差 在 ± 1000 kg 以内，则由 重车 变为 空车；
                     if (jingWeight < 1000) {
                         jingWeight = 0;
+                        // 卸车完成，行车状态进入收车中状态
+                        truck.setTmsStatus(TmsTruckStatus.RETURNING);
+                        truckService.updateById(truck);
                     }
                 }
                 workCycle.setJingWeight(jingWeight);
@@ -319,7 +321,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycle.setEndTime(LocalDateTime.now());
                 BeanUtils.copyProperties(truck, workCycle);
                 BeanUtils.copyProperties(workOrder, workCycle);
-                workCycle.setJingWeight(Integer.valueOf(workOrderParam.getJingWeight()));
+                workCycle.setEndTrip(workOrderParam.getEndTrip());
                 workCycleService.updateById(workCycle);
 
                 //4 记录日志