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

app/admin/controller/SaleReport.php

@@ -1764,11 +1764,11 @@ class SaleReport extends Base
     public function saleMonth()
     {
 
-        $param = $this->request->only(['token', 'apply_company' => '', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'apply_company' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
         if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
-        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        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')
@@ -1803,11 +1803,12 @@ class SaleReport extends Base
     public function saleMonthExport()
     {
 
-        $param = $this->request->only(['token', 'apply_company' => '', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'apply_company' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
         if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
-        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        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')
@@ -1852,10 +1853,11 @@ class SaleReport extends Base
     public function orderOutMonth()
     {
 
-        $param = $this->request->only(['token', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
-        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        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')
@@ -1916,10 +1918,11 @@ class SaleReport extends Base
     //【十二、月度采购订单和库存品发货情况-导出】
     public function orderOutMonthExport()
     {
-        $param = $this->request->only(['token', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
-        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        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')
@@ -1990,11 +1993,12 @@ class SaleReport extends Base
     //【十三、月度供应商采购订单情况】
     public function purcheaseOrderMonth()
     {
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         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', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        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]];
 
@@ -2067,11 +2071,12 @@ class SaleReport extends Base
     //【十三、月度供应商采购订单情况-导出】
     public function purcheaseOrderMonthExport()
     {
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         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', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        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]];
 
@@ -2138,11 +2143,12 @@ class SaleReport extends Base
     //【十四、月度供应商负责人采购订单情况】
     public function purcheaseOrderPersonMonth()
     {
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         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', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
+
         if ($param['flag'] != '') {
             $supplierNos = SupplierRelationUser::where(['is_del' => SupplierUser::$is_del_normal, 'status' => SupplierUser::$status_normal])
                 ->group('supplierNo')
@@ -2221,11 +2227,12 @@ class SaleReport extends Base
     public function purcheaseOrderPersonMonthExport()
     {
 
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => '', 'end_day' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         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', [date('Y-m-d 00:00:00', $param['start_day']), date('Y-m-d 23:59:59', $param['end_day'])]];
+        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
+
         if ($param['flag'] != '') {
             $supplierNos = SupplierRelationUser::where(['is_del' => SupplierUser::$is_del_normal, 'status' => SupplierUser::$status_normal])
                 ->group('supplierNo')