|
|
@@ -613,7 +613,7 @@ class ScheduleService extends Service
|
|
|
$construction = Construction::where('del_time',0)
|
|
|
->where('state','>=',Construction::STATE_TWO)
|
|
|
->whereIn('id',$order_id)
|
|
|
- ->select('id','order_number','crt_id','start_time','end_time','state','product_introduction','vin_no','sales_order_id')
|
|
|
+ ->select('id','order_number','crt_id','start_time','end_time','state','product_introduction','vin_no','sales_order_id','customer_id')
|
|
|
->get()->toArray();
|
|
|
if(empty($construction)) return [true, []];
|
|
|
$sales_order_map = SalesOrder::whereIn('id',array_column($construction,'sales_order_id'))->pluck('order_number','id')->toArray();
|
|
|
@@ -683,7 +683,8 @@ class ScheduleService extends Service
|
|
|
'state' => $value['state'],
|
|
|
'state_title' => Construction::$name[$value['state']] ?? "",
|
|
|
'button' => $button,
|
|
|
- 'sales_order_number' => $sales_tmp
|
|
|
+ 'sales_order_number' => $sales_tmp,
|
|
|
+ 'customer_id' => $value['customer_id']
|
|
|
];
|
|
|
// $tmp = $tmp + ($construction_oa[$value['order_number']] ?? []);
|
|
|
$return[] = $tmp;
|
cqp