|
@@ -2836,8 +2836,8 @@ public class KwtLogisticsConsignmentService {
|
|
|
if (Objects.isNull(logisticsOrder)){
|
|
if (Objects.isNull(logisticsOrder)){
|
|
|
throw new BusinessException("未找到该物流订单信息");
|
|
throw new BusinessException("未找到该物流订单信息");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- if (!Objects.equals(logisticsOrder.getStatus(),LogisticsOrderV1Enum.WAIT_DELIVERY.getCode())){
|
|
|
|
|
|
|
+ List<Integer> status = Arrays.asList(LogisticsOrderV1Enum.WAIT_DELIVERY.getCode(), LogisticsOrderV1Enum.IN_TRANSIT.getCode());
|
|
|
|
|
+ if (!status.contains(logisticsOrder.getStatus())){
|
|
|
throw new BusinessException("该物流订单状态不能进行派车");
|
|
throw new BusinessException("该物流订单状态不能进行派车");
|
|
|
}
|
|
}
|
|
|
//车牌id去重
|
|
//车牌id去重
|