运单预警

performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnRang.java

@@ -8,7 +8,7 @@ import com.msl.common.model.HasKey;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
+
 import java.time.LocalDateTime;
 
 /**
@@ -29,7 +29,7 @@ public class VehicleWarnRang  implements HasKey<Integer> {
     private Integer warnConfigId;                   //预警配置id
     private String warnName;                        //预警名称
     private Integer warnRang;                       //预警屏蔽范围：1运单 2货单 3全部
-    private String orderNo;                         //货单编号
+    private String orderGoodsNo;                    //货单编号
     private String childNo;                         //运单编号
     private LocalDateTime warnEndTime;              //预警屏蔽结束时间
     private Integer status;                         //状态：1有效 2无效

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

@@ -99,7 +99,7 @@ public class VehicleWarnCommonServiceImpl implements VehicleWarnCommonService {
                     return item.getWarnEndTime().isAfter(LocalDateTime.now());
                 }
                 if (Objects.equals(item.getWarnRang(), VehicleWarnRangEnum.WarnRange.ORDER_GOODS.getCode())){
-                    if (Objects.equals(vehicleWarnChild.getOrderGoodsNo(), item.getOrderNo())) {
+                    if (Objects.equals(vehicleWarnChild.getOrderGoodsNo(), item.getOrderGoodsNo())) {
                         return item.getWarnEndTime().isAfter(LocalDateTime.now());
                     }
                 }