|
|
@@ -165,7 +165,7 @@ class Payment extends BaseController
|
|
|
}
|
|
|
|
|
|
if($supplierNo!=""){
|
|
|
- $condition[]=["supplierNo","=",$supplierNo];
|
|
|
+ $condition[]=["supplierNo","like","%$supplierNo%"];
|
|
|
}
|
|
|
|
|
|
if($payNo!=""){
|
|
|
@@ -866,8 +866,8 @@ class Payment extends BaseController
|
|
|
|
|
|
$cgdtype= isset($post['cgdtype']) && $post['cgdtype']!='' ? intval($post['cgdtype']) :"";
|
|
|
if($cgdtype!='') $condition []=["cgdType","=",$cgdtype];
|
|
|
- $cgdsource= isset($post['cgdsource']) && $post['cgdsource']!='' ? intval($post['cgdsource']) :"";
|
|
|
- if($cgdsource!='') $condition []=["cgdSource","=",$cgdsource];
|
|
|
+ $cgdsource= isset($post['cgdsource']) && $post['cgdsource']!=='' ? intval($post['cgdsource']) :"";
|
|
|
+ if($cgdsource!=='') $condition []=["cgdSource","=",$cgdsource];
|
|
|
$sendstatus= isset($post['sendstatus']) && $post['sendstatus']!='' ? intval($post['sendstatus']) :"";
|
|
|
if($sendstatus!='') $condition []=["sendStatus","=",$sendstatus];
|
|
|
|
|
|
@@ -1440,8 +1440,8 @@ class Payment extends BaseController
|
|
|
|
|
|
}
|
|
|
public function hpinvReturnList(){
|
|
|
- $param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"",
|
|
|
- "status"=>"","hpNo"=>"","page"=>1,"size"=>15],"post","trim");
|
|
|
+ $param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"","returnCode"=>"",
|
|
|
+ "status"=>"","hpNo"=>"","payNo"=>"","page"=>1,"size"=>15],"post","trim");
|
|
|
$condition=[["a.is_del","=",0],['a.returnType',"=",1]];
|
|
|
if($param['relaComNo']!="") $condition[]=["b.companyNo|b.supplierNo","=",$param['relaComNo']];
|
|
|
if($param['companyNo']!="") $condition[]=["b.companyNo","=",$param['companyNo']];
|
|
|
@@ -1449,7 +1449,9 @@ class Payment extends BaseController
|
|
|
if($param['start']!="") $condition[]=["a.addtime",">=",date("Y-m-d H:i:s",strtotime($param['start']))];
|
|
|
if($param['end']!="") $condition[]=["a.addtime","<=",date("Y-m-d 23:59:59",strtotime($param['end']))];
|
|
|
if($param['status']!="") $condition[]=["a.status","=",$param['status']];
|
|
|
- if($param['hpNo']!="") $condition[]=["a.orderCode","=",$param['hpNo']];
|
|
|
+ if($param['hpNo']!="") $condition[]=["a.orderCode","like","%{$param['hpNo']}%"];
|
|
|
+ if($param['returnCode']!="") $condition[]=["a.returnCode","like","%{$param['returnCode']}%"];
|
|
|
+ if($param['payNo']!="") $condition[]=["a.payNo","like","%{$param['payNo']}%"];
|
|
|
|
|
|
$count=Db::name("pay_return")->alias("a")
|
|
|
->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
|
|
|
@@ -1564,7 +1566,7 @@ class Payment extends BaseController
|
|
|
}
|
|
|
}
|
|
|
public function stageReturnList(){
|
|
|
- $param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"",
|
|
|
+ $param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"","returnCode"=>"","payNo"=>"",
|
|
|
"status"=>"","dzNo"=>"","page"=>1,"size"=>15],"post","trim");
|
|
|
$condition=[["a.is_del","=",0],['a.returnType',"=",2]];
|
|
|
if($param['relaComNo']!="") $condition[]=["b.companyNo|b.supplierNo","=",$param['relaComNo']];
|
|
|
@@ -1573,7 +1575,9 @@ class Payment extends BaseController
|
|
|
if($param['start']!="") $condition[]=["a.addtime",">=",date("Y-m-d H:i:s",strtotime($param['start']))];
|
|
|
if($param['end']!="") $condition[]=["a.addtime","<=",date("Y-m-d 23:59:59",strtotime($param['end']))];
|
|
|
if($param['status']!="") $condition[]=["a.status","=",$param['status']];
|
|
|
- if($param['dzNo']!="") $condition[]=["a.orderCode","=",$param['dzNo']];
|
|
|
+ if($param['dzNo']!="") $condition[]=["a.orderCode","like","%{$param['dzNo']}%"];
|
|
|
+ if($param['returnCode']!="") $condition[]=["a.returnCode","like","%{$param['returnCode']}%"];
|
|
|
+ if($param['payNo']!="") $condition[]=["a.payNo","like","%{$param['payNo']}%"];
|
|
|
|
|
|
$count=Db::name("pay_return")->alias("a")
|
|
|
->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
|
