diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index 62ced0ce..c956d6b7 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -1208,6 +1208,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl bikeCodes = eqWorkOrderDispatchDto.getBikeCodes(); + QueryWrapper queryWrapper = QueryWrapper.create() + .select(EBIKE_DISPATCH_RECORDS.BIKE_CODE) + .leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.ORDER_ID.eq(EBIKE_DISPATCH_RECORDS.ORDER_ID)) + .where(EBIKE_BIKE_ORDER.HANDLE_STATE.ne(0)) + .where(EBIKE_DISPATCH_RECORDS.BIKE_CODE.in(bikeCodes)); + List list = ebikeDispatchRecordsMapper.selectListByQueryAs(queryWrapper, String.class); + if (!list.isEmpty()) { + bikeCodes.removeAll(list); + if (bikeCodes.isEmpty()) { + throw new RuntimeException("当前所有车辆已创建调度订单"); + } + eqWorkOrderDispatchDto.setBikeCodes(bikeCodes); + } + } + /** * 根据订单ID 获取车辆调度信息 * @@ -1356,7 +1374,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl