|
@@ -471,11 +471,11 @@ class Good extends Base
|
|
|
public function GetStockGod(){
|
|
|
$page = isset($this->post['page']) &&$this->post['page'] !=="" ? intval($this->post['page']):1;
|
|
|
$size = isset($this->post['size']) &&$this->post['size'] !=="" ? intval($this->post['size']):10;
|
|
|
- $condition = [["a.is_del","=",0],["b.is_del","=",0],["c.usable_stock",">",0]];
|
|
|
+ $condition = [["b.is_del","=",0],["c.usable_stock",">",0]];
|
|
|
$type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code'])
|
|
|
:"";
|
|
|
if($type_code!==""){
|
|
|
- $condition[]=["b.type_code","like","%{$type_code}%"];
|
|
|
+ $condition[]=["b.spuCode","like","%{$type_code}%"];
|
|
|
}
|
|
|
$count = Db::name("good")->alias("b")
|
|
|
->join("good_stock c","c.spuCode = b.spuCode","left")
|