|
@@ -73,16 +73,16 @@ class CopySupplier extends Command
|
|
|
}else{
|
|
}else{
|
|
|
$datas = [
|
|
$datas = [
|
|
|
// "companyNo"=>$supplier['companyNo'],
|
|
// "companyNo"=>$supplier['companyNo'],
|
|
|
- "company_name"=>$supplier['company'],
|
|
|
|
|
- "company_address"=>$supplier['inv_addr'],
|
|
|
|
|
- "company_license"=>$supplier['inv_code'],
|
|
|
|
|
- "bank_name"=>$supplier['inv_bank'],
|
|
|
|
|
- "bankNo"=>$supplier['inv_bankNo'],
|
|
|
|
|
- "contector"=>$supplier['contactor'],
|
|
|
|
|
- "mobile"=>$supplier['invoice_mobile'],
|
|
|
|
|
- "company_img"=>$supplier['license_img'],
|
|
|
|
|
- "invoice_title"=>$supplier['invoice_title'],
|
|
|
|
|
- "updatetime"=>date("Y-m-d H:i:s")
|
|
|
|
|
|
|
+ 'company_name'=>$supplier['company']??$comp['company_name'],
|
|
|
|
|
+ 'company_address'=>$supplier['inv_addr'],
|
|
|
|
|
+ 'company_license'=>$supplier['inv_code']??$comp['company_license'],
|
|
|
|
|
+ 'bank_name'=>$supplier['inv_bank'],
|
|
|
|
|
+ 'bankNo'=>$supplier['inv_bankNo'],
|
|
|
|
|
+ 'contector'=>$supplier['contactor']??$comp['contector'],
|
|
|
|
|
+ 'mobile'=>$supplier['invoice_mobile'],
|
|
|
|
|
+ 'company_img'=>$supplier['license_img']??$comp['company_img'],
|
|
|
|
|
+ 'invoice_title'=>$supplier['invoice_title'],
|
|
|
|
|
+ 'updatetime'=>date('Y-m-d H:i:s')
|
|
|
];
|
|
];
|
|
|
$data=array_merge($comp,$datas);
|
|
$data=array_merge($comp,$datas);
|
|
|
}
|
|
}
|
|
@@ -158,7 +158,7 @@ class CopySupplier extends Command
|
|
|
'supplier_type' => $this->_cat[$supplier['supplier_type']]??"",
|
|
'supplier_type' => $this->_cat[$supplier['supplier_type']]??"",
|
|
|
'pay_method' => $supplier['pay_type'],
|
|
'pay_method' => $supplier['pay_type'],
|
|
|
'paydays' => $supplier['pay_day']??"0",
|
|
'paydays' => $supplier['pay_day']??"0",
|
|
|
- 'mobile' => $supplier['mobile'],
|
|
|
|
|
|
|
+ 'mobile' => $supplier['mobile']??"",
|
|
|
'address' => $supplier['addr'],
|
|
'address' => $supplier['addr'],
|
|
|
'return_ticket' => $supplier['ticket_type'],
|
|
'return_ticket' => $supplier['ticket_type'],
|
|
|
'delivery' => $this->_delaway[$supplier['delivery_way']]??"",
|
|
'delivery' => $this->_delaway[$supplier['delivery_way']]??"",
|
