Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/Purchin.php

@@ -303,9 +303,11 @@ class Purchin extends Base
         Db::startTrans();
         try{
 
-            //如果开通了供应商账号，则只允许level3账号操作，level2账号不允许操作
-            $all_has_supplier_account = checkHasAccountBySupplierNos([$cgdinfo['supplierNo']]);
-            if (isset($all_has_supplier_account['data'][$cgdinfo['supplierNo']]) && $this->level == 2) throw new Exception('已开通供应商账号，当前账号不能操作');
+            if ($this->level == 2) {
+                //如果开通了供应商账号，则只允许level3账号操作，level2账号不允许操作
+                $all_has_supplier_account = checkHasAccountBySupplierNos([$cgdinfo['supplierNo']]);
+                if (isset($all_has_supplier_account[$cgdinfo['supplierNo']])) throw new Exception('已开通供应商账号，当前账号不能操作');
+            }
 
             $win = Db::name("purchease_in")->insert($orin,true);
             if($win){
@@ -362,7 +364,11 @@ class Purchin extends Base
 //                if ($this->uid != $personid) throw new Exception('只能由供应商负责人操作');
 //                }
 
-//                if ($this->level == 2) {
+                $userCommon = new \app\admin\common\User();
+                $supplier_temp = $userCommon->handle('sInfo',['code'=>$cgdinfo['supplierNo']]);
+                $person = $supplier_temp['data'];
+
+                if ($this->level == 2 && $this->uid != $person['personid']) throw new Exception('只能由供应商负责人操作');
 //                    $person = Db::connect('mysql_sys')
 //                        ->name('supplier')
 //                        ->where('code', $cgdinfo['supplierNo'])

app/admin/controller/Sale.php

@@ -4848,16 +4848,16 @@ class Sale extends Base
             ])->column('c.supplierNo', 'a.outCode');
 
         //检查这些供应商编码是否开通了账号
-//        $temp_res =
+        $temp_res = checkHasAccountBySupplierNos(array_values($suppliers));
+
 //            ->whereIn('supplierNo', array_values($suppliers))
 //            ->column('supplierNo');
 //        $temp = [];
 //        foreach ($suppliers as $k => $v) {
 //            if (in_array($v, $temp_res)) $temp[] = $k;
 //        }
-//
-//        if (!empty($temp)) return json_show(1003, '不允许处理已开通账号的供应商的单子', $temp);
 
+        if (!empty($temp_res)) return json_show(1003, '不允许处理已开通账号的供应商的单子', array_keys($temp_res));
 
 
 //        $user = GetUserInfo($param['token']);
@@ -4912,10 +4912,10 @@ class Sale extends Base
 		                              ->value('personid');
 	                }
 
-//	                if ($createrid != $personid) {
-//		                Db::rollback();
-//		                return app_show(1003, $value['outCode'] . '发货单只能由供应商负责人操作');
-//	                }
+	                if ($createrid != $personid) {
+		                Db::rollback();
+		                return app_show(1003, $value['outCode'] . '发货单只能由供应商负责人操作');
+	                }
                 }
 
                 //【发货单】