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

app/admin/controller/Sale.php

@@ -3873,10 +3873,10 @@ class Sale extends Base
                 if (!in_array($own_roleid, config('app.wsm_cgder_role'))) throw new \think\Exception('库存品只能由库管人员操作');
             } elseif ($einfo['is_stock'] == 0 || $einfo['order_type'] == 3) {
                 //非库存品和采返商品只能由供应商负责人操作
-                $personid = Db::name('supplier')
-                    ->where(['code' => $einfo['supplierNo'], 'is_del' => 0])
-                    ->value('personid');
-                if ($uid != $personid) throw new \think\Exception('非库存品和采返商品只能由供应商负责人操作');
+//                $personid = Db::name('supplier')
+//                    ->where(['code' => $einfo['supplierNo'], 'is_del' => 0])
+//                    ->value('personid');
+                if ($uid != $einfo['cgderid']) throw new \think\Exception('非库存品和采返商品只能由供应商负责人操作');
             }
 
             if ($up) {