Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Good.php

@@ -539,10 +539,10 @@ class Good extends Base
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["wsm_code","in",$wsmcode];
         }
-        $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
-        if($type_code!=""){
-            $condition[] = ["good_type_code","=",$type_code];
-        }
+//        $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
+//        if($type_code!=""){
+//            $condition[] = ["good_type_code","=",$type_code];
+//        }
         $statlist = Db::name("good_stock")->where($condition)->field("sum(wait_in_stock) as wait_in_stock,sum(wait_out_stock) as wait_out_stock ,sum(usable_stock) as usable_stock,sum(intra_stock) as intra_stock,sum(total_stock) as total_stock,sum(warn_stock) as warn_stock")->find();
         return app_show(0,"获取成功",$statlist);
     }