Commit 7d67044936904dd4b29b3d2fdcb1dc2214539180
1 parent
92e71557
智能调度实发二次调整刷新页面
Showing
1 changed file
with
9 additions
and
4 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1706,8 +1706,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1706,8 +1706,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1706 | try { | 1706 | try { |
| 1707 | ScheduleRealInfo sch = dayOfSchedule.get(id); | 1707 | ScheduleRealInfo sch = dayOfSchedule.get(id); |
| 1708 | if (sch.getFcsjActual() == null) { | 1708 | if (sch.getFcsjActual() == null) { |
| 1709 | - rs.put("status", ResponseCode.ERROR); | ||
| 1710 | - rs.put("msg", "无实发时间，无法撤销！"); | 1709 | + /*rs.put("status", ResponseCode.ERROR); |
| 1710 | + rs.put("msg", "无实发时间，无法撤销！");*/ | ||
| 1711 | + rs.put("status", ResponseCode.SUCCESS); | ||
| 1712 | + ts.add(sch); | ||
| 1713 | + rs.put("ts", ts); | ||
| 1711 | } else { | 1714 | } else { |
| 1712 | //日志记录 | 1715 | //日志记录 |
| 1713 | ScheduleModifyLogger.cxsf(sch); | 1716 | ScheduleModifyLogger.cxsf(sch); |
| @@ -1736,8 +1739,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1736,8 +1739,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1736 | try { | 1739 | try { |
| 1737 | ScheduleRealInfo sch = dayOfSchedule.get(id); | 1740 | ScheduleRealInfo sch = dayOfSchedule.get(id); |
| 1738 | if (sch.getFcsjActual() == null) { | 1741 | if (sch.getFcsjActual() == null) { |
| 1739 | - rs.put("status", ResponseCode.ERROR); | ||
| 1740 | - rs.put("msg", "无实发时间，无法撤销！"); | 1742 | + //刷新班次不修改 |
| 1743 | + rs.put("status", ResponseCode.SUCCESS); | ||
| 1744 | + ts.add(sch); | ||
| 1745 | + rs.put("ts", ts); | ||
| 1741 | } else { | 1746 | } else { |
| 1742 | //日志记录 | 1747 | //日志记录 |
| 1743 | ScheduleModifyLogger.cxsf(sch); | 1748 | ScheduleModifyLogger.cxsf(sch); |