Merge branch 'master-new-wgg' of wugg/phpstock into master-new_order_out_child

app/admin/controller/Sale.php

@@ -1165,7 +1165,7 @@ class Sale extends Base
                                 Db::rollback();
                                 return error_show(1002, "发货地址添加创建失败");
                             } else {
-                            	OrderOutChild::makeChild($outCode);
+//                            	OrderOutChild::makeChild($outCode); //非库存品下单无法立即分单
                                 //修改状态，添加待办
                                 ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                                     "order_code" => $outCode,//出库单号
@@ -1678,7 +1678,7 @@ class Sale extends Base
                         if ($ou == false) {
                              throw new Exception("发货单生成失败");
                         }
-                        OrderOutChild::makeChild($outCode);
+//                        OrderOutChild::makeChild($outCode);
                         //修改状态，添加待办
                         ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                             "order_code" => $outCode,//项目编码
@@ -1971,7 +1971,7 @@ class Sale extends Base
                         if ($ou == false) {
                             throw new Exception("发货单生成失败");
                         } else {
-                        	OrderOutChild::makeChild($outCode);
+                        	if($good['is_stock'] == 1)OrderOutChild::makeChild($outCode);//非库存品无法立即分单
                             $standing_book_data['outCode'][] = $outCode;
                             //修改状态，添加待办
                             if($good['is_stock'] == 1){

app/command/ImportOrderFromCHandleData.php

@@ -388,7 +388,7 @@ class ImportOrderFromCHandleData extends Command
                             $ou = Db::name("order_out")->insertGetId($out);
                             if ($ou == false) throw new Exception('发货地址添加创建失败');
                             else {
-                            	OrderOutChild::makeChild($outCode);
+                            if($is_stock == 1)OrderOutChild::makeChild($outCode);//非库存品无法立即分单
 
                                 //修改状态，添加待办
                                 if ($is_stock == 1) {

app/command/handleYzOrderData.php

@@ -276,7 +276,7 @@ class handleYzOrderData extends Command
 //                    ->field('id,person,personid')
 //                    ->where('code', $ct['supplierNo'])
 //                    ->findOrEmpty();
-                $userCommon = new User();
+                $userCommon = User::getIns();
                 $tmp = $userCommon->handle('sInfo',['code'=>$ct['supplierNo']]);
                 $supplier_temp_info = $tmp['data']??[];
 
@@ -528,7 +528,7 @@ class handleYzOrderData extends Command
                             $ou = Db::name("order_out")->insertGetId($out);
                             if ($ou == false) throw new Exception('发货地址添加创建失败');
                             else {
-                            	OrderOutChild::makeChild($outCode);
+                            if ($is_stock == 1) OrderOutChild::makeChild($outCode);
                                 //修改状态，添加待办
                                 ActionLog::logAdd(['id' => $rm, 'nickname' => $ri], [
                                     "order_code" => $outCode,//出库单号