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

app/admin/controller/ComonOrder.php

@@ -39,14 +39,15 @@ class ComonOrder extends Base
     }
     
     public function list(){
-        $post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","customerNo"=>"","companyNo"=>"",'status'=>[],
-        'relaComNo'=>'','platform_type'=>'','inv_status'=>'','pay_status'=>'', 'page'=>1,'size'=>15],"post","trim");
+        $post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","orderCode"=>[],"customerNo"=>"",
+        "companyNo"=>"",'status'=>[],'relaComNo'=>'','platform_type'=>'','inv_status'=>'','pay_status'=>'', 'page'=>1,'size'=>15],"post","trim");
         $where=[];
         $post['start']==''?:$where[]=["comon_order.addtime",">=",date("Y-m-d 00:00:00",strtotime($post['start']))];
         $post['end']==''?:$where[]=["comon_order.addtime","<=",date("Y-m-d 23:59:59",strtotime($post['end']))];
         $post['cxCode']==''?:$where[]=["comon_order.cxCode","like","%{$post['cxCode']}%"];
         $post['customerNo']==''?:$where[]=["comon_order.customerNo","=",$post['customerNo']];
         empty($post['status'])?:$where[]=['comon_order.status','in',$post['status']];
+        empty($post['orderCode'])?:$where[]=['comon_order.orderCode','in',$post['orderCode']];
         $post['inv_status']==''?:$where[]=["qrd.inv_status","=",$post['inv_status']];
         $post['pay_status']==''?:$where[]=["qrd.pay_status","=",$post['pay_status']];
         $post['platform_type']==''?:$where[]=["comon_order.platform_type","=",$post['platform_type']];

app/admin/controller/Good.php

@@ -140,6 +140,33 @@ class Good extends Base
     	'类目是否一致','税率是否一致','创建时间'];
     	excelExport("商品税率异常记录", $header, $list);
     }
+    
+    
+    public function export(){
+		ini_set('memory_limit' , '-1');
+		$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'',
+    	'creater'=>'','isZx'=>'','isChange'=>'','cat_diff'=>'','tax_diff'=>'','is_diff'=>'','start'=>'','end'=>''
+    	],'post','trim');
+    	$where=[];
+    	$param['spuCode']==''?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
+    	$param['good_name']==''?: $where[]=['good_name','like',"%{$param['good_name']}%"];
+    	$param['companyNo']==''?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
+    	$param['supplierNo']==''?: $where[]=['supplierNo','like',"%{$param['supplierNo']}%"];
+    	$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
+    	$param['status']===''?: $where[]=['status','=',$param['status']];
+    	$param['isZx']==''?: $where[]=['isZx','=',$param['isZx']];
+    	$param['isChange']===''?: $where[]=['isChange','=',$param['isChange']];
+    	$param['is_diff']==''?: $where[]=['cat_diff|tax_diff','=',2];
+    	$param['cat_diff']==''?: $where[]=['cat_diff','=',$param['cat_diff']];
+    	$param['tax_diff']==''?: $where[]=['tax_diff','=',$param['tax_diff']];
+    	$param['start']==''?: $where[]=['addtime','>=',date('Y-m-d 00:00:00',strtotime($param['start']))];
+    	$param['end']==''?: $where[]=['addtime','<=',date('Y-m-d 23:59:59',strtotime($param['end']))];
+		$header=['商品编码','卖出方公司编号','卖出方公司','买入方公司编号','买入方公司','商品名称','采购类目编码','采购类目名称','采购开票商品名称',
+		'财务类目编码','财务类目名称','财务开票商品名称','状态','增值税管理内容','创建人','创建时间'];
+		$list= $this->model->export($where,['spuCode','supplierNo','supplierName','companyNo','companyName','good_name','cgd_inv_cat_code','cgd_inv_cat_name','
+				cgd_inv_good_name','inv_cat_code','inv_cat_name','inv_good_name','status','addTax','creater','addtime']);
+		excelExport('结算类目设置导出表',$header,$list);
+	}
     /**
 	* @param $good
 	* @param $check

app/admin/controller/Payment.php

@@ -1833,7 +1833,7 @@ class Payment extends Base
 	public function hpinvReturnList(){
 		$param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"","returnCode"=>"",
 		"status"=>"","hpNo"=>"","is_comon"=>"","payNo"=>"","pay_type"=>"","page"=>1,"size"=>15],"post","trim");
-		$condition=[["a.is_del","=",0],['a.returnType',"=",1],['pay_type','=',$param['pay_type']??1]];
+		$condition=[["a.is_del","=",0],['a.returnType',"=",1],['pay_type','=',$param['pay_type']?:1]];
 		 $check = checkRole($this->roleid,[132,130]);
         if($check){
             $condition []=["a.apply_id","=",$this->uid];
@@ -1984,7 +1984,7 @@ class Payment extends Base
     public function stageReturnList(){
 		$param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"","returnCode"=>"","payNo"=>"",
 		"status"=>"","dzNo"=>"","pay_type"=>"","is_comon"=>"","page"=>1,"size"=>15],"post","trim");
-		$condition=[["a.is_del","=",0],['a.returnType',"=",2],['pay_type','=',$param['pay_type']??1]];
+		$condition=[["a.is_del","=",0],['a.returnType',"=",2],['pay_type','=',$param['pay_type']?:1]];
 		  $check = checkRole($this->roleid,[131,129]);
         if($check){
             $condition []=["a.apply_id","=",$this->uid];

app/admin/controller/Sale.php

@@ -396,7 +396,7 @@ class Sale extends Base{
     	  if($vali->check($post)==false) return error_show(1004,$vali->getError());
     	  if($post['is_cgd_check']==0){
     	  	  $qrdinf =Db::name('qrd_info')->where(['sequenceNo|cxCode'=>$post['orderCode'],'status'=>1,'is_del'=>0])
-    	  	  ->field('sequenceNo,inv_tag,pay_tag')->select();
+    	  	  ->field('sequenceNo,inv_tag,pay_tag')->select()->toArray();
 	          if(!empty($qrdinf)){
 	          	$message='';
 	            if(in_array(1,array_column($qrdinf,'inv_tag')))$message.="结算订单存在开票标签\r\n";

app/admin/model/Good.php

@@ -38,7 +38,11 @@ class Good extends Model
     public function GetCgdInvTaxAttr($v){
        return $v==""?'':  strval($v*100).'%';
     }
-    
+     public function GetCgdInvCatCodeAttr($v){
+        return $v.' ';
+    } public function GetInvCatCodeAttr($v){
+       return $v." ";
+    }
     public function export($where,$field){
     	
       $list=  $this->where($where)->field($field)->cursor();
@@ -53,7 +57,9 @@ class Good extends Model
       	if(isset($item['isZx'])){
       	     $item['isZx']=self::$Zx[$item['isZx']];
       	}
-      	
+      	if(isset($item['status'])){
+      	    $item['status']=self::$status[$item['status']];
+      	 }
       	yield $item;
       }
     }

app/command/CopySupplier.php

@@ -66,6 +66,7 @@ class CopySupplier extends Command
 	           "ownerPlace"=>'',
 	           "denomination"=>'',
 	           "invoiceType"=>"",
+	           'invoice_title'=>$supplier['invoice_title'],
 	           "status"=>0,
 	           "addtime"=>date("Y-m-d H:i:s"),
 	           "updatetime"=>date("Y-m-d H:i:s")