|
|
@@ -518,9 +518,12 @@ class U8ServerService extends Service
|
|
|
// $depart = Depart::where('parent_id',0)
|
|
|
// ->pluck('title','id')
|
|
|
// ->toArray();
|
|
|
- $emp = Employee::whereIn('id',array_unique(array_column($main,'crt_id')))
|
|
|
- ->pluck('number','id')
|
|
|
+ $empList = Employee::whereIn('id',array_unique(array_column($main,'crt_id')))
|
|
|
+ ->select('number','id','emp_name')
|
|
|
+ ->get()
|
|
|
->toArray();
|
|
|
+ $emp = array_column($empList,'number','id');
|
|
|
+ $emp2 = array_column($empList,'emp_name','id');
|
|
|
// $see = SeeRange::where('del_time',0)
|
|
|
// ->whereIn('data_id',array_column($main,'id'))
|
|
|
// ->where('data_type',SeeRange::type_seven)
|
|
|
@@ -571,7 +574,7 @@ class U8ServerService extends Service
|
|
|
$value['cdefine22'] = $main_tmp['customer_contact'] ?? "";//手机号码
|
|
|
// $value['cdefine31'] = "";//客户名称(线上的时候就是空 线下的话就是表头的客户简称)
|
|
|
// $value['cdefine22'] = "";//手机号码 暂时没有
|
|
|
- $value['cdefine30'] = $emp[$main_tmp['crt_id']] ?? "";//业务员
|
|
|
+ $value['cdefine30'] = $emp2[$main_tmp['crt_id']] ?? "";//业务员
|
|
|
$value['code'] = $product_tmp['code'];//存货编码
|
|
|
|
|
|
$sub_map[$value['sales_order_id']][] = $value;
|
cqpCow