Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -20,6 +20,14 @@ public class WorkerInfo {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long escortId;
 
+    @ApiModelProperty(value = "行程周期id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "当前作业订单ID")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orderId;
+
     @ApiModelProperty(value = "卡车id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long truckId;
@@ -64,9 +72,6 @@ public class WorkerInfo {
     @ApiModelProperty(value = "挂车牌号")
     private String trailerNumber;
 
-    @ApiModelProperty(value = "当前作业订单ID")
-    private Long orderId;
-
     @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已作废60")
     private int orderStatus;
 

src/main/java/com/aoyang/tms/service/WorkOrderService.java

@@ -34,7 +34,7 @@ public interface WorkOrderService extends IService<WorkOrder> {
      * @Date 2022/4/24
      * @Param
      **/
-    WorkOrder findCurrentWorkOrder(Long truckId);
+    WorkOrder findLastWorkOrder(Long truckId);
 
     /**
      * @return

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

@@ -49,6 +49,8 @@ public class CommonServiceImpl implements CommonService {
     private TruckEscortService truckEscortService;
     @Resource
     private WorkOrderService workOrderService;
+    @Resource
+    private WorkCycleService workCycleService;
 
     @Override
     public Org findOrg(Long orgId) {
@@ -77,27 +79,27 @@ public class CommonServiceImpl implements CommonService {
             workerInfo.setDeptId(truck.getDeptId());
             workerInfo.setDeptName(truck.getDeptName());
             workerInfo.setIsZhongche("空车");
-            WorkOrder workOrder = workOrderService.findCurrentWorkOrder(truckId);
+            //查询最后一笔已经执行或执行中的订单
+            WorkOrder workOrder = workOrderService.findLastWorkOrder(truckId);
             if (workOrder != null) {
-                //装车订单判断
-                if (workOrder.getType() == 1) {
-                    if (workOrder.getOrderStatus().equals(WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus()) || workOrder.getOrderStatus().equals(WorkOrderEnum.COMPLETED.orderStatus()) || workOrder.getOrderStatus().equals(WorkOrderEnum.CLOSED.orderStatus())) {
-                        workerInfo.setIsZhongche("重车");
-                    } else {
-                        workerInfo.setIsZhongche("空车");
+                workerInfo.setOrderId(workOrder.getId());
+                WorkCycle workCycle = workCycleService.getById(workOrder.getCycleId());
+                if (workCycle != null && workCycle.getEndTime() == null) {
+                    workerInfo.setCycleId(workCycle.getId());
+                    //装车订单判断
+                    if (workOrder.getType() == 1) {
+                        if (workOrder.getOrderStatus().equals(WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus()) || workOrder.getOrderStatus().equals(WorkOrderEnum.COMPLETED.orderStatus()) || workOrder.getOrderStatus().equals(WorkOrderEnum.CLOSED.orderStatus())) {
+                            workerInfo.setIsZhongche("重车");
+                        }
                     }
-                }
 
-                //卸车订单判断
-                if (workOrder.getType() == 2) {
-                    if (workOrder.getOrderStatus().equals(WorkOrderEnum.COMPLETED.orderStatus())) {
-                        if (Double.valueOf(workOrder.getJingWeight()) > 0) {
-                            workerInfo.setIsZhongche("重车");
-                        } else {
-                            workerInfo.setIsZhongche("空车");
+                    //卸车订单判断
+                    if (workOrder.getType() == 2) {
+                        if (workOrder.getOrderStatus().equals(WorkOrderEnum.COMPLETED.orderStatus())) {
+                            if (Double.valueOf(workOrder.getJingWeight()) > 0) {
+                                workerInfo.setIsZhongche("重车");
+                            }
                         }
-                    } else {
-                        workerInfo.setIsZhongche("空车");
                     }
                 }
             }

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

@@ -54,7 +54,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     private WorkOrderReadinfoService workOrderReadinfoService;
 
     @Override
-    public WorkOrder findCurrentWorkOrder(Long truckId) {
+    public WorkOrder findLastWorkOrder(Long truckId) {
         QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
         queryWrapper.eq("truck_id", truckId);
         queryWrapper.orderByDesc("execute_time");