订单明细报表导出优化，售后明细报表优化

app/admin/controller/Report.php

@@ -757,7 +757,7 @@ class Report extends Base
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
 
-        $where = [['po.is_del','=',0]];
+        $where = [['po.is_del', '=', 0]];
 
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['po.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['po.status', '=', $param['status']];
@@ -798,9 +798,8 @@ class Report extends Base
             //创建人//order_type==1备库单
             if ($v['order_type'] == 1) $temp = Db::name('purchease')->where(['bk_code' => $v['bkcode'], 'spuCode' => $v['spuCode'], 'is_del' => 0])->field('id,apply_name,apply_id')->find();
             else $temp = Db::name('sale')->where(['orderCode' => $v['orderCode'], 'is_del' => 0])->field('id,apply_id,apply_name')->find();
-
             $v['creater'] = isset($temp['apply_name']) ? $temp['apply_name'] : '';
-            $v['creater_name'] = get_company_name_by_uid($temp['apply_id']);
+            $v['creater_name'] = get_company_name_by_uid($temp['apply_id'] ?? 0);
 
             //创建时间
             $v['send_time'] = Db::name('order_out')
@@ -808,7 +807,7 @@ class Report extends Base
                 ->order('addtime', 'desc')
                 ->value('addtime');
 
-            $v['name'] = get_company_name_by_uid($v['cgder_id']);
+            $v['name'] = get_company_name_by_uid($v['cgder_id'] ?? 0);
 
             $list[] = $v;
         }
@@ -834,7 +833,7 @@ class Report extends Base
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
 
-        $where = [];
+        $where = [['po.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['po.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['po.status', '=', $param['status']];
 
@@ -847,7 +846,7 @@ class Report extends Base
             ->field('po.cgdNo 采购单编号,po.addtime 创建时间,po.supplierNo 供应商编号,po.supplier_name 供应商名称,po.good_name 商品名称,gb.is_stock 商品库存性质,po.good_num 购买数量,po.nake_fee 裸价,po.total_fee 成本合计,po.status 单据状态,po.send_status 发货状态,po.wsend_num 未发货数量,"" 创建人,"" 创建人所属部门,b.company 客户名称,po.cgder 采购员,"" 采购员所属部门,"" 发货时间,on.orderCode,po.order_type,po.bkcode,po.spuCode,po.cgder_id')
             ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
-            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode')
+            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
             ->where($where)
             ->order('po.addtime', 'desc')
             ->cursor();
@@ -870,7 +869,7 @@ class Report extends Base
             else $temp = Db::name('sale')->where(['orderCode' => $v['orderCode'], 'is_del' => 0])->field('id,apply_id,apply_name')->find();
 
             $v['创建人'] = isset($temp['apply_name']) ? $temp['apply_name'] : '';
-            $v['创建人所属部门'] = get_company_name_by_uid($temp['apply_id']);
+            $v['创建人所属部门'] = get_company_name_by_uid($temp['apply_id'] ?? 0);
 
             //创建时间
             $v['发货时间'] = Db::name('order_out')
@@ -878,7 +877,7 @@ class Report extends Base
                 ->order('addtime', 'desc')
                 ->value('addtime');
 
-            $v['采购员所属部门'] = get_company_name_by_uid($v['cgder_id']);
+            $v['采购员所属部门'] = get_company_name_by_uid($v['cgder_id'] ?? 0);
 
             unset($v['orderCode']);
             unset($v['order_type']);
@@ -914,7 +913,7 @@ class Report extends Base
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
 
-        $where = [];
+        $where = [['or.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']];
 
         $all_status = [1 => '待业务审核', 2 => '待采购审核', 3 => '待设置仓库', 4 => '待客户退货', 5 => '售后已完成', 6 => '业务已驳回', 7 => '采购已驳回', 8 => '申请已取消'];
@@ -924,7 +923,7 @@ class Report extends Base
             ->alias('or')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
+            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3  AND oo.is_del=0')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->where($where)
             ->count('or.id');
@@ -934,7 +933,7 @@ class Report extends Base
             ->field('or.id,or.returnCode,or.addtime,on.cgdNo,po.supplierNo,po.supplier_name,or.good_name,or.total_num, oo.updatetime receipttime ,or.error_num,or.error_remark,ri.result error_reason,or.status,po.cgder,ci.name')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
+            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3 AND oo.is_del=0')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->leftJoin('depart_user u', 'u.uid=po.cgder_id AND u.is_del=0')
             ->leftJoin('company_item ci', 'ci.id=u.itemid')
@@ -966,7 +965,7 @@ class Report extends Base
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
 
-        $where = [];
+        $where = [['or.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']];
 
         $all_status = [2 => '业务主管审核', 3 => '采购主管审核', 6 => '业务驳回', 7 => '采购驳回', 8 => '取消'];
@@ -976,7 +975,7 @@ class Report extends Base
             ->field('or.returnCode 售后单编号,or.addtime 创建时间,on.cgdNo 采购单编号,po.supplier_name 供应商名称,or.good_name 产品名称,or.total_num 购买数量, oo.updatetime 签收日期,or.error_num 售后数量,or.error_remark 问题描述,ri.result 异常原因,or.status 售后状态,po.cgder 采购员,ci.name 采购员所属部门')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
+            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3  AND oo.is_del=0')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->leftJoin('depart_user u', 'u.uid=po.cgder_id AND u.is_del=0')
             ->leftJoin('company_item ci', 'ci.id=u.itemid')