|
|
@@ -1346,6 +1346,15 @@ public class KwtWaybillOrderService {
|
|
|
if (waybillOrder.getStatus() != CarWaybillEnum.PENDING_VEHICLE.getCode()) {
|
|
|
return HttpResult.error("车辆运单当前状态已不能出车!");
|
|
|
}
|
|
|
+ //车辆任务中校验
|
|
|
+ Map<String, Object> queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
|
|
|
+ put("truckNo", waybillOrder.getTruckNo());
|
|
|
+ put("busStatus", 3);
|
|
|
+ }};
|
|
|
+ List<KwtWaybillOrder> waybillOrders = waybillOrderDao.findWaybillOrder(queryParams);
|
|
|
+ if (!CollectionUtils.isEmpty(waybillOrders)) {
|
|
|
+ return HttpResult.error("车辆正在任务中,不能出车!");
|
|
|
+ }
|
|
|
|
|
|
/**2更新车辆运单**/
|
|
|
waybillOrder.setStatus(CarWaybillEnum.EXIT_COMPLETED.getCode());
|