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