ty

app/admin/controller/Sale.php

@@ -961,21 +961,35 @@ class Sale extends BaseController
 //            }
             $wsmcode = Db::name("sale")->where([
                 "is_del" => 0, "supplierNo" => $supplier])->column("orderCode");
-            $where[] = ['orderCode', "in", $wsmcode];
+            $where[] = ['a.orderCode', "in", $wsmcode];
         }
-        $count = Db::name('sale_diff')->alias('a')->join("good b", "b.good_code=a.good_code", "left")
+        $companyNo =isset($this->post['companyNo']) &&$this->post['companyNo'] !=="" ? trim($this->post['companyNo']):"";
+        if($companyNo!=""){
+            $where[]=['c.customer_code',"like","%$companyNo%"];
+
+        }
+        $count = Db::name('sale_diff')->alias('a')
+            ->join("sale c", "c.orderCode=a.orderCode", "left")
+            ->join("customer_info v", "v.companyNo=c.customer_code", "left")
+            ->join("good b", "b.good_code=a.good_code", "left")
             ->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('sale_diff')->alias('a')->join("good b", "b.good_code=a.good_kode", "left")
-            ->where($where)->page($page, $size)->field("a.*,b.cat_id")->order("a.addtime desc")->select();
+       //var_dump( Db::name('sale_diff')->getLastSql());
+        $list = Db::name('sale_diff')->alias('a')
+            ->join("sale c", "c.orderCode=a.orderCode", "left")
+            ->join("customer_info v", "v.companyNo=c.customer_code", "left")
+            ->join("good b", "b.good_code=a.good_kode", "left")
+            ->where($where)->page($page, $size)->field("a.*,b.cat_id,c.customer_code,v.companyName")
+            ->order("a.addtime desc")->select();
+
         $data = [];
         foreach ($list as $value) {
             $value['can'] = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
             $wsm = Db::name("sale")->alias("a")->Join("supplier b", "a.supplierNo=b.code", "left")->where
             (['a.orderCode' => $value['orderCode'], "a.is_del" => 0])->field("b.code,b.name")->find();
-            $value['code'] = isset($wsm['code']) ? $wsm['code'] : "";
-            $value['name'] = isset($wsm['name']) ? $wsm['name'] : "";
+            $value['supplierNo'] = isset($wsm['code']) ? $wsm['code'] : "";
+            $value['supplierName'] = isset($wsm['name']) ? $wsm['name'] : "";
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
@@ -1133,6 +1147,7 @@ class Sale extends BaseController
             //->join("good n","n.good_code=b.good_code","left")
             ->field("a.*,b.good_name,b.good_code,b.supplierNo,b.customer_code,v.companyName")
             ->where($where)->order("addtime desc")->page($page, $size)->select();
+        $data=[];
         foreach ($list as $value) {
             $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
                 ->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();