|
|
@@ -17,7 +17,7 @@ class Change extends Base{
|
|
|
$param = $this->request->param(["code"=>"","companyNo"=>"","goodNo"=>"","good_type"=>"","page"=>1,"size"=>15],"post","trim");
|
|
|
$where=[];
|
|
|
if ($param['code']!="") $where[]=['code','like','%'.$param['code'].'%'];
|
|
|
- if ($param['companyNo']!="") $where[]=['companyNo','like','%'.$param['companyNo'].'%'];
|
|
|
+ if ($param['companyNo']!="") $where[]=['data_change.companyNo','like','%'.$param['companyNo'].'%'];
|
|
|
if ($param['goodNo']!="") $where[]=['goodNo','like','%'.$param['goodNo'].'%'];
|
|
|
if ($param['good_type']!=""){
|
|
|
switch ($param['good_type']){
|
|
|
@@ -25,10 +25,10 @@ class Change extends Base{
|
|
|
$where[]=['isZx','=',1];
|
|
|
break;
|
|
|
case 2:
|
|
|
- $where[]=['isStock','=',1];
|
|
|
+ $where[]=['is_stock','=',1];
|
|
|
break;
|
|
|
case 3:
|
|
|
- $where[]=['isStock','=',0];
|
|
|
+ $where[]=['is_stock','=',0];
|
|
|
$where[]=['isZx','=',0];
|
|
|
break;
|
|
|
}
|
