Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

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

@@ -75,7 +75,7 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
     }
 
     /**
-     * 到达货源地超时
+     * 到达货源地延误
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -84,11 +84,12 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
 
         // 计算需要的时间
         Integer needTime = commonInfo.getSendAddressTime();
+        LocalDateTime lastArriveSendTime = commonInfo.getLastArriveSendTime();
 
         log.info("到达货源地超时, childNo:{}, takeTime:{}, arriveSendExpectTime:{}, needTime:{}", orderChild.getChildNo(), vehicleWarnChild.getTakeTime(), vehicleWarnChild.getArriveSendExpectTime(), needTime);
         // 超时判断
         LocalDateTime now = LocalDateTime.now();
-        if (vehicleWarnChild.getTakeTime().plusMinutes(vehicleWarnChild.getArriveSendExpectTime()).isAfter(now.plusMinutes(needTime))) {return;}
+        if (lastArriveSendTime.isAfter(now.plusMinutes(needTime))) {return;}
 
         List<VehicleWarnConfig> vehicleWarnConfigList = vehicleWarnConfigDao.listByWarnType(VehicleWarnConfigEnum.WarnType.ARRIVE_SEND_DELAY.getCode());
         if (vehicleWarnConfigList.isEmpty()) {return;}