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

app/command/SplitSale.php

@@ -53,6 +53,8 @@ class SplitSale extends Command
                     ])
                     ->cursor();
 
+                $cgd_insert_tmp_data=[];
+
                 foreach ($data as $sale) {
 
                     //补充商品信息
@@ -180,9 +182,15 @@ class SplitSale extends Command
                         }
 
                     }
+
+
+                    //清空该变量，以防止多个销售单覆盖数据的情况
+                    $cgd_insert_tmp_data = array_merge($cgd_insert_tmp_data, $this->cgd_insert);
+                    $this->cgd_insert=[];
+                    $this->cgd_key=0;
                 }
 
-                if ($this->cgd_insert) Db::name('cgd_caixiao')->insertAll($this->cgd_insert);
+                if ($cgd_insert_tmp_data) Db::name('cgd_caixiao')->insertAll($cgd_insert_tmp_data);
                 if ($this->sale_insert) Db::name('sale_caixiao')->insertAll($this->sale_insert);
 
                 Db::commit();