Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/command/SplitSale.php

@@ -53,7 +53,7 @@ class SplitSale extends Command
                     ])
                     ->cursor();
 
-                $cgd_insert_tmp_data=[];
+//                $cgd_insert_tmp_data=[];
 
                 foreach ($data as $sale) {
 
@@ -182,15 +182,17 @@ class SplitSale extends Command
                         }
 
                     }
-
-
+                    
                     //清空该变量，以防止多个销售单覆盖数据的情况
-                    $cgd_insert_tmp_data = array_merge($cgd_insert_tmp_data, $this->cgd_insert);
+//                    $cgd_insert_tmp_data = array_merge($cgd_insert_tmp_data, $this->cgd_insert);
+
+                    //批量新增改为单次新增
+                    if ($this->cgd_insert) Db::name('cgd_caixiao')->insertAll($this->cgd_insert);
                     $this->cgd_insert=[];
                     $this->cgd_key=0;
                 }
 
-                if ($cgd_insert_tmp_data) Db::name('cgd_caixiao')->insertAll($cgd_insert_tmp_data);
+//                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();