ad

app/command/SplitSale.php

@@ -56,7 +56,7 @@ class SplitSale extends Command
 
 //                $cgd_insert_tmp_data=[];
 
-                $userCommon = new \User();
+                $userCommon = User::getIns();
 
                 foreach ($data as $sale) {
 
@@ -118,7 +118,7 @@ class SplitSale extends Command
                     $cgd_total = $sale_total = $sale['total_price'];
 		            //客户
                     $customer = ['No' => $sale['customer_code'], 'name' => $sale['customerName']];
-                    foreach ($pay_rates as $key=>$pay_rate) {
+                    foreach ($pay_rates as $keys=>$pay_rate) {
 
                         //生成新的采购单号和销售单号
                         $cgdNo = makeNo('CG');
@@ -126,16 +126,20 @@ class SplitSale extends Command
                         $orderCode = makeNo('QR');
                         $orderCode = substr($orderCode, 0, -2) . str_pad($this->i, 2, '0', STR_PAD_LEFT);
                         $this->i++;
-						$sale_total =$cgd_total;
+
                         $cgd_total = bcsub($cgd_total, bcmul($sale['total_price'] ?? 0, round($pay_rate['rate'] / 100, 4), 5), 5);
 						$supplier = ['No' => $pay_rate['companyNo'], 'name' => $pay_rate['companyName']];
                         $this->_handle_sale_caixiao($sale, $orderCode, $cgd['cgdNo'] ?? '', $sale_total, $customer, $supplier);
 						$this->_handle_cgd_caixiao($cgd, $sale, $pay_rate, $cgdNo, '', $cgd_total);
 						$customer= ['No' => $pay_rate['companyNo'], 'name' => $pay_rate['companyName']];
-
+	                    $sale_total =$cgd_total;
+						if($keys == count($pay_rates)-1){
+							$supplier = ['No' => $sale['supplierNo'], 'name' => $sale['supplierName']];
+							$this->_handle_sale_caixiao($sale, $orderCode, $cgd['cgdNo'] ?? '', $sale_total, $customer, $supplier);
+						}
                         //把自己覆盖到上一个记录的供应商记录中
                         if (isset($this->cgd_insert[$this->cgd_key - 1])) {
-                            $temp = $userCommon->handle('hqInfo', ['code' =>$pay_rate['companyNo']]);
+                            $temp = $userCommon->handle('hqInfo', ['code' =>$supplier['No']]);
                             $supplier = $temp['data'] ?? [];
                             $this->cgd_insert[$this->cgd_key - 1]['supplierNo'] =$supplier['relation_code'];
                             $this->cgd_insert[$this->cgd_key - 1]['supplier_name'] = $supplier['relation_name'];