Browse Source

Merge branch 'wugg' of wugg/phpstock into version1.5

wugg 2 years ago
parent
commit
6ffa5e3cfc
1 changed files with 2 additions and 2 deletions
  1. 2 2
      app/admin/controller/Good.php

+ 2 - 2
app/admin/controller/Good.php

@@ -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")