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

app/abutment/controller/Order.php

@@ -430,10 +430,10 @@ class Order extends HomeBaseController
                                 ['roleid', 'in', [31, 41]],
                                 ['status', '=', 1]
                             ])->column('uid');
-                        if(!in_array($uid,$uids)) throw new Exception('库存品订单只能由库管人员操作');
+                        //if(!in_array($uid,$uids)) throw new Exception('库存品订单只能由库管人员操作');
                         $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(',', $uids)];
                     }elseif ($is_stock==0 || $info[$vlue]['order_type']==3) {
-                        if($uid != $supplier_cgderid[$info[$vlue]['supplierNo']])throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                        //if($uid != $supplier_cgderid[$info[$vlue]['supplierNo']])throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                         $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];

app/admin/controller/Purch.php

@@ -707,11 +707,11 @@ class Purch extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            if (!in_array($this->uid, $uids)) throw new Exception('库存品订单只能由库管人员操作');
+                            //if (!in_array($this->uid, $uids)) throw new Exception('库存品订单只能由库管人员操作');
                             $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(',', $uids)];
                         } elseif ($is_stock == 0 || $info[$vlue]['order_type'] == 3) {
                             //非库存品和采返商品，推给供应商负责人
-                            if ($this->uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            //if ($this->uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('非库存品和采返商品只能由供应商负责人操作');
 
                             $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];
                         }

app/admin/controller/Purchin.php

@@ -447,11 +447,11 @@ class Purchin extends Base
                                         ['roleid', 'in', [31, 41]],
                                         ['status', '=', 1]
                                     ])->column('uid');
-                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                                //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)];
 
                             }elseif ($is_stock==0 || $cgdinfo['order_type']==3){
-                                if($this->uid != $personid)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                                //if($this->uid != $personid)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'=>$personid];   //非库存品和采返商品，推给供应商负责人
                             }
                         }else $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid];
@@ -682,11 +682,11 @@ class Purchin extends Base
                                         ['roleid', 'in', [31, 41]],
                                         ['status', '=', 1]
                                     ])->column('uid');
-                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                                //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                                 $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);
-                                if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                                //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                                 $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)];
@@ -736,11 +736,11 @@ class Purchin extends Base
                                         ['roleid', 'in', [31, 41]],
                                         ['status', '=', 1]
                                     ])->column('uid');
-                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                                //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                                 $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);
-                                if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                                //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                                 $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)];
@@ -791,11 +791,11 @@ class Purchin extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                            //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                             $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);
-                            if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                             $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)];
@@ -949,11 +949,11 @@ class Purchin extends Base
                                 ['roleid', 'in', [31, 41]],
                                 ['status', '=', 1]
                             ])->column('uid');
-                        if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                        //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                         $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==3) {
                         $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                        if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                        //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                         $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)];
@@ -1232,12 +1232,12 @@ class Purchin extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                            //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                             $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 ($is_stock==0 || $cgdinfo['order_type']==3) {
                             $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                            if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                             $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)];

app/admin/controller/Reorder.php

@@ -936,7 +936,7 @@ class Reorder extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                            //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
                                 "order_type" => 'CGD',
                                 "order_code" => $cgd['cgdNo'],
@@ -947,7 +947,7 @@ class Reorder extends Base
                                 'handle_user_list' => implode(',', $uid),
                             ]);
                         }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3){
-                            if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                             //非库存品和采返商品，推给供应商负责人
                             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
                                 "order_type" => 'CGD',