|
@@ -2120,10 +2120,10 @@ class ApplyOrderService extends Service
|
|
|
->get()->toArray();
|
|
|
$detail = ReportWorkingDetail::whereIn('data_id', array_column($dispatch,'id'))
|
|
|
->where('del_time',0)
|
|
|
- ->select('data_id')
|
|
|
+ ->select('report_working_id')
|
|
|
->get()->toArray();
|
|
|
$result = ReportWorking::where('del_time',0)
|
|
|
- ->whereIn('id', array_unique(array_column($detail,'data_id')))
|
|
|
+ ->whereIn('id', array_unique(array_column($detail,'report_working_id')))
|
|
|
->select('id', 'order_number as order_no')
|
|
|
->get()->toArray();
|
|
|
}elseif($data['for_type'] == 5){
|