123

app/abutment/controller/Order.php

@@ -386,7 +386,7 @@ class Order extends HomeBaseController
         $info = Db::name("purchease_order")
             ->whereIn('cgdNo', $cgdNo)
             ->where('status', 0)
-            ->column('id,cgdNo,status,supplierNo', 'cgdNo');
+            ->column('id,cgdNo,status,supplierNo,spuCode,order_type', 'cgdNo');
         if (empty($info)) return json_show(1005, '没有可供确认的订单');
 
         $upd = Db::name("purchease_order")
@@ -409,16 +409,20 @@ class Order extends HomeBaseController
 
             foreach ($cgdNo as $vlue) {
                 if($status==1 || $status==2){
-                    $orderinfo = Db::name('sale')
-                        ->alias('a')
-                        ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                        ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                        ->where([
-                            'a.is_del'=>0,
-                            'b.cgdNo'=>$vlue,
-                        ])->findOrEmpty();
-
-                    if($orderinfo['is_stock']==1){
+//                    $orderinfo = Db::name('sale')
+//                        ->alias('a')
+//                        ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                        ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                        ->where([
+//                            'a.is_del'=>0,
+//                            'b.cgdNo'=>$vlue,
+//                        ])->findOrEmpty();
+
+                    $is_stock = Db::name('good_basic')
+                        ->where(['is_del'=>0,'spuCode'=>$info[$vlue]['spuCode']])
+                        ->value('is_stock');
+
+                    if($is_stock==1){
                         //库存品，推给31库管人员、41库管-张凯旋
                         $uid = Db::name('user_role')
                             ->where([
@@ -428,7 +432,7 @@ class Order extends HomeBaseController
                             ])->column('uid');
 
                         $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>implode(',', $uid)];
-                    }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3) $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                    }elseif ($is_stock==0 || $info[$vlue]['order_type']==3) $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];//非库存品和采返商品，推给供应商负责人
                 }else $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];
                 ProcessOrder::AddProcess(['id' => $uid, 'nickname' => $uname], $process);
                 $order = ["order_code" => $vlue, "status" => '', "action_remark" => $remark, "action_type" => "status"];

app/admin/controller/Purch.php

@@ -138,7 +138,7 @@ class Purch extends Base
             ->alias('po')
             ->leftJoin('order_num on','on.cgdNo=po.cgdNo')
             ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
-             ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
+            ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
             ->field('po.*,on.orderCode,u.itemid,sip.personid as supplier_cgderid,sip.person as supplier_cgder')
             ->where($where)
             ->where(function($query) use ($where){$query->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]]);})
@@ -286,8 +286,8 @@ class Purch extends Base
             }
 
             $supplier = Db::name("supplier")->where(["code"=>$goon['supplierNo']])->find();
-	        $goon['supplier_cgderid'] = $supplier['personid'] ??'';
-	        $goon['supplier_cgder'] = $supplier['person'] ??'';
+            $goon['supplier_cgderid'] = $supplier['personid'] ??'';
+            $goon['supplier_cgder'] = $supplier['person'] ??'';
             $goon['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
             $goon['noble_name']=isset($goon['noble_metal'])&&$goon['noble_metal']!=0?$this->noble[$goon['noble_metal']] :"";
             if(isset($goon['companyNo'])&&$goon['companyNo']!=""){
@@ -641,7 +641,7 @@ class Purch extends Base
 
         if ($status == 0) {
             $data = Db::name("purchease_order")
-                ->field('id,cgdNo')
+                ->field('id,cgdNo,spuCode')
                 ->whereIn('cgdNo', $cgdNo)
                 ->where(["is_del" => 0])
                 ->where('send_status', '>', 1)
@@ -661,7 +661,7 @@ class Purch extends Base
         //原始数据
         $info = Db::name("purchease_order")
             ->whereIn('cgdNo', $cgdNo)
-            ->column('id,cgdNo,status,supplierNo','cgdNo');
+            ->column('id,cgdNo,status,supplierNo,spuCode,order_type','cgdNo');
 
         $upd = Db::name("purchease_order")
             ->whereIn('cgdNo', $cgdNo)
@@ -685,16 +685,19 @@ class Purch extends Base
 
             foreach ($cgdNo as $vlue) {
                 if($status==1 || $status==2){
-                    $orderinfo = Db::name('sale')
-                    ->alias('a')
-                    ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                    ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                    ->where([
-                        'a.is_del'=>0,
-                        'b.cgdNo'=>$vlue,
-                    ])->findOrEmpty();
-
-                    if($orderinfo['is_stock']==1){
+//                    $orderinfo = Db::name('sale')
+//                    ->alias('a')
+//                    ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                    ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                    ->where([
+//                        'a.is_del'=>0,
+//                        'b.cgdNo'=>$vlue,
+//                    ])->findOrEmpty();
+                    $is_stock = Db::name('good_basic')
+                        ->where(['is_del'=>0,'spuCode'=>$info[$vlue]['spuCode']])
+                        ->value('is_stock');
+
+                    if($is_stock==1){
                         //库存品，推给31库管人员、41库管-张凯旋
                         $uid = Db::name('user_role')
                             ->where([
@@ -703,7 +706,7 @@ class Purch extends Base
                                 ['status', '=', 1]
                             ])->column('uid');
                         $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0, 'holder_id' => isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>implode(',', $uid)];
-                    }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3)  $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0, 'holder_id' => isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                    }elseif ($is_stock==0 || $info[$vlue]['order_type']==3)  $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0, 'holder_id' => isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];//非库存品和采返商品，推给供应商负责人
                 }else $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0, 'holder_id' => isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];
 
                 ProcessOrder::AddProcess(['id' => $uid, 'nickname' => $uname], $process);
