code

service/report.class.php

@@ -564,7 +564,8 @@ class report {
             }
             $tp = ceil($rc / $ps);
             if ($rc > 0) {
-                $tmp_search_without_limit = $report_sql;
+                //导出现在2万条
+                $tmp_search_without_limit = $report_sql." limit  20000";
                 $report_sql .= " limit " . $ps . " offset " . ($cp - 1) * $ps;
                 error_log($reportFiled['name'].": report_detail_search, ".$report_sql);
 
@@ -635,8 +636,8 @@ class report {
                 $newRow = [];
                 foreach ($row as $field => $value) {
                     //去除null
-                    if(empty($value[$field]) || $value[$field] == null){
-                        $value[$field] = "";
+                    if(empty($value) || $value == null){
+                        $value = "";
                     }
 
                     // 如果该字段有配置映射，并且当前值在映射中，则替换

utils/common.class.php

@@ -4443,7 +4443,7 @@ class common {
             "oo.tracking_no" => "tracking_no",
             "oo.m_bol" => "mbol_mawb_no",
             "oo.h_bol" => "hbol_hawb_no",
-            "oo.invoice_no" => "invoice_no",
+            "oo.invoice_no" => "shipment_invoice_no",
             "oo.booking_no" => "booking_no",
             "COALESCE(oe.import_po_no,oo.po_no)"=>"shipment_po_no",    //代表oo里的组合字段，需要特殊处理
             "oo.quote_no" => "quote_no",
@@ -4503,7 +4503,7 @@ class common {
             "oc.cbm" => "container_volume",
             "oc.po_no" => "container_po_no",
             "oc.item_no" => "item_no",
-            "oc.invoice_no" => "invoice_no",
+            "oc.invoice_no" => "container_invoice_no",
             "oi.po_no" => "item_po_no",
             "oi.sku_no" => "sku_no",
             "oi.quantity" => "item_qty",