|
@@ -597,6 +597,10 @@ class Good extends Base
|
|
if($type_code!==""){
|
|
if($type_code!==""){
|
|
$condition[]=["b.spuCode","like","%{$type_code}%"];
|
|
$condition[]=["b.spuCode","like","%{$type_code}%"];
|
|
}
|
|
}
|
|
|
|
+ $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name']) : "";
|
|
|
|
+ if ($good_name !== "") {
|
|
|
|
+ $condition[] = ["b.good_name", "like", "%{$good_name}%"];
|
|
|
|
+ }
|
|
$count = Db::name("good")->alias("b")
|
|
$count = Db::name("good")->alias("b")
|
|
->join("good_stock c","c.spuCode = b.spuCode","left")
|
|
->join("good_stock c","c.spuCode = b.spuCode","left")
|
|
->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")
|
|
->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")
|