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

app/admin/controller/SaleReport.php

@@ -174,8 +174,7 @@ class SaleReport extends Base
             $list[] = $val;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
-
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('咨询单报表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -272,7 +271,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
 
         excelSave('咨询单报表' . date('YmdHis'), array_keys($list[0]), $list);
 
@@ -378,7 +377,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
 
         excelSave('订单报表' . date('YmdHis'), array_keys($list[0]), $list);
 
@@ -484,7 +483,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
 
         excelSave('未发货报表' . date('YmdHis'), array_keys($list[0]), $list);
 
@@ -723,7 +722,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('售后报表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -814,7 +813,7 @@ class SaleReport extends Base
         }
 
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('产品热销排行' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -929,7 +928,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('咨询单导出明细' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1029,7 +1028,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('工差明细表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1210,7 +1209,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('退货明细表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1308,7 +1307,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('售后明细表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1388,7 +1387,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('议价明细表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1528,7 +1527,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('延时发货申请单' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1642,7 +1641,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('直接发货申请单统计' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
@@ -1756,19 +1755,20 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
         excelSave('无地址销售订单列表' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
 
-    //【十一、本月销售订单情况】
+    //【十一、月度销售订单情况】
     public function saleMonth()
     {
 
-        $param = $this->request->only(['token', 'apply_company' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'apply_company' => '', 'start_day' => '', 'end_day' => ''], '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'])]];
 
         $data = Db::name('sale')
             ->alias('a')
@@ -1776,7 +1776,6 @@ class SaleReport extends Base
             ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = [];
         $total = ['name' => '总计', 'tag_1' => 0, 'tag_2' => 0, 'tag_3' => 0, 'tag_total' => 0];
@@ -1800,14 +1799,15 @@ class SaleReport extends Base
 
     }
 
-    //【十一、本月销售订单情况-导出】
+    //【十一、月度销售订单情况-导出】
     public function saleMonthExport()
     {
 
-        $param = $this->request->only(['token', 'apply_company' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'apply_company' => '', 'start_day' => '', 'end_day' => ''], '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'])]];
 
         $data = Db::name('sale')
             ->alias('a')
@@ -1815,7 +1815,6 @@ class SaleReport extends Base
             ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = [];
         $total = ['部门' => '总计', '库存品' => 0, '非库存品' => 0, '咨询采反' => 0, '总计' => 0];
@@ -1844,18 +1843,19 @@ class SaleReport extends Base
         $list = array_merge($list);//重置下标
         $list[] = $total;
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
-        excelSave('本月销售订单情况' . date('YmdHis'), array_keys($list[0]), $list);
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
+        excelSave('月度销售订单情况' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
 
-    //【十二、本月采购订单和库存品发货情况】
+    //【十二、月度采购订单和库存品发货情况】
     public function orderOutMonth()
     {
 
-//        $param = $this->request->only(['token'], 'post', 'trim');
+        $param = $this->request->only(['token', 'start_day' => '', 'end_day' => ''], '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'])]];
 
         $data = Db::name('order_out')
             ->alias('a')
@@ -1864,7 +1864,6 @@ class SaleReport extends Base
             ->leftJoin('order_send c', 'c.outCode=a.outCode')
             ->leftJoin('purchease_order d', 'd.cgdNo=c.cgdNo')
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = [];
 //        $total = ['cat_1' => '总计', 'cat_2' => '', 'cat_3' => '', 'tag_1' => 0, 'tag_2' => 0, 'tag_3' => 0, 'tag_supplier' => 0, 'tag_person' => 0, 'tag_logistics' => 0, 'tag_total' => 0];
@@ -1914,12 +1913,13 @@ class SaleReport extends Base
 
     }
 
-    //【十二、本月采购订单和库存品发货情况-导出】
+    //【十二、月度采购订单和库存品发货情况-导出】
     public function orderOutMonthExport()
     {
-//        $param = $this->request->only(['token'], 'post', 'trim');
+        $param = $this->request->only(['token', 'start_day' => '', 'end_day' => ''], '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'])]];
 
         $data = Db::name('order_out')
             ->alias('a')
@@ -1928,7 +1928,6 @@ class SaleReport extends Base
             ->leftJoin('order_send c', 'c.outCode=a.outCode')
             ->leftJoin('purchease_order d', 'd.cgdNo=c.cgdNo')
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
 
         $supplierNos = SupplierRelationUser::where(['is_del' => SupplierUser::$is_del_normal, 'status' => SupplierUser::$status_normal])
