修改实时预计时间显示问题

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1594,7 +1594,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                     }
                 }
 
-                if(StringUtils.isNotBlank(oneExpect.getExpectArriveTime())){
+                if(StringUtils.isNotBlank(oneExpect.getExpectArriveTime()) && child.getStatus() < OrderChildEnum.Status.ARRIVE_SEND.getCode()){
                     LocalDateTime expectArriveTime = DateUtils.parseDateTime(oneExpect.getExpectArriveTime()).get();
                     monitorOrderChild.setExpectArriveTimeRealTime(DateUtils.formatDateTime(expectArriveTime).get());
                     LocalDateTime expectArriveWarringTime = expectArriveTime.plusMinutes(arriveWarningTime);
@@ -1605,7 +1605,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                     }
 
                 }
-                if(StringUtils.isNotBlank(oneExpect.getExpectReceiveTime())){
+                if(StringUtils.isNotBlank(oneExpect.getExpectReceiveTime()) && child.getStatus() >= OrderChildEnum.Status.LOAD.getCode()
+                        && child.getStatus() < OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()){
                     LocalDateTime expectReceiveTime = DateUtils.parseDateTime(oneExpect.getExpectReceiveTime()).get();
                     monitorOrderChild.setExpectReceiveTimeRealTime(DateUtils.formatDateTime(expectReceiveTime).get());
                     LocalDateTime expectReceiveWarringTime = expectReceiveTime.plusMinutes(receiveWarningTime);