|
@@ -751,6 +751,21 @@ class ApplyOrderService extends Service
|
|
|
->get()->toArray();
|
|
|
$model->whereIn('id', array_unique(array_column($detail,'report_working_id')));
|
|
|
}
|
|
|
+ if(! empty($data['sale_order_number'])){
|
|
|
+ $id = SaleOrdersProduct::where('del_time',0)
|
|
|
+ ->where('out_order_no', 'LIKE', '%'.$data['sale_order_number'].'%')
|
|
|
+ ->select('id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $dispatch_id = DispatchSub::where('del_time',0)
|
|
|
+ ->whereIn('sale_orders_product_id',array_column($id,'id'))
|
|
|
+ ->select('id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $detail = ReportWorkingDetail::where('del_time',0)
|
|
|
+ ->whereIn('data_id', $dispatch_id)
|
|
|
+ ->select('report_working_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $model->whereIn('id', array_unique(array_column($detail,'report_working_id')));
|
|
|
+ }
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
|
$list = $this->reportWorkingfillData($list);
|