@@ -1983,19 +1982,19 @@ class SaleReport extends Base
         $list = array_merge($list);//重置下标
 //        $list[] = $total;
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
-        excelSave('本月采购订单和库存品发货情况' . date('YmdHis'), array_keys($list[0]), $list);
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
+        excelSave('月度采购订单和库存品发货情况' . date('YmdHis'), array_keys($list[0]), $list);
 
     }
 
-    //【十三、本月供应商采购订单情况】
+    //【十三、月度供应商采购订单情况】
     public function purcheaseOrderMonth()
     {
-
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => '', 'end_day' => ''], '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'])]];
 
         $where = [['a.is_del', '=', 0]];
 
@@ -2005,7 +2004,6 @@ class SaleReport extends Base
             ->leftJoin("good_platform b", "b.skuCode=a.skuCode AND b.is_del=0")
             ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = $tmp = [];
         $total = ['supplier_name' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
@@ -2066,13 +2064,14 @@ class SaleReport extends Base
 
     }
 
-    //【十三、本月供应商采购订单情况-导出】
+    //【十三、月度供应商采购订单情况-导出】
     public function purcheaseOrderMonthExport()
     {
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => '', 'end_day' => ''], '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'])]];
 
         $where = [['a.is_del', '=', 0]];
 
@@ -2082,7 +2081,6 @@ class SaleReport extends Base
             ->leftJoin("good_platform b", "b.skuCode=a.skuCode AND b.is_del=0")
             ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = $tmp = [];
         $total = ['采购方' => '总计', '订单总量' => 0, '库存品' => 0, 'toC' => 0, 'toB' => 0, '今日反馈单数合计(参考)' => 0];
@@ -2132,19 +2130,19 @@ class SaleReport extends Base
 
         }
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
-        excelSave('本月供应商采购订单情况' . date('YmdHis'), array_keys($total), $list);
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
+        excelSave('月度供应商采购订单情况' . date('YmdHis'), array_keys($total), $list);
 
     }
 
-    //【十四、本月供应商负责人采购订单情况】
+    //【十四、月度供应商负责人采购订单情况】
     public function purcheaseOrderPersonMonth()
     {
-
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => '', 'end_day' => ''], '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['flag'] != '') {
             $supplierNos = SupplierRelationUser::where(['is_del' => SupplierUser::$is_del_normal, 'status' => SupplierUser::$status_normal])
                 ->group('supplierNo')
@@ -2162,7 +2160,6 @@ class SaleReport extends Base
             ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
             ->leftJoin("supplier s", "s.code=a.supplierNo AND s.is_del=0")
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = [];
         $total = ['person' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
@@ -2220,14 +2217,15 @@ class SaleReport extends Base
 
     }
 
-    //【十四、本月供应商负责人采购订单情况-导出】
+    //【十四、月度供应商负责人采购订单情况-导出】
     public function purcheaseOrderPersonMonthExport()
     {
 
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => ''], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'flag' => '', 'start_day' => '', 'end_day' => ''], '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['flag'] != '') {
             $supplierNos = SupplierRelationUser::where(['is_del' => SupplierUser::$is_del_normal, 'status' => SupplierUser::$status_normal])
                 ->group('supplierNo')
@@ -2245,7 +2243,6 @@ class SaleReport extends Base
             ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
             ->leftJoin("supplier s", "s.code=a.supplierNo AND s.is_del=0")
             ->where($where)
-            ->whereMonth('a.addtime')
             ->cursor();
         $list = [];
         $total = ['采购方' => '总计', '订单总量' => 0, '库存品' => 0, 'toC' => 0, 'toB' => 0, '今日反馈单数合计(参考)' => 0];
@@ -2297,8 +2294,8 @@ class SaleReport extends Base
 
         $list[] = $total;
 
-        if (empty($list)) $list[] = '没有相关可导出的数据';
-        excelSave('本月供应商负责人采购订单情况' . date('YmdHis'), array_keys($total), $list);
+        if (empty($list)) $list[] = ['没有相关可导出的数据'];
+        excelSave('月度供应商负责人采购订单情况' . date('YmdHis'), array_keys($total), $list);
 
     }