暂存

app/admin/controller/Good.php

@@ -225,6 +225,7 @@ class Good extends Base
             'exam_status' => '',
             'brand_id' => '',
             'company_name' => '',
+            'relaComNo' => '',
         ], 'post', 'trim');
         $where = [["b.is_del", "=", 0]];
         if ($param['cat_id'] !== "") $where[] = ['a.cat_id', "=", $param['cat_id']];
@@ -255,6 +256,9 @@ class Good extends Base
         }
         if ($param['company_name'] !== '') $where[] = ["a.createrid", 'in', get_company_item_user_by_name($param['company_name'])];
 
+//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($param['relaComNo'] !== '') $where[]=['a.companyNo|a.supplierNo','=', $param['relaComNo']];
+
         $count = Db::name('platform_youzan')
             ->alias("b")
             ->leftJoin("good_basic a", "a.spuCode=b.spuCode")

app/admin/controller/SaleReport.php

@@ -30,35 +30,51 @@ class SaleReport extends Base
     //【一、管理报表】1.日报_列表
     public function consultDay()
     {
-        $param = $this->request->only(['token', 'date' => date('Y-m-d')], 'post', 'trim');
+        $param = $this->request->only(['token', 'date' => date('Y-m-d'),'relaComNo'=>''], 'post', 'trim');
 
+        $rs_1_where=[
+            ['ci.is_del','=',0],
+            ['ci.addtime','between',[$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59']],
+        ];
+        if($param['relaComNo'] !== '') $rs_1_where[]=['co.companyNo','=',$param['relaComNo']];
         $rs_1 = Db::name('consult_info')
             ->alias('ci')
             ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
-            ->where('ci.is_del', 0)
-            ->whereBetween('ci.addtime', [$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59'])
+            ->where($rs_1_where)
             ->group('co.createrid,co.creater')
             ->column('COUNT(ci.id) 当日咨询单数量,SUM(ci.budget_price*ci.num) 金额,co.creater 创建人', 'co.createrid');
 
+        $rs_2_where=[
+            ['is_del','=',0],
+            ['addtime','between',[$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59']],
+        ];
+        if($param['relaComNo'] !== '') $rs_2_where[]=['customer_code|supplierNo','=',$param['relaComNo']];
         $rs_2 = Db::name('sale')
-            ->where('is_del', 0)
-            ->whereBetween('addtime', [$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59'])
+            ->where($rs_2_where)
             ->group('apply_id,apply_name')
             ->column('COUNT(id) 当日下单数量,SUM(total_price) 金额,apply_name 创建人', 'apply_id');
 
+        $rs_3_where=[
+            ['oo.status','=',3],
+            ['oo.addtime','between',[$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59']],
+        ];
+        if($param['relaComNo'] !== '') $rs_3_where[]=['s.customer_code|s.supplierNo','=',$param['relaComNo']];
         $rs_3 = Db::name('order_out')
             ->alias('oo')
             ->leftJoin('sale s', 's.orderCode=oo.orderCode')
-            ->where(['oo.status' => 3])
-            ->whereBetween('oo.addtime', [$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59'])
+            ->where($rs_3_where)
             ->group('oo.apply_id,oo.apply_name')
             ->column('COUNT(oo.id) 当日签收数量,SUM(s.total_price) 金额,oo.apply_name 创建人', 'oo.apply_id');
 
+        $rs_4_where=[
+            ['or.is_del','=',0],
+            ['or.addtime','between',[$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59']],
+        ];
+        if($param['relaComNo'] !== '') $rs_4_where[]=['s.customer_code|s.supplierNo|or.customer_code','=',$param['relaComNo']];
         $rs_4 = Db::name('order_return')
             ->alias('or')
             ->leftJoin('sale s', 's.orderCode=or.orderCode')
-            ->where(['or.is_del' => 0])
-            ->whereBetween('or.addtime', [$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59'])
+            ->where($rs_4_where)
             ->group('or.apply_id,or.apply_name')
             ->column('COUNT(or.id) 单日售后单数,SUM(s.total_price) 金额,or.apply_name 创建人', 'or.apply_id');
 

app/command/NowReportHandle.php

@@ -619,7 +619,7 @@ class NowReportHandle extends Command
             ->leftJoin('company_item ci', 'ci.id=u.itemid')
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->where('s.is_del', 0)
+            ->where(['s.is_del' => 0, 'ci.is_del' => 0])
             ->whereBetween('s.addtime', [$start_date, $end_date])
             ->order('s.addtime', 'desc')
             ->cursor();