|
|
@@ -199,10 +199,11 @@ class U8ServerService extends Service
|
|
|
"cmaker"=>"admin",
|
|
|
"cmaketime"=>$time,
|
|
|
"IsExamine"=>false,
|
|
|
+ "cptname"=>$value['cptname']??"",//采购类型
|
|
|
"cvencode"=>"", //供应商编码
|
|
|
"cvenname"=>$value['cvenname'], //供应商名称
|
|
|
"cdepcode"=>"", //部门编号
|
|
|
- "cdepname"=>$value['cdepname'], //部门名称
|
|
|
+ "cdepname"=>"", //部门名称 $value['cdepname']
|
|
|
"cpersoncode"=>"", //业务员编码jobnumber
|
|
|
"jobnumber"=>$value['jobnumber'], //业务员编码
|
|
|
"cdefine1"=>"",
|
|
|
@@ -346,8 +347,9 @@ class U8ServerService extends Service
|
|
|
"ccuscode"=>"",
|
|
|
"ccusabbname"=>$value['ccusabbname'], //客户简称
|
|
|
"cdepcode"=>"",
|
|
|
- "cdepname"=>$value['cdepname'], // 部门名称
|
|
|
+ "cdepname"=>"", // 部门名称 $value['cdepname']
|
|
|
"cpersoncode"=>"", //业务员编码 暂时不要
|
|
|
+ "jobnumber"=>$value['jobnumber'],//业务员工号
|
|
|
"itaxrate"=>"0",
|
|
|
"cmemo"=>"T9销售订单:". $value['order_number'],
|
|
|
"cdefine1"=>"",
|
|
|
@@ -434,9 +436,9 @@ class U8ServerService extends Service
|
|
|
$supplier = Supplier::whereIn('id',array_unique(array_column($main,'supplier')))
|
|
|
->pluck('title','id')
|
|
|
->toArray();
|
|
|
- $depart = Depart::whereIn('id',array_unique(array_column($main,'depart_id')))
|
|
|
- ->pluck('title','id')
|
|
|
- ->toArray();
|
|
|
+// $depart = Depart::whereIn('id',array_unique(array_column($main,'depart_id')))
|
|
|
+// ->pluck('title','id')
|
|
|
+// ->toArray();
|
|
|
$emp = Employee::whereIn('id',array_unique(array_column($main,'purchase_id')))
|
|
|
->pluck('number','id')
|
|
|
->toArray();
|
|
|
@@ -485,7 +487,7 @@ class U8ServerService extends Service
|
|
|
foreach ($main as $key => $value){
|
|
|
$main[$key]['cptname'] = $code_map[$value['purchase_type']] ?? "";
|
|
|
$main[$key]['cvenname'] = $supplier[$value['supplier']] ?? "";
|
|
|
- $main[$key]['cdepname'] = $depart[$value['depart_id']] ?? "";
|
|
|
+// $main[$key]['cdepname'] = $depart[$value['depart_id']] ?? "";
|
|
|
// $main[$key]['cpersoncode'] = $emp[$value['purchase_id']] ?? "";
|
|
|
$main[$key]['jobnumber'] = $emp[$value['purchase_id']] ?? "";
|
|
|
$main[$key]['product'] = $sub_map[$value['id']] ?? [];
|
|
|
@@ -569,8 +571,9 @@ class U8ServerService extends Service
|
|
|
$main[$key]['cbustype'] = "普通销售"; //业务类型(本身就是中文)
|
|
|
$main[$key]['cstname'] = $code_map[$value['sale_type']] ?? ""; //销售类型
|
|
|
$main[$key]['ccusabbname'] = $customer_map[$value['customer_id']] ?? "";//客户简称
|
|
|
- $main[$key]['cdepname'] = $depart[$value['top_depart_id']] ?? "";//部门名称
|
|
|
+// $main[$key]['cdepname'] = $depart[$value['top_depart_id']] ?? "";//部门名称
|
|
|
// $main[$key]['cpersoncode'] = $emp[$value['crt_id']] ?? "";//业务员
|
|
|
+ $main[$key]['jobnumber'] = $emp[$value['crt_id']] ?? "";
|
|
|
$main[$key]['product'] = $sub_map[$value['id']] ?? [];
|
|
|
}
|
|
|
|
cqpCow