Selaa lähdekoodia

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

wufeng 2 vuotta sitten
vanhempi
commit
ba387e9976
1 muutettua tiedostoa jossa 1 lisäystä ja 1 poistoa
  1. 1 1
      app/admin/controller/Good.php

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

@@ -781,7 +781,7 @@ class Good extends Base
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["b.wsm_code","in",$wsmcode];
+            $where[]=["b.wsm_code","in",$wsmcode];
         }
         $count = Db::name("good_log")
             ->alias('a')