feat:实时调度过滤查询bug

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

@@ -172,6 +172,7 @@ public class CommonServiceImpl implements CommonService {
             if (list != null && list.size() > 0) {
                 workerInfo.setXiecheNumber(list.size());
             }
+            workerInfo.setTime(DateUtils.betweenTime(workCycle.getStartTime(), LocalDateTime.now()));
         }
         //位置信息
         LocationVO locationVO = getLocation(truckId);
@@ -181,6 +182,7 @@ public class CommonServiceImpl implements CommonService {
             workerInfo.setLastTime(locationVO.getDate()+"");
         }
 
+
         return workerInfo;
     }
 

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

@@ -1,5 +1,6 @@
 package com.aoyang.tms.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.aoyang.tms.common.TmsTruckStatus;
 import com.aoyang.tms.common.WorkLogTypeEnum;
 import com.aoyang.tms.common.WorkOrderEnum;
@@ -49,7 +50,12 @@ public class WorkerServiceImpl implements WorkerService {
         Truck truck = truckService.getById(workOrder.getTruckId());
         WorkCycle workCycleOld = workCycleService.getOne(
                 new QueryWrapper<WorkCycle>().eq("truck_id", workOrder.getTruckId()).eq("status", 1));
+        Boolean zhongFlag = workCycleOld == null ? false : workCycleOld.getJingWeight() > 0;
         if (workOrder.getType() == 1) {
+            if (zhongFlag) {
+                log.error("当前为重车，不能执行装车运单 param:", JSON.toJSONString(workOrderParam));
+                return false;
+            }
             boolean cancelFlag = false;
             if (truck.getTmsStatus() == 1 || truck.getTmsStatus() == 2) {
                 // 行车状态已开始行车周期
@@ -67,7 +73,7 @@ public class WorkerServiceImpl implements WorkerService {
             if (cancelFlag) {
                 workOrder.setCycleId(workCycleOld.getId());
             } else {
-                if (truck.getTmsStatus() == 3) {
+                if (workCycleOld != null && truck.getTmsStatus() == 3) {
                     // 完成原行车周期
                     workCycleOld.setStatus(2);
                     workCycleOld.setEndTrip(workOrder.getStartTrip());
@@ -100,6 +106,10 @@ public class WorkerServiceImpl implements WorkerService {
             workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_ORDER_START, workOrder);
 
         } else if (workOrder.getType() == 2) {
+            if (!zhongFlag) {
+                log.error("当前为空车，不能执行卸车运单 param:", JSON.toJSONString(workOrderParam));
+                return false;
+            }
             workOrder.setCycleId(workCycleOld.getId());
             //3.订单进入前往卸车点状态，
             workOrder.setOrderStatus(WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus());