ad

app/admin/controller/Sale.php

@@ -3,7 +3,7 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\CgdInfo;use think\App;
+use app\admin\model\CgdInfo;use app\admin\model\InvoicePool;use app\admin\model\Pay;use app\admin\model\TradePool;use think\App;
 use think\facade\Db;use think\facade\Validate;
 class Sale extends Base{
     public function __construct(App $app) {parent::__construct($app);}
@@ -401,26 +401,29 @@ class Sale extends Base{
     	  $data=[];
     	  if($post['is_cgd_check']==0){
     	  	  $qrdinf =Db::name('qrd_info')->where(['sequenceNo|cxCode'=>$post['orderCode'],'is_del'=>0])
-    	  	  ->field('sequenceNo,companyName,inv_tag,pay_tag')->select()->toArray();
+    	  	  ->field('sequenceNo,ownerName,companyName,inv_tag,pay_tag')->select()->toArray();
 	          if(!empty($qrdinf)){
 	          	foreach ($qrdinf as $item){
 	          	    if($item['inv_tag']==1){
-	          	    	$temp=["type"=>"结算销售单开票标签","orderCode"=>$item['sequenceNo'],"companyName"=>$item['companyName']];
+	          	    	$temp=["type"=>"结算销售单开票标签","username"=> $item['ownerName'],"orderCode"=>$item['sequenceNo'],
+	          	    	"companyName"=>$item['companyName']];
 	          	    	$data[]=$temp;
 	          	    }
 	          	    
 	          	    if($item['pay_tag']==1){
-	          	    	$temp=['type'=>'结算销售单付款标签','orderCode'=>$item['sequenceNo'],'companyName'=>$item['companyName']];
+	          	    	$temp=['type'=>'结算销售单付款标签','username'=> $item['ownerName'],'orderCode'=>$item['sequenceNo'],'companyName'=>$item['companyName']];
 	          	    	$data[]=$temp;
 	          	    }
 	          	     $asscoinfo =Db::name('assoc')->where(['orderCode'=>$item['sequenceNo'],'status'=>[1,2],'is_del'=>0])->column
 	                    ('viceCode','type');
 	          	     if(isset($asscoinfo[1])){
-	          	    	$temp=['type'=>'结算销售单开票申请','orderCode'=>$asscoinfo[1],'companyName'=>$item['companyName']];
+	          	     	$uname = InvoicePool::where("invNo",$asscoinfo[1])->value("apply_name",'');
+	          	    	$temp=['type'=>'结算销售单开票申请','username'=> $uname,'orderCode'=>$asscoinfo[1],'companyName'=>$item['companyName']];
 	          	    	$data[]=$temp;
 	          	    }
 	          	     if(isset($asscoinfo[2])){
-	          	     	$temp=['type'=>'结算销售单资金认领','orderCode'=>$asscoinfo[2],'companyName'=>$item['companyName']];
+	          	     	$uname = TradePool::where('invNo',$asscoinfo[1])->value('apply_name','');
+	          	     	$temp=['type'=>'结算销售单资金认领','username'=> $uname,'orderCode'=>$asscoinfo[2],'companyName'=>$item['companyName']];
 	          	     	 $data[]=$temp;
 	          	      }
 	          	}
@@ -430,18 +433,21 @@ class Sale extends Base{
 	           if(!empty($cgdinfo)){
 		           $payNo = Db::name('pay_info')->where(['cgdNo'=>$cgdinfo['sequenceNo'],'status'=>1,'is_del'=>0])->value('payNo','');
 		           if($payNo!=''){
-		           	    $data[]=['type'=>'采购对账单','orderCode'=>$payNo,'companyName'=>$cgdinfo['companyName']];
+		           	    $uname = Pay::where("payNo",$payNo)->value("apply_name",'');
+		           	    $data[]=['type'=>'采购对账单','username'=> $uname,'orderCode'=>$payNo,'companyName'=>$cgdinfo['companyName']];
 		           	    
-		           	    $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
+		           	    $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+		           	    ->column('hpNo,apply_name');
 			            if(!empty($hp)){
 			            	foreach ($hp as $item){
-			            		$data[]=['type'=>'采购对账单回票','orderCode'=>$item,'companyName'=>$cgdinfo['companyName']];
+			            		$data[]=['type'=>'采购对账单回票','username'=> $item['apply_name'],'orderCode'=>$item['hpNo'],'companyName'=>$cgdinfo['companyName']];
 			            	}
 			            }
-			            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
+			            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+			            ->column('dzNo,apply_name');
 			             if(!empty($paydz)){
 			            	foreach ($paydz as $item){
-			            		$data[]=['type'=>'采购对账单付款','orderCode'=>$item,'companyName'=>$cgdinfo['companyName']];
+			            		$data[]=['type'=>'采购对账单付款','username'=> $item['apply_name'],'orderCode'=>$item['dzNo'],'companyName'=>$cgdinfo['companyName']];
 			            	}
 			            }
 			            
@@ -452,39 +458,44 @@ class Sale extends Base{
 			           if(!empty($cgdinfo)){
 				           $payNo = Db::name('pay_info')->where(['cgdNo'=>$cgdinfo['sequenceNo'],'status'=>1,'is_del'=>0])->value('payNo','');
 				           if($payNo!=''){
-				                $data[]=['type'=>'采购对账单','orderCode'=>$payNo,'companyName'=>$cgdinfo['companyName']];
-				                
-				                $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
-					            if(!empty($hp)){
-					                foreach ($hp as $item){
-					                    $data[]=['type'=>'采购对账单回票','orderCode'=>$item,'companyName'=>$cgdinfo['companyName']];
-					                }
-					            }
-					            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
-					             if(!empty($paydz)){
-					                foreach ($paydz as $item){
-					                    $data[]=['type'=>'采购对账单付款','orderCode'=>$item,'companyName'=>$cgdinfo['companyName']];
-					                }
-					            }
+				           	    $uname = Pay::where('payNo',$payNo)->value('apply_name','');
+				                $data[]=['type'=>'采购对账单','username'=> $uname,'orderCode'=>$payNo,'companyName'=>$cgdinfo['companyName']];
+				                 $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+					                ->column('hpNo,apply_name');
+						            if(!empty($hp)){
+						                foreach ($hp as $item){
+						                    $data[]=['type'=>'采购对账单回票','username'=> $item['apply_name'],'orderCode'=>$item['hpNo'],'companyName'=>$cgdinfo['companyName']];
+						                }
+						            }
+						            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+						            ->column('dzNo,apply_name');
+						             if(!empty($paydz)){
+						                foreach ($paydz as $item){
+						                    $data[]=['type'=>'采购对账单付款','username'=> $item['apply_name'],'orderCode'=>$item['dzNo'],'companyName'=>$cgdinfo['companyName']];
+						                }
+						            }
 				            }
 							$comoOrder = CgdInfo::where(['mainCode'=>$cgdinfo['sequenceNo'],'is_comon'=>2,'status'=>1])->field('sequenceNo,companyName')->findOrEmpty();
 				             if(!empty($comoOrder)){
 				             							$payNo = Db::name('pay_info')->where(['cgdNo'=>$comoOrder['sequenceNo'],'status'=>1,'is_del'=>0])->value('payNo','');
 				             				           if($payNo!=''){
-				             				                $data[]=['type'=>'源头采购对账单','orderCode'=>$payNo,'companyName'=>$comoOrder['companyName']];
+				             				           	 $uname = Pay::where('payNo',$payNo)->value('apply_name','');
+				             				                $data[]=['type'=>'源头采购对账单','username'=> $uname,'orderCode'=>$payNo,'companyName'=>$comoOrder['companyName']];
 				             				                
-				             				                $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
-				             					            if(!empty($hp)){
-				             					                foreach ($hp as $item){
-				             					                    $data[]=['type'=>'源头采购对账单回票','orderCode'=>$item,'companyName'=>$comoOrder['companyName']];
-				             					                }
-				             					            }
-				             					            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
-				             					             if(!empty($paydz)){
-				             					                foreach ($paydz as $item){
-				             					                    $data[]=['type'=>'源头采购对账单付款','orderCode'=>$item,'companyName'=>$comoOrder['companyName']];
-				             					                }
-				             					            }
+				             				                 $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+											                ->column('hpNo,apply_name');
+												            if(!empty($hp)){
+												                foreach ($hp as $item){
+												                    $data[]=['type'=>'源头采购对账单回票','username'=> $item['apply_name'],'orderCode'=>$item['hpNo'],'companyName'=>$cgdinfo['companyName']];
+												                }
+												            }
+												            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+												            ->column('dzNo,apply_name');
+												             if(!empty($paydz)){
+												                foreach ($paydz as $item){
+												                    $data[]=['type'=>'源头采购对账单付款','username'=> $item['apply_name'],'orderCode'=>$item['dzNo'],'companyName'=>$cgdinfo['companyName']];
+												                }
+												            }
 				             				            }
 				              }
 			           }
@@ -495,39 +506,45 @@ class Sale extends Base{
 		           if(!empty($cgdinfo)){
 		                $payNo = Db::name('pay_info')->where(['cgdNo'=>$cgdinfo['sequenceNo'],'status'=>1,'is_del'=>0])->value('payNo','');
 			           if($payNo!=''){
-			                $data[]=['type'=>'采购对账单','orderCode'=>$payNo,'companyName'=>$cgdinfo['companyName']];
+			           	 $uname = Pay::where('payNo',$payNo)->value('apply_name','');
+			                $data[]=['type'=>'采购对账单','username'=> $uname,'orderCode'=>$payNo,'companyName'=>$cgdinfo['companyName']];
 			                
-			                $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
-				            if(!empty($hp)){
-				                foreach ($hp as $item){
-				                    $data[]=['type'=>'采购对账单回票','orderCode'=>$item,'companyName'=>$cgdinfo['companyName']];
-				                }
-				            }
-				            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
-				             if(!empty($paydz)){
-				                foreach ($paydz as $item){
-				                    $data[]=['type'=>'采购对账单付款','orderCode'=>$item,'companyName'=>$cgdinfo['companyName']];
-				                }
-				            }
+				                 $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+					                ->column('hpNo,apply_name');
+						            if(!empty($hp)){
+						                foreach ($hp as $item){
+						                    $data[]=['type'=>'采购对账单回票','username'=> $item['apply_name'],'orderCode'=>$item['hpNo'],'companyName'=>$cgdinfo['companyName']];
+						                }
+						            }
+						            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+						            ->column('dzNo,apply_name');
+						             if(!empty($paydz)){
+						                foreach ($paydz as $item){
+						                    $data[]=['type'=>'采购对账单付款','username'=> $item['apply_name'],'orderCode'=>$item['dzNo'],'companyName'=>$cgdinfo['companyName']];
+						                }
+						            }
 			            }
 			             $comoOrder = CgdInfo::where(['mainCode'=>$post['orderCode'],'is_comon'=>2,'status'=>1])->field('sequenceNo,companyName')->findOrEmpty();
 			            if(!empty($comoOrder)){
 							$payNo = Db::name('pay_info')->where(['cgdNo'=>$comoOrder['sequenceNo'],'status'=>1,'is_del'=>0])->value('payNo','');
 				           if($payNo!=''){
-				                $data[]=['type'=>'源头采购对账单','orderCode'=>$payNo,'companyName'=>$comoOrder['companyName']];
-				                
-				                $hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
-					            if(!empty($hp)){
-					                foreach ($hp as $item){
-					                    $data[]=['type'=>'源头采购对账单回票','orderCode'=>$item,'companyName'=>$comoOrder['companyName']];
-					                }
-					            }
-					            $paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
-					             if(!empty($paydz)){
-					                foreach ($paydz as $item){
-					                    $data[]=['type'=>'源头采购对账单付款','orderCode'=>$item,'companyName'=>$comoOrder['companyName']];
-					                }
-					            }
+				               $uname = Pay::where('payNo',$payNo)->value('apply_name','');
+				               	$data[]=['type'=>'源头采购对账单','username'=> $uname,'orderCode'=>$payNo,'companyName'=>$comoOrder['companyName']];
+				               	$hp = Db::name('pay_invoice')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+				               	->column('hpNo,apply_name');
+				               	if(!empty($hp)){
+				               	foreach ($hp as $item){
+				               		$data[]=['type'=>'源头采购对账单回票','username'=> $item['apply_name'],'orderCode'=>$item['hpNo'],'companyName'=>$cgdinfo['companyName']];
+				               	 }
+				               }
+				               	$paydz = Db::name('pay_payment')->where(['payNo'=>$payNo,'is_del'=>0,'status'=>[1,2,3,4]])
+				               	->column('dzNo,apply_name');
+				               	if(!empty($paydz)){
+				               	foreach ($paydz as $item){
+				               		$data[]=['type'=>'源头采购对账单付款','username'=> $item['apply_name'],'orderCode'=>$item['dzNo'],'companyName'=>$cgdinfo['companyName']];
+				               	}
+				               	 }
+				           }
 				            }
 			            }
 		           }

app/admin/model/TradePool.php

@@ -0,0 +1,14 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class TradePool extends Model
+{
+    //
+}