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

app/admin/controller/Purchin.php

@@ -479,7 +479,7 @@ class Purchin extends Base
                                     }else{
 
                                         //尝试拆单
-                                        \app\admin\model\OrderOutChild::makeChild($send);
+
 
                                         //查询是否有非库存品订单
 //                                        $is_stock = Db::name('sale')
@@ -494,6 +494,7 @@ class Purchin extends Base
 //                                            ->findOrEmpty();
 
                                         foreach ($out as $k => $v_outCode) {
+	                                        \app\admin\model\OrderOutChild::makeChild($v_outCode['outCode']);
                                             ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                                                 "order_code" => $v_outCode['outCode'],//出库单号
                                                 "status" => 0,//这里的status是之前的值
@@ -535,30 +536,30 @@ class Purchin extends Base
 
                                         }
                                     }
-                                    $good1 = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
-                                    if($good1==false){
-                                        Db::rollback();
-                                        return error_show(1004,"未找到对应商品库存");
-                                    }
-                                    $out_num = intval(array_sum(array_column($out,"send_num")));
-                                    if($out_num>$good1['usable_stock']){
-                                        Db::rollback();
-                                        return error_show(1004,"库存数量不足发货");
-                                    }
-                                    $good1['usable_stock']-=$out_num;
-                                    $good1['wait_out_stock']+=$out_num;
-                                    $good1['total_stock']=$good1['usable_stock']+$good1['wait_out_stock'];
-                                    $good1['updatetime'] = date("Y-m-d H:i:s");
-                                    $upd=  Db::name("good_stock")->save($good1);
-                                    if($upd==false){
-                                        Db::rollback();
-                                        return error_show(1004,"库存数量更新失败");
-                                    }
-                                    $stockid= isset($good['id'])?$good['id']:Db::name("good_stock")->getLastInsID();
-
-                                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>$stockid,"type"=>1,'stock'=>$send_num,"stock_name"=>"wait_out_stock"];
-                                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>$stockid,"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
-                                    GoodLog::LogAdd(['id'=>$this->uid,'nickname'=>$this->uname],$good_data,'RKD');
+//                                    $good1 = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
+//                                    if($good1==false){
+//                                        Db::rollback();
+//                                        return error_show(1004,"未找到对应商品库存");
+//                                    }
+//                                    $out_num = intval(array_sum(array_column($out,"send_num")));
+//                                    if($out_num>$good1['usable_stock']){
+//                                        Db::rollback();
+//                                        return error_show(1004,"库存数量不足发货");
+//                                    }
+//                                    $good1['usable_stock']-=$out_num;
+//                                    $good1['wait_out_stock']+=$out_num;
+//                                    $good1['total_stock']=$good1['usable_stock']+$good1['wait_out_stock'];
+//                                    $good1['updatetime'] = date("Y-m-d H:i:s");
+//                                    $upd=  Db::name("good_stock")->save($good1);
+//                                    if($upd==false){
+//                                        Db::rollback();
+//                                        return error_show(1004,"库存数量更新失败");
+//                                    }
+//                                    $stockid= isset($good['id'])?$good['id']:Db::name("good_stock")->getLastInsID();
+//
+//                                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>$stockid,"type"=>1,'stock'=>$send_num,"stock_name"=>"wait_out_stock"];
+//                                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>$stockid,"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
+//                                    GoodLog::LogAdd(['id'=>$this->uid,'nickname'=>$this->uname],$good_data,'RKD');
                                     $sendp=Db::name("order_send")->where(["cgdNo"=>$cgdNo,"outCode"=>$send,"status"=>1])->save (["status"=>2]);
                                     if($sendp==false){
                                         Db::rollback();
@@ -812,6 +813,7 @@ class Purchin extends Base
                                             ])->column('is_stock', 'orderCode');
 
                                         foreach ($out as $k => $v_outCode) {
+	                                        \app\admin\model\OrderOutChild::makeChild($v_outCode['outCode']);
                                             //修改状态，添加待办
                                             ActionLog::logAdd(['id' => $uid, 'nickname' => $nickname], [
                                                 "order_code" => $v_outCode['outCode'],//出库单号
@@ -856,21 +858,21 @@ class Purchin extends Base
 
                                         }
                                     }
-                                    $good1 = Db::name("good_stock")->where(["wsm_code" => $cgdinfo[$cgdNo]['wsm_code'], "spuCode" => $cgdinfo[$cgdNo]['spuCode'], "is_del" => 0])->find();
-                                    if ($good1 == false) throw new Exception('未找到对应商品库存');
-                                    $out_num = intval(array_sum(array_column($out, "send_num")));
-                                    if ($out_num > $good1['usable_stock']) throw new Exception('库存数量不足发货');
-
-                                    $good1['usable_stock'] -= $out_num;
-                                    $good1['wait_out_stock'] += $out_num;
-                                    $good1['total_stock'] = $good1['usable_stock'] + $good1['wait_out_stock'];
-                                    $good1['updatetime'] = date("Y-m-d H:i:s");
-                                    $upd = Db::name("good_stock")->save($good1);
-                                    if ($upd == false) throw new Exception('库存数量更新失败');
-
-                                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "wait_out_stock"];
-                                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "usable_stock"];
-                                    GoodLog::LogAdd(['id' => $uid, 'nickname' => $nickname], $good_data, 'RKD');
+//                                    $good1 = Db::name("good_stock")->where(["wsm_code" => $cgdinfo[$cgdNo]['wsm_code'], "spuCode" => $cgdinfo[$cgdNo]['spuCode'], "is_del" => 0])->find();
+//                                    if ($good1 == false) throw new Exception('未找到对应商品库存');
+//                                    $out_num = intval(array_sum(array_column($out, "send_num")));
+//                                    if ($out_num > $good1['usable_stock']) throw new Exception('库存数量不足发货');
+//
+//                                    $good1['usable_stock'] -= $out_num;
+//                                    $good1['wait_out_stock'] += $out_num;
+//                                    $good1['total_stock'] = $good1['usable_stock'] + $good1['wait_out_stock'];
+//                                    $good1['updatetime'] = date("Y-m-d H:i:s");
+//                                    $upd = Db::name("good_stock")->save($good1);
+//                                    if ($upd == false) throw new Exception('库存数量更新失败');
+//
+//                                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "wait_out_stock"];
+//                                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "usable_stock"];
+//                                    GoodLog::LogAdd(['id' => $uid, 'nickname' => $nickname], $good_data, 'RKD');
                                     $sendp = Db::name("order_send")->where(["cgdNo" => $cgdNo, "outCode" => $send, "status" => 1])->save(["status" => 2]);
                                     if ($sendp == false) throw new Exception('库存发货失败');