Merge remote-tracking branch 'origin/master'

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

@@ -13,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WorkCycleService extends IService<WorkCycle> {
 
+    /**
+     * @Author guoyong
+     * @Description 根据卡车获取某个状态下的行车周期
+     * @Date  2022/4/25
+     * @Param
+     * @return
+    **/
+    WorkCycle findCurrentWorkCycle(Long truckId);
 }

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

@@ -26,12 +26,21 @@ public interface WorkOrderService extends IService<WorkOrder> {
 
 
     /**
+     * @return
      * @Author guoyong
-     * @Description 查询待执行装卸车运单
-     * @Date  2022/4/25
+     * @Description 根据一个行车周期查下的订单列表
+     * @Date 2022/4/25
      * @Param
+     **/
+    List<WorkOrder> findCycleOrderList(Long cycleId, Integer orderType,Integer status);
+
+    /**
      * @return
-    **/
+     * @Author guoyong
+     * @Description 查询待执行装卸车运单
+     * @Date 2022/4/25
+     * @Param
+     **/
     List<WorkOrder> findTodoOrderList(Long truckId, int orderType);
 
     /**
@@ -41,7 +50,7 @@ public interface WorkOrderService extends IService<WorkOrder> {
      * @Date 2022/4/24
      * @Param
      **/
-    WorkOrder findFirstTodoOrder(Long truckId,int orderType);
+    WorkOrder findFirstTodoOrder(Long truckId, int orderType);
 
     /**
      * @return
@@ -50,7 +59,7 @@ public interface WorkOrderService extends IService<WorkOrder> {
      * @Date 2022/4/24
      * @Param
      **/
-    WorkOrder findWorkingOrder(Long truckId,int orderType);
+    WorkOrder findWorkingOrder(Long truckId, int orderType);
 
     /**
      * @return

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

@@ -1,11 +1,17 @@
 package com.aoyang.tms.service.impl;
 
+import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.entity.WorkCycle;
+import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.mapper.WorkCycleMapper;
+import com.aoyang.tms.mapper.WorkOrderMapper;
 import com.aoyang.tms.service.WorkCycleService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 行程周期表，行程开始到行程结束，包含一装多卸周期 服务实现类
@@ -17,4 +23,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class WorkCycleServiceImpl extends ServiceImpl<WorkCycleMapper, WorkCycle> implements WorkCycleService {
 
+    @Resource
+    private WorkCycleMapper workCycleMapper;
+
+    @Override
+    public WorkCycle findCurrentWorkCycle(Long truckId) {
+        QueryWrapper<WorkCycle> queryWrapper = new QueryWrapper<WorkCycle>();
+        queryWrapper.eq("truck_id", truckId);
+        //执行中
+        queryWrapper.eq("status", 1);
+        queryWrapper.last("limit 1");
+        //计划到达时间 由先及后 排序
+        queryWrapper.orderByAsc("plan_reach_time");
+        return workCycleMapper.selectOne(queryWrapper);
+    }
 }

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

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -55,6 +56,19 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     private WorkOrderReadinfoService workOrderReadinfoService;
 
     @Override
+    public List<WorkOrder> findCycleOrderList(Long cycleId, Integer orderType, Integer status) {
+        QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
+        queryWrapper.eq("cycle_id", cycleId);
+        if (orderType != null) {
+            queryWrapper.eq("type", orderType);
+        }
+        if (status != null) {
+            queryWrapper.eq("order_status", status);
+        }
+        return workOrderMapper.selectList(queryWrapper);
+    }
+
+    @Override
     public List<WorkOrder> findTodoOrderList(Long truckId, int orderType) {
         QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
         queryWrapper.eq("truck_id", truckId);