@@ -715,7 +718,7 @@ class Purch extends Base
             return error_show(1004, '更新失败');
         }
     }
-    
+
     //创建采购工差单
     public function diffcreat(){
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
@@ -1132,7 +1135,7 @@ class Purch extends Base
             unset($value['order_type']);
 
         }
-   
+
         $headerArr = array_keys($list[0]);
         excelSave('采购单导出' . date('YmdHis'), $headerArr, $list);
     }

app/admin/controller/Purchin.php

@@ -635,15 +635,19 @@ class Purchin extends Base
                         ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
                         if($cgdinfo['status']==1  || $cgdinfo['status']==2){
-                            $orderinfo = Db::name('sale')
-                                ->alias('a')
-                                ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                                ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                                ->where([
-                                    'a.is_del'=>0,
-                                    'b.cgdNo'=>$cgdinfo['cgdNo'],
-                                ])->findOrEmpty();
-                            if($orderinfo['is_stock']==1){
+//                            $orderinfo = Db::name('sale')
+//                                ->alias('a')
+//                                ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                                ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                                ->where([
+//                                    'a.is_del'=>0,
+//                                    'b.cgdNo'=>$cgdinfo['cgdNo'],
+//                                ])->findOrEmpty();
+                            $is_stock = Db::name('good_basic')
+                                ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
+                                ->value('is_stock');
+
+                            if($is_stock==1){
                                 //库存品，推给31库管人员、41库管-张凯旋
                                 $uid = Db::name('user_role')
                                     ->where([
@@ -652,7 +656,10 @@ class Purchin extends Base
                                         ['status', '=', 1]
                                     ])->column('uid');
                                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
-                            }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3) $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                            }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
+                                $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+                                $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
+                            }//非库存品和采返商品，推给供应商负责人
                         }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
 
                         ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], $process);
@@ -681,15 +688,18 @@ class Purchin extends Base
 
 
                         if($cgdinfo['status'] == 1  || $cgdinfo['status']==2){
-                            $orderinfo = Db::name('sale')
-                                ->alias('a')
-                                ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                                ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                                ->where([
-                                    'a.is_del'=>0,
-                                    'b.cgdNo'=>$cgdinfo['cgdNo'],
-                                ])->findOrEmpty();
-                            if($orderinfo['is_stock']==1){
+//                            $orderinfo = Db::name('sale')
+//                                ->alias('a')
+//                                ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                                ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                                ->where([
+//                                    'a.is_del'=>0,
+//                                    'b.cgdNo'=>$cgdinfo['cgdNo'],
+//                                ])->findOrEmpty();
+                            $is_stock = Db::name('good_basic')
+                                ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
+                                ->value('is_stock');
+                            if($is_stock==1){
                                 //库存品，推给31库管人员、41库管-张凯旋
                                 $uid = Db::name('user_role')
                                     ->where([
@@ -698,7 +708,10 @@ class Purchin extends Base
                                         ['status', '=', 1]
                                     ])->column('uid');
                                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
-                            }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3) $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                            }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
+                                $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+                                $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
+                            }//非库存品和采返商品，推给供应商负责人
                         }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
