|
@@ -703,12 +703,16 @@ class BoxService extends Service
|
|
|
|
|
|
$result = DB::table('box_detail')->where('del_time',0)
|
|
$result = DB::table('box_detail')->where('del_time',0)
|
|
->whereIn('order_no',$data['order_no'])
|
|
->whereIn('order_no',$data['order_no'])
|
|
- ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5')
|
|
|
|
|
|
+ ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5','shipment_order_no','crt_time','team_id')
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
if(! empty($result)){
|
|
if(! empty($result)){
|
|
foreach ($result as $key => $value){
|
|
foreach ($result as $key => $value){
|
|
$result[$key] = (array)$value;
|
|
$result[$key] = (array)$value;
|
|
}
|
|
}
|
|
|
|
+ $map = Team::where('id',array_unique(array_column($result,'team_id')))->pluck('title','id')->toArray();
|
|
|
|
+ foreach ($result as $key => $value){
|
|
|
|
+ $result[$key]['team_name'] = $map[$value['team_id']] ?? '';
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
return [true,$result];
|
|
return [true,$result];
|