ad

app/admin/controller/Good.php

@@ -64,7 +64,11 @@ class Good extends Base
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
             :"";
         if($supplierNo!==""){
-            $where[]=['a.supplierNo',"=",$supplierNo];
+            $where[]=['a.supplierNo',"like","%$supplierNo%"];
+        }
+         $supplier_name = isset($this->post['supplier_name']) && $this->post['supplier_name'] !=="" ? trim($this->post['supplier_name']):"";
+        if($supplier_name!==""){
+            $where[]=['s.name',"like","%$supplier_name%"];
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo']) :"";
         if($companyNo!==""){
@@ -118,6 +122,7 @@ class Good extends Base
         $count = Db::name('good')
             ->alias("a")
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->leftJoin("supplier s","a.supplierNo=s.code")
             ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
             ->leftJoin("platform p","p.id=b.platform_code")
             ->where('p.platform_type',0)//只筛选非对接平台的商品
@@ -129,9 +134,10 @@ class Good extends Base
             ->alias("a")
             ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,
             b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,
-            b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,u.itemid,a.is_stock")
+            b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,u.itemid,a.is_stock,s.name as supplier_name")
             //成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->leftJoin("supplier s","a.supplierNo=s.code")
 //            ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
             ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
             ->leftJoin("platform p","p.id=b.platform_code")
@@ -146,8 +152,8 @@ class Good extends Base
             $platform = Db::name("platform")->where(["id"=>$value['platform_code']])->find();
             $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
             $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
-            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
-            $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
+//            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+//            $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
             $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
             $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
             $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();

app/admin/controller/GoodOfflineLog.php

@@ -12,14 +12,15 @@ class GoodOfflineLog extends Base
     public function getList()
     {
 
-        $param = $this->request->only(['start_date' => '', 'end_date' => '', 'creater' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
+        $param = $this->request->only(['start_date' => '', "spuCode"=>'',"good_name"=>'','end_date' => '', 'creater' => '',
+         'page' => 1,'size' => 15], 'post', 'trim');
 
         $where = [];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['addtime', 'between', [$param['start_date'], $param['end_date']]];
         if ($param['creater'] != '') $where[] = ['creater', 'like', '%' . $param['creater'] . '%'];
-
+        if ($param['spuCode'] != '') $where[] = ['spuCode', 'like', '%' . $param['spuCode'] . '%'];
+        if ($param['good_name'] != '') $where[] = ['good_name', 'like', '%' . $param['good_name'] . '%'];
         $count = Db::name('good_offline_log')->where($where)->count('id');
-
         $list = Db::name('good_offline_log')
             ->field('id,spuCode,good_name,creater,addtime')
             ->where($where)

app/admin/controller/Sale.php

@@ -3279,6 +3279,10 @@ class Sale extends Base
         if ($good_name !== "") {
             $where[] = ['b.good_name', "like", "%$good_name%"];
         }
+        $supplier_name = isset($this->post['supplier_name']) && $this->post['supplier_name'] !== "" ? trim($this->post['supplier_name']) : "";
+        if ($supplier_name !== "") {
+            $where[] = ['wpo.supplier_name', "like", "%$supplier_name%"];
+        }
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? trim($this->post['status']) : "";
         if ($status !== "") {
             $where[] = ['a.status', "=", $status];