Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/SaleReport.php

@@ -1855,14 +1855,13 @@ class SaleReport extends Base
 
         $param = $this->request->only(['token', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0]];
+        $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 
-
         $data = Db::name('order_out')
             ->alias('a')
             ->field('a.id,b.order_type,b.cat_id,d.supplierNo')
-            ->leftJoin('sale b', 'b.orderCode=a.orderCode AND b.is_del=0')
+            ->leftJoin('sale b', 'b.orderCode=a.orderCode')
             ->leftJoin('order_send c', 'c.outCode=a.outCode')
             ->leftJoin('purchease_order d', 'd.cgdNo=c.cgdNo')
             ->where($where)
@@ -1920,14 +1919,14 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0]];
+        $where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 
 
         $data = Db::name('order_out')
             ->alias('a')
             ->field('a.id,b.order_type,b.cat_id,d.supplierNo')
-            ->leftJoin("sale b", "b.orderCode=a.orderCode AND b.is_del=0")
+            ->leftJoin("sale b", "b.orderCode=a.orderCode")
             ->leftJoin('order_send c', 'c.outCode=a.outCode')
             ->leftJoin('purchease_order d', 'd.cgdNo=c.cgdNo')
             ->where($where)