@@ -728,15 +741,18 @@ class Purchin extends Base
                     ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
                     if($cgdinfo['status']==1 || $cgdinfo['status']==2){
-                        $orderinfo = Db::name('sale')
-                            ->alias('a')
-                            ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                            ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                            ->where([
-                                'a.is_del'=>0,
-                                'b.cgdNo'=>$cgdinfo['cgdNo'],
-                            ])->findOrEmpty();
-                        if($orderinfo['is_stock']==1){
+//                        $orderinfo = Db::name('sale')
+//                            ->alias('a')
+//                            ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                            ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                            ->where([
+//                                'a.is_del'=>0,
+//                                'b.cgdNo'=>$cgdinfo['cgdNo'],
+//                            ])->findOrEmpty();
+                        $is_stock = Db::name('good_basic')
+                            ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
+                            ->value('is_stock');
+                        if($is_stock==1){
                             //库存品，推给31库管人员、41库管-张凯旋
                             $uid = Db::name('user_role')
                                 ->where([
@@ -745,8 +761,11 @@ class Purchin extends Base
                                     ['status', '=', 1]
                                 ])->column('uid');
 
-                            $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>$orderinfo['cgderid'],'handle_user_list'=>implode(',', $uid)];
-                        }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3) $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                            $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
+                        }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
+                            $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+                            $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
+                        }//非库存品和采返商品，推给供应商负责人
                     }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
                     ProcessOrder::AddProcess($this->post['token'],$process);
 
@@ -879,15 +898,18 @@ class Purchin extends Base
                 ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
                 if($cgdinfo['status']==1 || $cgdinfo['status']==2){
-                    $orderinfo = Db::name('sale')
-                        ->alias('a')
-                        ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                        ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                        ->where([
-                            'a.is_del'=>0,
-                            'b.cgdNo'=>$cgdinfo['cgdNo'],
-                        ])->findOrEmpty();
-                    if($orderinfo['is_stock']==1){
+//                    $orderinfo = Db::name('sale')
+//                        ->alias('a')
+//                        ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                        ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                        ->where([
+//                            'a.is_del'=>0,
+//                            'b.cgdNo'=>$cgdinfo['cgdNo'],
+//                        ])->findOrEmpty();
+                    $is_stock = Db::name('good_basic')
+                        ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
+                        ->value('is_stock');
+                    if($is_stock==1){
                         //库存品，推给31库管人员、41库管-张凯旋
                         $uid = Db::name('user_role')
                             ->where([
@@ -896,7 +918,10 @@ class Purchin extends Base
                                 ['status', '=', 1]
                             ])->column('uid');
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
-                    }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3) $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                    }elseif ($is_stock==0 || $cgdinfo==3) {
+                        $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+                        $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
+                    }//非库存品和采返商品，推给供应商负责人
                 }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
@@ -1153,15 +1178,19 @@ class Purchin extends Base
                     ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
                     if($cgdinfo['status']==1 || $cgdinfo['status']==2){
-                        $orderinfo = Db::name('sale')
-                            ->alias('a')
-                            ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-                            ->leftJoin('order_num b','b.orderCode=a.orderCode')
-                            ->where([
-                                'a.is_del'=>0,
-                                'b.cgdNo'=>$cgdinfo['cgdNo'],
-                            ])->findOrEmpty();
-                        if($orderinfo['is_stock']==1){
+//                        $orderinfo = Db::name('sale')
+//                            ->alias('a')
+//                            ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
+//                            ->leftJoin('order_num b','b.orderCode=a.orderCode')
+//                            ->where([
+//                                'a.is_del'=>0,
+//                                'b.cgdNo'=>$cgdinfo['cgdNo'],
+//                            ])->findOrEmpty();
+                        $is_stock = Db::name('good_basic')
+                            ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
+                            ->value('is_stock');
+
+                        if($is_stock==1){
                             //库存品，推给31库管人员、41库管-张凯旋
                             $uid = Db::name('user_role')
                                 ->where([
@@ -1171,7 +1200,10 @@ class Purchin extends Base
                                 ])->column('uid');
                             $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
 
-                        }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3)  $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>$orderinfo['cgderid']];//非库存品和采返商品，推给供应商负责人
+                        }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
+                            $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+                            $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];//非库存品和采返商品，推给供应商负责人
+                        }
                     }else $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
                     ProcessOrder::AddProcess($this->post['token'],$process);