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

app/admin/controller/Purchin.php

@@ -468,23 +468,23 @@ class Purchin extends Base
 
                         if($cgdinfo['status']==1 || $cgdinfo['status']==2){
 
-                            $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([
-                                        ['is_del', '=', 0],
-                                        ['roleid', 'in', [31, 41]],
-                                        ['status', '=', 1]
-                                    ])->column('uid');
-                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
-//                                $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid,'handle_user_list'=>implode(',', $uid)];
-
-                            }else{
-                                if($this->uid != $personid)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
-                            }
+//                            $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([
+//                                        ['is_del', '=', 0],
+//                                        ['roleid', 'in', [31, 41]],
+//                                        ['status', '=', 1]
+//                                    ])->column('uid');
+//                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+////                                $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid,'handle_user_list'=>implode(',', $uid)];
+//
+//                            }else{
+                                if($this->uid != $personid)throw new Exception('只能由供应商负责人操作');
+//                            }
                         }//else $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid];
                         
                         ProcessOrder::AddProcess(['id'=>$this->uid,'nickname'=>$this->uname],["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid,'handle_user_list'=>$personid]);

app/admin/controller/Sale.php

@@ -408,7 +408,7 @@ class Sale extends Base
 
                                 if($out['status']==1 ){
                                     //节点1待库管发货
-//                                    if($data['is_stock']==0){
+                                    if($data['is_stock']==0){
                                         //非库存品，推给供应商负责人
                                         $supp = Db::name('supplier')
                                             ->field('person,personid')
@@ -423,20 +423,20 @@ class Sale extends Base
                                             'wait_id'=>$supp['personid'],
                                             'wait_name'=>$supp['person'],
                                         ]);
-//                                    }else{
-//                                        //库存品,推给31库管和41库管-张凯旋
-//                                        $uids = Db::name('user_role')
-//                                            ->where(['is_del' => 0, 'roleid' => config('app.wsm_cgder_role'), 'status' => 1])
-//                                            ->column('uid');
-//                                        ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
-//                                            "order_type" => 'CKD',
-//                                            "order_code" => $outCode,//出库单号
-//                                            "order_id" => $ou,
-//                                            "order_status" => $out['status'],
-//                                            "before_status" => $out['status'],
-//                                            'handle_user_list' => implode(',', $uids),
-//                                        ]);
-//                                    }
+                                    }else{
+                                        //库存品,推给31库管和41库管-张凯旋
+                                        $uids = Db::name('user_role')
+                                            ->where(['is_del' => 0, 'roleid' => config('app.wsm_cgder_role'), 'status' => 1])
+                                            ->column('uid');
+                                        ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
+                                            "order_type" => 'CKD',
+                                            "order_code" => $outCode,//出库单号
+                                            "order_id" => $ou,
+                                            "order_status" => $out['status'],
+                                            "before_status" => $out['status'],
+                                            'handle_user_list' => implode(',', $uids),
+                                        ]);
+                                    }
                                 }else{
                                     ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                                         "order_type" => 'CKD',

app/admin/route/app.php

@@ -212,7 +212,7 @@ Route::rule("exportcgdlist","admin/Purch/exportCgdList");//导出采购单
 Route::rule("cgdgetchangesupplierlist","admin/Purch/getChangeSupplierList");//导出采购单
 
 Route::rule("orderinlist","admin/Purchin/list");
-Route::rule("orderinadd","admin/Purchin/add");
+Route::rule("orderinadd","admin/Purchin/add");//新建入库单
 Route::rule("orderininfo","admin/Purchin/info");
 Route::rule("orderincheck","admin/Purchin/check");
 Route::rule("orderinstatus","admin/Purchin/status");