Commit 9a573551064d701536f4d75905dd98cdaf92dbb6
1 parent
aa134516
update...
Showing
1 changed file
with
7 additions
and
3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1280,9 +1280,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1280,9 +1280,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1280 | ts.add(next); | 1280 | ts.add(next); |
| 1281 | } | 1281 | } |
| 1282 | 1282 | ||
| 1283 | - if(!next.getXlBm().equals(sch.getXlBm())){ | ||
| 1284 | - directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统"); | ||
| 1285 | - } | 1283 | + //车辆下一个要执行的班次 |
| 1284 | + try{ | ||
| 1285 | + ScheduleRealInfo carNext = dayOfSchedule.next(sch); | ||
| 1286 | + if(carNext != null && !carNext.getXlBm().equals(sch.getXlBm())){ | ||
| 1287 | + directiveService.lineChange(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统"); | ||
| 1288 | + } | ||
| 1289 | + }catch (Exception e){logger.error("", e);} | ||
| 1286 | 1290 | ||
| 1287 | //重新计算车辆执行班次 | 1291 | //重新计算车辆执行班次 |
| 1288 | dayOfSchedule.reCalcExecPlan(sch.getClZbh()); | 1292 | dayOfSchedule.reCalcExecPlan(sch.getClZbh()); |