Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/command/SplitSale.php

@@ -154,12 +154,15 @@ class SplitSale extends Command
                         //把自己覆盖到上一个记录的供应商记录中
                         if (isset($this->cgd_insert[$this->cgd_key - 1])) {
 
+                            if (strtoupper($pay_rate['companyNo']) == 'KH') $supplierNo = $sale['supplierNo'];
+                            else $supplierNo = $pay_rate['companyNo'];
+
                             $supplier = Db::name('supplier')
-                                ->field('id,person,personid')
-                                ->where('code', $pay_rate['companyNo'])
+                                ->field('id,code,name,person,personid')
+                                ->where('code', $supplierNo)
                                 ->findOrEmpty();
-                            $this->cgd_insert[$this->cgd_key - 1]['supplierNo'] = $pay_rate['companyNo'];
-                            $this->cgd_insert[$this->cgd_key - 1]['supplier_name'] = $pay_rate['companyName'];
+                            $this->cgd_insert[$this->cgd_key - 1]['supplierNo'] = $supplierNo;
+                            $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;
                         }