|
@@ -131,14 +131,20 @@ class SplitSale extends Command
|
|
|
//只处理采购单
|
|
//只处理采购单
|
|
|
if (strtoupper($pay_rate['companyNo']) == 'KH') {
|
|
if (strtoupper($pay_rate['companyNo']) == 'KH') {
|
|
|
|
|
|
|
|
- if ($pay_rate['is_cgd'] == 1) $this->_handle_cgd_caixiao($cgd, $sale, $pay_rate, $cgdNo, $orderCode, $cgd_total);
|
|
|
|
|
|
|
+ //此时尚未生成销售单，存销售单号无意义 吧？
|
|
|
|
|
+// if ($pay_rate['is_cgd'] == 1) $this->_handle_cgd_caixiao($cgd, $sale, $pay_rate, $cgdNo, $orderCode, $cgd_total);
|
|
|
|
|
+
|
|
|
|
|
+ if ($pay_rate['is_cgd'] == 1) $this->_handle_cgd_caixiao($cgd, $sale, $pay_rate, $cgdNo, '', $cgd_total);
|
|
|
|
|
|
|
|
} elseif (strtoupper($pay_rate['companyNo']) == 'GYS') {
|
|
} elseif (strtoupper($pay_rate['companyNo']) == 'GYS') {
|
|
|
//只处理销售单
|
|
//只处理销售单
|
|
|
|
|
|
|
|
//供应商事先覆盖
|
|
//供应商事先覆盖
|
|
|
$supplier = ['No' => $sale['supplierNo'], 'name' => Db::name('business')->where('companyNo', $sale['supplierNo'])->value('company', '')];
|
|
$supplier = ['No' => $sale['supplierNo'], 'name' => Db::name('business')->where('companyNo', $sale['supplierNo'])->value('company', '')];
|
|
|
- if ($pay_rate['is_qrd'] == 1) $this->_handle_sale_caixiao($sale, $orderCode, $cgdNo, $sale_total, $customer, $supplier);
|
|
|
|
|
|
|
+ if ($pay_rate['is_qrd'] == 1) {
|
|
|
|
|
+ //此时生成的供应商的销售单，应该关联原始采购单号
|
|
|
|
|
+ $this->_handle_sale_caixiao($sale, $orderCode, $cgd['cgdNo'], $sale_total, $customer, $supplier);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
|
|
