浏览代码

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

wufeng 2 年之前
父节点
当前提交
db40461fc8
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      app/command/SplitSale.php

+ 2 - 2
app/command/SplitSale.php

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