cqpCow 2 년 전
부모
커밋
553a07979d
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      app/Service/Box/BoxService.php

+ 5 - 1
app/Service/Box/BoxService.php

@@ -703,12 +703,16 @@ class BoxService extends Service
 
         $result = DB::table('box_detail')->where('del_time',0)
             ->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();
         if(! empty($result)){
             foreach ($result as $key => $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];