Merge branch 'dev-wgg' of wugg/cxinv into dev

app/admin/controller/Sale.php

@@ -394,14 +394,14 @@ class Sale extends BaseController{
     	  $qrdinf =Db::name("qrd_info")->where(["sequenceNo|cxCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
     	  if(!empty($qrdinf)){
     	  	$asscoinfo =Db::name("assoc")->where(["orderCode"=>$qrdinf,"status"=>[1,2],"is_del"=>0])->column("viceCode","type");
-    	  	$message="该销售订单在结算中已参与了以下业务，请全部解除后在申请，";
+    	  	$message="";
     	  	if(isset($asscoinfo[1]))$message.="开票申请编号：".$asscoinfo[1]."\r\n";
     	  	if(isset($asscoinfo[2]))$message.="资金认领编号：".$asscoinfo[2]."\r\n";
     	  	return error_show(1005,$message);
     	  }
     	  $cgdinfo =Db::name("cgd_info")->where(["cxCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
     	   if(!empty($cgdinfo)){
-	            $message="该销售采购订单在结算中已参与了以下业务，请全部解除后在申请，";
+	            $message="";
 	            $payinfo = Db::name("pay_info")->where(["cgdNo"=>$cgdinfo,"status"=>1,"is_del"=>0])->column("payNo");
 	            if(!empty($payinfo))$message.="对账单编号：".implode(",",$payinfo)."\n";
 	            $hp = Db::name("pay_invoice")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("hpNo");
@@ -413,7 +413,7 @@ class Sale extends BaseController{
     	   if($post['isCgd']==1){
 	           $cgdinfo =Db::name("cgd_info")->where(["qrdCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
 	           if(!empty($cgdinfo)){
-	           		$message="该销售采购订单在结算中已参与了以下业务，请全部解除后在申请，";
+	           		$message="";
 		            $payinfo = Db::name("pay_info")->where(["cgdNo"=>$cgdinfo,"status"=>1,"is_del"=>0])->column("payNo");
 		            if(!empty($payinfo))$message.="对账单编号：".implode(",",$payinfo)."\n";
 		            $hp = Db::name("pay_invoice")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("hpNo");