|
|
@@ -178,6 +178,7 @@ class SplitSale extends Command
|
|
|
$this->cgd_insert[$this->cgd_key - 1]['supplier_name'] = $supplier['name'] ?? '';
|
|
|
$this->cgd_insert[$this->cgd_key - 1]['supplier_persion'] = $supplier['person'] ?? '';
|
|
|
$this->cgd_insert[$this->cgd_key - 1]['supplier_persionid'] = $supplier['personid'] ?? 0;
|
|
|
+ if(isset($supplier['personid'])) $this->cgd_insert[$this->cgd_key - 1]['depart']=get_company_name_by_uid($supplier['personid'] ?? 0);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -271,17 +272,11 @@ class SplitSale extends Command
|
|
|
'is_activity' => $sale['is_activity'] ?? 0,
|
|
|
'is_stock' => $sale['is_stock'] ?? 0,
|
|
|
'arrive_time' => $sale['arrive_timefvc'] ?? '',
|
|
|
-// 'customer_code' => $customer['No'] ?? '',
|
|
|
-// 'customer_name' => $customer['name'] ?? '',
|
|
|
-// 'supplierNo' => $supplier['No'] ?? '',
|
|
|
-// 'supplier_name' => $supplier['name'] ?? '',
|
|
|
'zxNo' => $sale['zxNo'] ?? '',
|
|
|
'proof_id' => $sale['proof_id'] ?? 0,
|
|
|
'proof_url' => $sale['proof_url'] ?? '',
|
|
|
'other_orderNo' => $sale['other_orderNo'],
|
|
|
'paytime' => $sale['paytime'] ?? '',
|
|
|
-// 'workNo' => $sale['workNo'] ?? '',
|
|
|
-// 'poNo' => $sale['platform_order'] ?? '',
|
|
|
'use_order' => $sale['use_order'],
|
|
|
'good_weight' => $sale['good_weight'] ?? 0,
|
|
|
'addtime' => $sale['addtime'],
|
|
|
@@ -290,7 +285,6 @@ class SplitSale extends Command
|
|
|
'unit' => $sale['unit'] ?? '',
|
|
|
'cost_desc' => $sale['cost_desc'] ?? '',
|
|
|
'noble_weight' => $sale['noble_weight'] ?? 0,
|
|
|
-// 'tax' => $sale['tax'] ?? '',
|
|
|
'lead_time' => $sale['lead_time'] ?? 0,
|
|
|
'depart' => get_company_name_by_uid($sale['apply_id'] ?? 0) ?? '',
|
|
|
'cgdNo' => $cgdNo,
|
|
|
@@ -352,9 +346,7 @@ class SplitSale extends Command
|
|
|
'cgdNo' => $cgdNo,
|
|
|
'bkcode' => $cgd['bkcode'] ?? '',
|
|
|
'wsm_code' => $cgd['wsm_code'] ?? '',
|
|
|
-// 'cgder' => $sale['cgder'] ?? '',
|
|
|
-// 'cgder_id' => $sale['cgderid'] ?? 0,
|
|
|
- 'depart' => get_company_name_by_uid($cgd['cgder_id'] ?? 0) ?? '',
|
|
|
+ 'depart' => get_company_name_by_uid($sale['cgder_id'] ?? 0) ?? '',
|
|
|
'qrdNo' => $orderCode,
|
|
|
'spuCode' => $cgd['spuCode'] ?? $sale['good_code'],
|
|
|
'good_name' => $sale['good_name'],
|
