|
|
|
@ -3631,6 +3631,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
} else { |
|
|
|
|
StringBuilder driverNames = new StringBuilder(); |
|
|
|
|
StringBuilder vehicleNubs = new StringBuilder(); |
|
|
|
|
if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())){ |
|
|
|
|
//检测无主司机 进行随机赋予主司机
|
|
|
|
|
deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName()); |
|
|
|
|
deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub()); |
|
|
|
|
} |
|
|
|
|
//自主配送
|
|
|
|
|
allocationInfo.forEach(a -> { |
|
|
|
|
DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class); |
|
|
|
@ -4047,6 +4052,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
StringBuilder driverNames = new StringBuilder(); |
|
|
|
|
StringBuilder vehicleNubs = new StringBuilder(); |
|
|
|
|
//自主配送
|
|
|
|
|
if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())){ |
|
|
|
|
//检测无主司机 进行随机赋予主司机
|
|
|
|
|
deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName()); |
|
|
|
|
deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub()); |
|
|
|
|
} |
|
|
|
|
allocationInfo.forEach(a -> { |
|
|
|
|
DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class); |
|
|
|
|
if (a.getDriverName().equals(deliveryListDTO.getMasterDriverName()) && a.getVehicleNub().equals(deliveryListDTO.getMasterVehicleNub())) { |
|
|
|
|