Merge remote-tracking branch 'origin/master'

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

@@ -60,14 +60,16 @@ public class WorkerServiceImpl implements WorkerService {
             if (truck.getTmsStatus() == 1 || truck.getTmsStatus() == 2) {
                 // 行车状态已开始行车周期
                 // 查询当前是否有中止的装车运单
-                QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("cycle_id", workCycleOld.getId());
-                queryWrapper.eq("order_status", 60);
-                queryWrapper.eq("type", 1);
-                queryWrapper.orderByDesc("id");
-                List<WorkOrder> calcelList = workOrderService.list(queryWrapper);
-                if (calcelList != null && calcelList.size() > 0) {
-                    cancelFlag = true;
+                if (workCycleOld != null) {
+                    QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("cycle_id", workCycleOld.getId());
+                    queryWrapper.eq("order_status", 60);
+                    queryWrapper.eq("type", 1);
+                    queryWrapper.orderByDesc("id");
+                    List<WorkOrder> calcelList = workOrderService.list(queryWrapper);
+                    if (calcelList != null && calcelList.size() > 0) {
+                        cancelFlag = true;
+                    }
                 }
             }
             if (cancelFlag) {
@@ -154,7 +156,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.FINISH_PRE_CHECK, workOrder, truckCheckInfo.getCheckUrl());
             }
         } catch (Exception e) {
-            log.error("startOrder:{}", e.getStackTrace());
+            log.error("startOrder:{}", e);
             return false;
         }
 
@@ -187,7 +189,7 @@ public class WorkerServiceImpl implements WorkerService {
                 }
             }
         } catch (Exception e) {
-            log.error("startOrder:{}", e.getStackTrace());
+            log.error("startOrder:{}", e);
             return false;
         }
 
@@ -205,6 +207,11 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setEndTripUrl(workOrderParam.getEndTripUrl());
                 workOrder.setWorkStartTime(workOrderParam.getWorkStartTime());
                 workOrder.setWorkEndTime(workOrderParam.getWorkEndTime());
+
+                //更新cycle 结束里程数
+                WorkCycle workCycle = workCycleService.getById(workOrder.getCycleId());
+                workCycle.setEndTrip(workOrderParam.getEndTrip());
+                workCycleService.updateById(workCycle);
                 //1.车辆进入作业中状态
                 Truck truck = truckService.getById(workOrder.getTruckId());
                 truck.setTmsStatus(TmsTruckStatus.WORKING);
@@ -227,7 +234,7 @@ public class WorkerServiceImpl implements WorkerService {
                 }
             }
         } catch (Exception e) {
-            log.error("startOrder:{}", e.getStackTrace());
+            log.error("startOrder:{}", e);
             return false;
         }
 
@@ -350,7 +357,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.CLOSED, workOrder);
             }
         } catch (Exception e) {
-            log.error("startOrder:{}", e.getStackTrace());
+            log.error("startOrder:{}", e);
             return false;
         }