wugg 1 year ago
parent
commit
c2f64b6956

+ 1 - 1
app/admin/controller/OrderInv.php

@@ -445,7 +445,7 @@ class OrderInv extends BaseController{
 						Db::rollback();
                        return error_show(1003,"开票信息生成失败");
 					}
-					Cache::push("invoiceList",$data["DDQQLSH"]);
+
             	}
             if( $update['status']==4){
             	$qrdArr=Db::name("assoc")->where(["viceCode"=>$invNo,"is_del"=>0])->column("id,orderCode,cancel_fee");

+ 20 - 1
app/admin/controller/Payment.php

@@ -382,6 +382,11 @@ class Payment extends BaseController
         if(count(array_unique($supplierNo))>1){
              return error_show(1003,"采购单数据供应商不一致");
         }
+	    if ($this->level == 2) {
+		    //判断是否开通供应商账号
+		    $temp = check_has_account_by_supplierNos([$payinfo['supplierNo']]);
+		    if (isset($temp['data'][$payinfo['supplierNo']])) return error_show(1004, '该供应商已经开通账号,不允许当前账号操作');
+	    }
         $companyNo= array_column($cgdall,"companyNo");
         $companyName= array_column($cgdall,"companyName");
         if(count(array_unique($companyNo))>1){
@@ -570,6 +575,11 @@ class Payment extends BaseController
        if($data['status']==2){
           return error_show(1004,"对账单已审核通过");
        }
+	    if ($this->level == 2) {
+		    //判断是否开通供应商账号
+		    $temp = check_has_account_by_supplierNos([$data['supplierNo']]);
+		    if (isset($temp['data'][$data['supplierNo']])) return error_show(1004, '该供应商已经开通账号,不允许当前账号操作');
+	    }
        $cgdNo = Db::name("pay_info")->where(["payNo"=>$payNo,"is_del"=>0])->column("cgdNo");
        if(empty($cgdNo)){
            return error_show(1004,"未能找到对应采购单数据");
@@ -1201,7 +1211,11 @@ class Payment extends BaseController
                 ->where('is_del', 0)
                 ->whereIn('payNo', $payNo)
                 ->column('id,payNo,status', 'payNo');
-
+	        if ($this->level == 2) {
+		        //判断是否开通供应商账号
+		        $temp = check_has_account_by_supplierNos([$payinfo['supplierNo']]);
+		        if (isset($temp['data'][$payinfo['supplierNo']])) return error_show(1004, '该供应商已经开通账号,不允许当前账号操作');
+	        }
             //$da_insert 批量新增的数据,$payNo_hpNo对账编码=>回票编码
             $da_insert = $payNo_hpNo = [];
             $date = date('Y-m-d H:i:s');
@@ -1527,6 +1541,11 @@ class Payment extends BaseController
        if($payinfo==false){
             return error_show(1005,"未找到对账信息");
         }
+	    if ($this->level == 2) {
+		    //判断是否开通供应商账号
+		    $temp = check_has_account_by_supplierNos([$payinfo['supplierNo']]);
+		    if (isset($temp['data'][$payinfo['supplierNo']])) return error_show(1004, '该供应商已经开通账号,不允许当前账号操作');
+	    }
         if($payinfo['status']!=2){
             return error_show(1005,"对账信息未完成审核");
         }

+ 1 - 1
app/admin/middleware/checkRela.php

@@ -34,7 +34,7 @@ class checkRela
                  $db= UserHandle("/userCompanyBasicList", ["companyNo" =>$companyinfo['data']['relation_code']]);
 	                if ($db['code'] != 0) return ["code"=>$db['code'],"message"=> $db['message']];
 	                if (!empty($db['data']) && $db['data']['count'] > 0) {
-	                    return ["code"=>1004,"message"=> "供应商公司存在操作账户,请用供应商账户操作"];
+//	                    return error_show(1004,"供应商公司存在操作账户,请用供应商账户操作");
 	                }
 
                 }