|
|
@@ -143,10 +143,10 @@ class WaybillService
|
|
|
return $waybills->get();
|
|
|
}
|
|
|
public function dailyBilling(array $param){
|
|
|
-// $isWeight=Waybill::query()->where('waybills.warehouse_weight_other',0)
|
|
|
-// ->where('waybills.created_at','like',$param['screenDate'].'%')
|
|
|
-// ->where('waybills.type','专线')->exists();
|
|
|
-// if ($isWeight)return null;
|
|
|
+ $isWeight=Waybill::query()->where('waybills.warehouse_weight_other',0)
|
|
|
+ ->where('waybills.created_at','like',$param['screenDate'].'%')
|
|
|
+ ->where('waybills.type','专线')->exists();
|
|
|
+ if ($isWeight)return null;
|
|
|
$waybills = Waybill::query()->with(['owner','logistic','originationCity','destinationCity.parent',
|
|
|
'uploadFile','amountUnit','warehouseWeightUnit','carrierWeightUnit','district',
|
|
|
'warehouseWeightUnitOther','carrierWeightUnitOther','carType','uploadFile','waybillAuditLogs.user'])
|