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

app/admin/controller/SaleReport.php

@@ -1809,7 +1809,6 @@ class SaleReport extends Base
         if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
         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('sale')
             ->alias('a')
             ->field('a.id,a.order_type,u.itemid,ci.name')
@@ -1922,7 +1921,6 @@ class SaleReport extends Base
         $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')
@@ -1994,13 +1992,11 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
+        $where = [['a.is_del', '=', 0]];
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 
-
-        $where = [['a.is_del', '=', 0]];
-
         $data = Db::name('purchease_order')
             ->alias('a')
             ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,c.use_type')
@@ -2072,13 +2068,12 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
+        $where = [['a.is_del', '=', 0]];
+
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 
-
-        $where = [['a.is_del', '=', 0]];
-
         $data = Db::name('purchease_order')
             ->alias('a')
             ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,c.use_type')
@@ -2144,6 +2139,8 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
+        $where = [['a.is_del', '=', 0]];
+
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
@@ -2156,8 +2153,6 @@ class SaleReport extends Base
             else $where[] = ['a.supplierNo', 'not in', $supplierNos];//2.未开通账号的
         }
 
-        $where = [['a.is_del', '=', 0]];
-
         $data = Db::name('purchease_order')
             ->alias('a')
             ->field('a.id,s.personid,s.person,a.order_type,c.use_type')
@@ -2228,6 +2223,8 @@ class SaleReport extends Base
 
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
+        $where = [['a.is_del', '=', 0]];
+
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
@@ -2240,8 +2237,6 @@ class SaleReport extends Base
             else $where[] = ['a.supplierNo', 'not in', $supplierNos];//2.未开通账号的
         }
 
-        $where = [['a.is_del', '=', 0]];
-
         $data = Db::name('purchease_order')
             ->alias('a')
             ->field('a.id,s.personid,s.person,a.order_type,c.use_type')