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

app/admin/controller/Good.php

@@ -50,11 +50,14 @@ class Good extends Base
         if($good_name!==""){
             $where[]=['a.good_name',"like","%$good_name%"];
         }
-        $skucode = isset($this->post['spucode']) && $this->post['spucode'] !=="" ? trim($this->post['spucode'])
-            :"";
+        $skucode = isset($this->post['skucode']) && $this->post['skucode'] !=="" ? trim($this->post['skucode']):"";
         if($skucode!==""){
             $where [] = ['b.skucode',"like","%$skucode%"];
         }
+        $spucode = isset($this->post['spucode']) && $this->post['spucode'] !=="" ? trim($this->post['spucode']):"";
+        if($spucode!==""){
+            $where [] = ['b.spucode',"like","%$spucode%"];
+        }
         $start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
         if($start!==""){
             $where[]=['a.addtime',">=",date('Y-m-d H:i:s',strtotime($start))];