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

app/abutment/controller/Order.php

@@ -2,6 +2,8 @@
 
 namespace app\abutment\controller;
 
+use app\abutment\model\SupplierRelationUser as SupplierRelationUserModel;
+use app\abutment\model\SupplierUser as SupplierUserModel;
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\admin\model\GoodStockInfo;use app\admin\model\ProcessOrder;
@@ -408,7 +410,7 @@ class Order extends HomeBaseController
                 ->column('personid','code');
 
             foreach ($cgdNo as $vlue) {
-                if($status==1 || $status==2){
+                if($status==2 || $status==3){
 //                    $orderinfo = Db::name('sale')
 //                        ->alias('a')
 //                        ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
@@ -433,9 +435,17 @@ class Order extends HomeBaseController
                         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) {
+                        //非库存品和采返商品，推给供应商负责人(还得是没开通账号的供应商)
+
+                        $res = SupplierRelationUserModel::field('id')
+                            ->where(['is_del' => SupplierUserModel::$is_del_normal, 'supplierNo' => $info[$vlue]['supplierNo'], 'status' => SupplierUserModel::$status_normal])
+                            ->findOrEmpty()
+                            ->isEmpty();
+                        if(!$res) 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];
                 ProcessOrder::AddProcess(['id' => $uid, 'nickname' => $uname], $process);
                 $order = ["order_code" => $vlue, "status" => '', "action_remark" => $remark, "action_type" => "status"];

app/admin/controller/Purchin.php

@@ -262,7 +262,7 @@ class Purchin extends Base
                         ->where(['is_del' => SupplierUserModel::$is_del_normal, 'supplierNo' => $cgdinfo['supplierNo'], 'status' => SupplierUserModel::$status_normal])
                         ->findOrEmpty()
                         ->isEmpty();
-                    if($res) throw new Exception('供应商已开通账号，只能由供应商端操作');
+                    if(!$res) throw new Exception('供应商已开通账号，只能由供应商端操作');
 
                     $personid = Db::name('supplier')
                         ->where('code',$cgdinfo['supplierNo'])