|
@@ -70,29 +70,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public List<WorkOrder> findTodoOrderList(Long truckId, Integer orderType) {
|
|
|
|
|
- QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
|
|
|
|
|
- queryWrapper.eq("truck_id", truckId);
|
|
|
|
|
- queryWrapper.eq("type", orderType);
|
|
|
|
|
- queryWrapper.eq("order_status", WorkOrderEnum.TODO.orderStatus());
|
|
|
|
|
- //计划到达时间 由先及后 排序
|
|
|
|
|
- queryWrapper.orderByAsc("plan_reach_time");
|
|
|
|
|
- return workOrderMapper.selectList(queryWrapper);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- @Override
|
|
|
|
|
- public WorkOrder findFirstTodoOrder(Long truckId, Integer orderType) {
|
|
|
|
|
- QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
|
|
|
|
|
- queryWrapper.eq("truck_id", truckId);
|
|
|
|
|
- queryWrapper.eq("type", orderType);
|
|
|
|
|
- queryWrapper.eq("order_status", WorkOrderEnum.TODO.orderStatus());
|
|
|
|
|
- //计划到达时间 由先及后 排序
|
|
|
|
|
- queryWrapper.orderByAsc("plan_reach_time");
|
|
|
|
|
- queryWrapper.last("limit 1");
|
|
|
|
|
- return workOrderMapper.selectOne(queryWrapper);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- @Override
|
|
|
|
|
public WorkOrder findWorkingOrder(Long truckId, Integer orderType) {
|
|
public WorkOrder findWorkingOrder(Long truckId, Integer orderType) {
|
|
|
QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
|
|
QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
|
|
|
queryWrapper.eq("truck_id", truckId);
|
|
queryWrapper.eq("truck_id", truckId);
|