未签收报表优化

app/admin/controller/SaleReport.php

@@ -499,7 +499,7 @@ class SaleReport extends Base
             ->alias('oo')
             ->leftJoin('sale s', 's.orderCode=oo.orderCode')
             ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
-            ->leftJoin('order_out out', 'out.orderCode=s.orderCode AND out.is_del=0')
+//            ->leftJoin('order_out out', 'out.orderCode=s.orderCode AND out.is_del=0')
             ->where($where)
             ->count('oo.id');
 
@@ -508,7 +508,7 @@ class SaleReport extends Base
             ->field('oo.id,s.apply_name,s.addtime,s.orderCode,csi.companyName,s.good_name,s.good_num,s.sale_price,s.total_price,oo.sendtime,csi.itemid,s.good_code,s.order_type,s.apply_id')
             ->leftJoin('sale s', 's.orderCode=oo.orderCode')
             ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
-            ->leftJoin('order_out out', 'out.orderCode=s.orderCode AND out.is_del=0')
+//            ->leftJoin('order_out out', 'out.orderCode=s.orderCode AND out.is_del=0')
             ->where($where)
             ->page($param['page'], $param['size'])
             ->order('s.addtime', 'desc')
@@ -624,7 +624,7 @@ class SaleReport extends Base
 
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
 
-        $where = [['or.is_del','=',0]];
+        $where = [['or.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['or.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['or.status', '=', $param['status']];
 
@@ -678,7 +678,7 @@ class SaleReport extends Base
 
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => ''], 'post', 'trim');
 
-        $where = [['or.is_del','=',0]];
+        $where = [['or.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['or.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['or.status', '=', $param['status']];