销售报表中的订单导出表改为预约导出模式

app/admin/controller/SaleReport.php

@@ -770,140 +770,6 @@ class SaleReport extends Base
 
     }
 
-    //【二、订单导出表】
-    public function saleDetailed()
-    {
-
-        $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => '', 'create_company' => '', 'company' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
-
-        $where = [['s.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[] = ['s.status', '=', $param['status']];
-        if ($param['create_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['create_company'] . '%'];
-        if ($param['company'] != '') $where[] = ['b.company', 'like', '%' . $param['company'] . '%'];
-
-        $count = Db::name('sale')
-            ->alias('s')
-            ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
-            ->leftJoin('business b', 'b.companyNo=s.supplierNo')
-            ->leftJoin('platform p', 'p.id=s.platform_id')
-            ->leftJoin('good_basic gb', 'gb.spuCode=s.good_code')
-            ->leftJoin('order_use ou', 'ou.id=s.use_order')
-            ->leftJoin('depart_user u', 'u.uid=s.apply_id')
-            ->leftJoin('company_item ci', 'ci.id=u.itemid')
-            ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->where($where)
-            ->order('s.addtime', 'desc')
-            ->count('s.id');
-
-        $data = Db::name('sale')
-            ->alias('s')
-            ->field('s.addtime,s.orderCode,s.order_type,s.status,s.apply_name,ci.name,b.company,csi.companyName,p.platform_name,s.platform_order,s.poNo,s.paytime,ou.order_use,s.good_name,gb.tax,s.sale_price,s.good_num,s.total_price,po.cgder,gb.customized,s.arrive_time,s.remark,s.is_stock,csi.itemid,s.cat_id,s.is_activity,s.good_type')
-            ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
-            ->leftJoin('business b', 'b.companyNo=s.supplierNo')
-            ->leftJoin('platform p', 'p.id=s.platform_id')
-            ->leftJoin('good_basic gb', 'gb.spuCode=s.good_code')
-            ->leftJoin('order_use ou', 'ou.id=s.use_order')
-            ->leftJoin('depart_user u', 'u.uid=s.apply_id')
-            ->leftJoin('company_item ci', 'ci.id=u.itemid')
-            ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->where($where)
-            ->order('s.addtime', 'desc')
-            ->page($param['page'], $param['size'])
-            ->cursor();
-
-        $list = [];
-
-        foreach ($data as $value) {
-
-            $value['order_type'] = isset($this->all_order_type[$value['order_type']]) ? $this->all_order_type[$value['order_type']] : '';
-            $value['status'] = isset($this->all_sale_status[$value['status']]) ? $this->all_sale_status[$value['status']] : '';
-
-            if (!empty($value['itemid'])) {
-                $customer_org1 = array_column(get_top_customer_org($value['itemid']), 'name', 'level');
-                $value['first_customer_org'] = isset($customer_org1[1]) ? $customer_org1[1] : '';
-                $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
-            }
-
-            $cat = made($value['cat_id']);
-            $value['first_cat_name'] = isset($cat[0]['name']) ? $cat[0]['name'] : '';
-            $value['is_stock'] = isset($this->all_stock[$value['is_stock']]) ? $this->all_stock[$value['is_stock']] : '';
-
-            $is_activity = isset($this->is_activity[$value['is_activity']]) ? $this->is_activity[$value['is_activity']] : '';
-            $good_type = isset($this->good_type[$value['good_type']]) ? $this->good_type[$value['good_type']] : '';
-            $value['activity_type'] = $is_activity . '/' . $good_type;
-
-            $list[] = $value;
-        }
-
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
-
-    }
-
-    //【二、订单导出表】
-    public function saleDetailedExport()
-    {
-
-        $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => '', 'create_company' => '', 'company' => ''], 'post', 'trim');
-
-        $where = [['s.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[] = ['s.status', '=', $param['status']];
-        if ($param['create_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['create_company'] . '%'];
-        if ($param['company'] != '') $where[] = ['b.company', 'like', '%' . $param['company'] . '%'];
-
-        $data = Db::name('sale')
-            ->alias('s')
-            ->field('s.addtime 确认单下单时间,s.orderCode 订单编号,s.order_type 订单类型,s.status 订单状态,s.apply_name 创建人,ci.name 部门,b.company 销售方公司,"" 一级组织,"" 二级组织,csi.companyName 购买方公司,p.platform_name 所属平台,s.platform_order 平台订单号,s.poNo 其他单号,s.paytime 承诺回款时间,ou.order_use 订单用途,"" 活动类型,s.good_name 产品名称,"" 一级分类,gb.tax 税率,s.sale_price 销售单价,s.good_num 下单数量,s.total_price 销售总额,po.cgder 采购人,gb.customized 工期时间,s.arrive_time 要求到货时间,s.remark 备注,s.is_stock 是否库存品,csi.itemid,s.cat_id,s.is_activity,s.good_type')
-            ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
-            ->leftJoin('business b', 'b.companyNo=s.supplierNo')
-            ->leftJoin('platform p', 'p.id=s.platform_id')
-            ->leftJoin('good_basic gb', 'gb.spuCode=s.good_code')
-            ->leftJoin('order_use ou', 'ou.id=s.use_order')
-            ->leftJoin('depart_user u', 'u.uid=s.apply_id')
-            ->leftJoin('company_item ci', 'ci.id=u.itemid')
-            ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->where($where)
-            ->order('s.addtime', 'desc')
-            ->cursor();
-
-        $list = [];
-
-        foreach ($data as $value) {
-
-            $value['订单类型'] = isset($this->all_order_type[$value['订单类型']]) ? $this->all_order_type[$value['订单类型']] : '';
-            $value['订单状态'] = isset($this->all_sale_status[$value['订单状态']]) ? $this->all_sale_status[$value['订单状态']] : '';
-
-            if (!empty($value['itemid'])) {
-                $customer_org1 = array_column(get_top_customer_org($value['itemid']), 'name', 'level');
-                $value['一级组织'] = isset($customer_org1[1]) ? $customer_org1[1] : '';
-                $value['二级组织'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
-            }
-
-            $cat = made($value['cat_id']);
-            $value['一级分类'] = isset($cat[0]['name']) ? $cat[0]['name'] : '';
-            $value['是否库存品'] = isset($this->all_stock[$value['是否库存品']]) ? $this->all_stock[$value['是否库存品']] : '';
-
-            $is_activity = isset($this->is_activity[$value['is_activity']]) ? $this->is_activity[$value['is_activity']] : '';
-            $good_type = isset($this->good_type[$value['good_type']]) ? $this->good_type[$value['good_type']] : '';
-            $value['活动类型'] = $is_activity . '/' . $good_type;
-            unset($value['good_code']);
-            unset($value['itemid']);
-            unset($value['cat_id']);
-            unset($value['is_activity']);
-            unset($value['good_type']);
-
-            $list[] = $value;
-        }
-
-        if (empty($list)) $list[] = '没有相关可导出的数据';
-        excelSave('订单导出表' . date('YmdHis'), array_keys($list[0]), $list);
-
-    }
-
     //【三、咨询单导出明细】
     public function consultDetailed()
     {

app/admin/route/app.php

@@ -546,8 +546,6 @@ Route::rule('saleexportorderreturn','admin/SaleReport/orderReturn');//管理报
 Route::rule('saleexportorderreturnexport','admin/SaleReport/orderReturnExport');//管理报表-售后报表-导出
 Route::rule('saleexportgoodrankinglist','admin/SaleReport/goodRankingList');//管理报表-产品热销排行
 Route::rule('saleexportgoodrankinglistexport','admin/SaleReport/goodRankingListExport');//管理报表-产品热销排行-导出
-Route::rule('saleexportsaledetailed','admin/SaleReport/saleDetailed');//订单导出表
-Route::rule('saleexportsaledetailedexport','admin/SaleReport/saleDetailedExport');//订单导出表-导出
 Route::rule('saleexportconsultdetailed','admin/SaleReport/consultDetailed');//咨询单导出明细
 Route::rule('saleexportconsultdetailedexport','admin/SaleReport/consultDetailedExport');//咨询单导出明细-导出
 Route::rule('saleexportsalediff','admin/SaleReport/saleDiff');//工差明细表-导出

app/command/NowReportHandle.php

@@ -61,6 +61,11 @@ class NowReportHandle extends Command
                     case 'F':
                         $res = $this->F($info['start'], $info['end']);
                         break;
+
+                    case 'G':
+                        //订单表导出
+                        $res = $this->G($info['start'], $info['end']);
+                        break;
                     default:
                         throw new Exception('暂不支持这个报表');
                 }
@@ -536,4 +541,63 @@ ShortText1617865626160 '一级分类',
         }
         return $data;
     }
+
+    //【订单导出表】
+    public function G(string $start_date = '', string $end_date = '')
+    {
+        $all_order_type = [1 => '备库', 2 => '非库存', 3 => '咨询采反', 4 => '项目采反', 5 => '平台部订单销售库存', 6 => '平台部订单销售非库存'];//订单类型
+        $all_sale_status = [0 => '待发货', 1 => '待发货完成', 2 => '发货已完成', 3 => '订单已取消'];//订单状态(sale表里的status)
+        $all_stock = [0 => '非库存品', 1 => '库存品'];//是否库存品
+        $all_is_activity = [0 => '不参与活动', 1 => '参与活动'];
+        $all_good_type = [1 => '正常商品', 2 => '赠品', 3 => '样品'];
+
+        $data = Db::name('sale')
+            ->alias('s')
+            ->field('s.addtime 确认单下单时间,s.orderCode 订单编号,s.order_type 订单类型,s.status 订单状态,s.apply_name 创建人,ci.name 部门,b.company 销售方公司,"" 一级组织,"" 二级组织,csi.companyName 购买方公司,p.platform_name 所属平台,s.platform_order 平台订单号,s.poNo 其他单号,s.paytime 承诺回款时间,ou.order_use 订单用途,"" 活动类型,s.good_name 产品名称,"" 一级分类,gb.tax 税率,s.sale_price 销售单价,s.good_num 下单数量,s.total_price 销售总额,po.cgder 采购人,gb.customized 工期时间,s.arrive_time 要求到货时间,s.remark 备注,s.is_stock 是否库存品,csi.itemid,s.cat_id,s.is_activity,s.good_type')
+            ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
+            ->leftJoin('business b', 'b.companyNo=s.supplierNo')
+            ->leftJoin('platform p', 'p.id=s.platform_id')
+            ->leftJoin('good_basic gb', 'gb.spuCode=s.good_code')
+            ->leftJoin('order_use ou', 'ou.id=s.use_order')
+            ->leftJoin('depart_user u', 'u.uid=s.apply_id')
+            ->leftJoin('company_item ci', 'ci.id=u.itemid')
+            ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
+            ->where('s.is_del', 0)
+            ->whereBetween('s.addtime', [$start_date, $end_date])
+            ->order('s.addtime', 'desc')
+            ->cursor();
+
+        $list = [];
+        foreach ($data as $value) {
+
+            $value['订单类型'] = isset($all_order_type[$value['订单类型']]) ? $all_order_type[$value['订单类型']] : '';
+            $value['订单状态'] = isset($all_sale_status[$value['订单状态']]) ? $all_sale_status[$value['订单状态']] : '';
+
+            if (!empty($value['itemid'])) {
+                $customer_org1 = array_column(get_top_customer_org($value['itemid']), 'name', 'level');
+                $value['一级组织'] = isset($customer_org1[1]) ? $customer_org1[1] : '';
+                $value['二级组织'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
+            }
+
+            $cat = made($value['cat_id']);
+            $value['一级分类'] = isset($cat[0]['name']) ? $cat[0]['name'] : '';
+            $value['是否库存品'] = isset($all_stock[$value['是否库存品']]) ? $all_stock[$value['是否库存品']] : '';
+
+            $is_activity = isset($all_is_activity[$value['is_activity']]) ? $all_is_activity[$value['is_activity']] : '';
+            $good_type = isset($all_good_type[$value['good_type']]) ? $all_good_type[$value['good_type']] : '';
+
+            $value['活动类型'] = $is_activity . '/' . $good_type;
+            unset($value['good_code']);
+            unset($value['itemid']);
+            unset($value['cat_id']);
+            unset($value['is_activity']);
+            unset($value['good_type']);
+
+            yield $list[] = $value;
+        }
+
+        return $list;
+
+    }
 }